Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2673] trunk/zoolib_samples/FlashHost
|
From: <ag...@us...> - 2012-01-11 21:31:50
|
Revision: 2673
http://zoolib.svn.sourceforge.net/zoolib/?rev=2673&view=rev
Author: agreen
Date: 2012-01-11 21:31:41 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Updates.
Modified Paths:
--------------
trunk/zoolib_samples/FlashHost/build-cw/FlashHost.mcp
trunk/zoolib_samples/FlashHost/build-xcode/FlashHost.xcodeproj/project.pbxproj
trunk/zoolib_samples/FlashHost/src/FlashHost.cpp
trunk/zoolib_samples/FlashHost/src/FlashHost.h
trunk/zoolib_samples/FlashHost/src/FlashHost_Main.cpp
trunk/zoolib_samples/FlashHost/src/FlashHost_Main.mm
trunk/zoolib_samples/FlashHost/src/NSApplicationDelegate_FlashHost.mm
Modified: trunk/zoolib_samples/FlashHost/build-cw/FlashHost.mcp
===================================================================
(Binary files differ)
Modified: trunk/zoolib_samples/FlashHost/build-xcode/FlashHost.xcodeproj/project.pbxproj
===================================================================
--- trunk/zoolib_samples/FlashHost/build-xcode/FlashHost.xcodeproj/project.pbxproj 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/build-xcode/FlashHost.xcodeproj/project.pbxproj 2012-01-11 21:31:41 UTC (rev 2673)
@@ -13,7 +13,6 @@
C003F330125F80D800C11A02 /* ZCountedWithoutFinalize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C003F32F125F80D800C11A02 /* ZCountedWithoutFinalize.cpp */; };
C005D15E11697C300055865A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C005D15D11697C300055865A /* Security.framework */; };
C0086073118C84000097CFB3 /* ZCounted.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0086072118C84000097CFB3 /* ZCounted.cpp */; };
- C008607E118C84290097CFB3 /* ZWorkerRunner_Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C008607D118C84290097CFB3 /* ZWorkerRunner_Thread.cpp */; };
C00B4FCD115ED0820009AB11 /* ZStreamerRWCon_SSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C00B4FCA115ED0820009AB11 /* ZStreamerRWCon_SSL.cpp */; };
C00B4FCE115ED0820009AB11 /* ZStreamRWCon_SSL_OSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C00B4FCB115ED0820009AB11 /* ZStreamRWCon_SSL_OSX.cpp */; };
C00B4FCF115ED0820009AB11 /* ZStreamRWCon_SSL_Win.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C00B4FCC115ED0820009AB11 /* ZStreamRWCon_SSL_Win.cpp */; };
@@ -86,10 +85,14 @@
C07D2E4E1121E0EF003C0AED /* ZVal_Any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07D2E4D1121E0EF003C0AED /* ZVal_Any.cpp */; };
C07D2E6E1121E16F003C0AED /* ZUtil_CarbonEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C01178540F24E37500E7E01D /* ZUtil_CarbonEvents.cpp */; };
C09C94920FB881B700959F95 /* FlashHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C09C94900FB881B700959F95 /* FlashHost.cpp */; };
+ C0AF0B1613DF262F00C5661B /* ZCaller_CFRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0AF0B1413DF262F00C5661B /* ZCaller_CFRunLoop.cpp */; };
+ C0AF0B1713DF262F00C5661B /* ZUtil_string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0AF0B1513DF262F00C5661B /* ZUtil_string.cpp */; };
+ C0AF0B1B13DF264000C5661B /* ZCaller_EventLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0AF0B1A13DF264000C5661B /* ZCaller_EventLoop.cpp */; };
C0DA8E461268A2E6001E643C /* NSApplicationDelegate_FlashHost.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0DA8E451268A2E6001E643C /* NSApplicationDelegate_FlashHost.mm */; };
C0DA8EAE1268A4E3001E643C /* ZObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0DA8EAD1268A4E3001E643C /* ZObjC.mm */; };
C0DA8F6C1268AB15001E643C /* MainNib.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0DA8F6B1268AB15001E643C /* MainNib.xib */; };
C0E30E8412669AB100642353 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0E30E8312669AB100642353 /* Cocoa.framework */; };
+ C0E49CFA13C655BF00ED02FB /* ZCallScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E49CF913C655BF00ED02FB /* ZCallScheduler.cpp */; };
C0F3B558102B8D7C002231CB /* ZNetscape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F3B553102B8D7C002231CB /* ZNetscape.cpp */; };
C0F3B559102B8D7C002231CB /* ZNetscape_GuestFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F3B554102B8D7C002231CB /* ZNetscape_GuestFactory.cpp */; };
C0F3B55A102B8D7C002231CB /* ZNetscape_Host.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F3B555102B8D7C002231CB /* ZNetscape_Host.cpp */; };
@@ -99,7 +102,6 @@
C0F3B563102B8DA9002231CB /* ZAny.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F3B561102B8DA9002231CB /* ZAny.cpp */; };
C0F3B564102B8DA9002231CB /* ZData_Any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F3B562102B8DA9002231CB /* ZData_Any.cpp */; };
C0F55259126D2C5200A34324 /* ZMacOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C01176FB0F24E37400E7E01D /* ZMacOSX.cpp */; };
- C0F553DC126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F553DA126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.cpp */; };
C0F980AC1055F5590072462C /* ZWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F980AB1055F5590072462C /* ZWorker.cpp */; };
C0F980B61055F5A70072462C /* ZStreamR_Boundary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C01177950F24E37500E7E01D /* ZStreamR_Boundary.cpp */; };
C0F980BB1055F5DC0072462C /* ZFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C01176D50F24E37400E7E01D /* ZFile.cpp */; };
@@ -119,7 +121,6 @@
C003F32F125F80D800C11A02 /* ZCountedWithoutFinalize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZCountedWithoutFinalize.cpp; path = zoolib/ZCountedWithoutFinalize.cpp; sourceTree = "<group>"; };
C005D15D11697C300055865A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
C0086072118C84000097CFB3 /* ZCounted.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZCounted.cpp; path = zoolib/ZCounted.cpp; sourceTree = "<group>"; };
- C008607D118C84290097CFB3 /* ZWorkerRunner_Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZWorkerRunner_Thread.cpp; path = zoolib/ZWorkerRunner_Thread.cpp; sourceTree = "<group>"; };
C00B4FCA115ED0820009AB11 /* ZStreamerRWCon_SSL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZStreamerRWCon_SSL.cpp; path = zoolib/ZStreamerRWCon_SSL.cpp; sourceTree = "<group>"; };
C00B4FCB115ED0820009AB11 /* ZStreamRWCon_SSL_OSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZStreamRWCon_SSL_OSX.cpp; path = zoolib/ZStreamRWCon_SSL_OSX.cpp; sourceTree = "<group>"; };
C00B4FCC115ED0820009AB11 /* ZStreamRWCon_SSL_Win.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZStreamRWCon_SSL_Win.cpp; path = zoolib/ZStreamRWCon_SSL_Win.cpp; sourceTree = "<group>"; };
@@ -204,11 +205,15 @@
C0795FC9117D1021004124C3 /* ZNetscape_Guest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZNetscape_Guest.cpp; path = more/zoolib/netscape/ZNetscape_Guest.cpp; sourceTree = "<group>"; };
C07D2E4D1121E0EF003C0AED /* ZVal_Any.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZVal_Any.cpp; path = zoolib/ZVal_Any.cpp; sourceTree = "<group>"; };
C09C94900FB881B700959F95 /* FlashHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FlashHost.cpp; path = ../src/FlashHost.cpp; sourceTree = SOURCE_ROOT; };
+ C0AF0B1413DF262F00C5661B /* ZCaller_CFRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZCaller_CFRunLoop.cpp; path = zoolib/ZCaller_CFRunLoop.cpp; sourceTree = "<group>"; };
+ C0AF0B1513DF262F00C5661B /* ZUtil_string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZUtil_string.cpp; path = zoolib/ZUtil_string.cpp; sourceTree = "<group>"; };
+ C0AF0B1A13DF264000C5661B /* ZCaller_EventLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZCaller_EventLoop.cpp; path = zoolib/ZCaller_EventLoop.cpp; sourceTree = "<group>"; };
C0DA8E441268A2E6001E643C /* NSApplicationDelegate_FlashHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSApplicationDelegate_FlashHost.h; path = ../src/NSApplicationDelegate_FlashHost.h; sourceTree = SOURCE_ROOT; };
C0DA8E451268A2E6001E643C /* NSApplicationDelegate_FlashHost.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NSApplicationDelegate_FlashHost.mm; path = ../src/NSApplicationDelegate_FlashHost.mm; sourceTree = SOURCE_ROOT; };
C0DA8EAD1268A4E3001E643C /* ZObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ZObjC.mm; path = zoolib/ZObjC.mm; sourceTree = "<group>"; };
C0DA8F6B1268AB15001E643C /* MainNib.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainNib.xib; sourceTree = "<group>"; };
C0E30E8312669AB100642353 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ C0E49CF913C655BF00ED02FB /* ZCallScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZCallScheduler.cpp; path = zoolib/ZCallScheduler.cpp; sourceTree = "<group>"; };
C0F3B553102B8D7C002231CB /* ZNetscape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZNetscape.cpp; path = more/zoolib/netscape/ZNetscape.cpp; sourceTree = "<group>"; };
C0F3B554102B8D7C002231CB /* ZNetscape_GuestFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZNetscape_GuestFactory.cpp; path = more/zoolib/netscape/ZNetscape_GuestFactory.cpp; sourceTree = "<group>"; };
C0F3B555102B8D7C002231CB /* ZNetscape_Host.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZNetscape_Host.cpp; path = more/zoolib/netscape/ZNetscape_Host.cpp; sourceTree = "<group>"; };
@@ -217,8 +222,6 @@
C0F3B55E102B8D93002231CB /* ZNetscape_Host_Std.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZNetscape_Host_Std.cpp; path = more/zoolib/netscape/ZNetscape_Host_Std.cpp; sourceTree = "<group>"; };
C0F3B561102B8DA9002231CB /* ZAny.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZAny.cpp; path = zoolib/ZAny.cpp; sourceTree = "<group>"; };
C0F3B562102B8DA9002231CB /* ZData_Any.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZData_Any.cpp; path = zoolib/ZData_Any.cpp; sourceTree = "<group>"; };
- C0F553DA126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZWorkerRunner_CFRunLoop.cpp; path = zoolib/ZWorkerRunner_CFRunLoop.cpp; sourceTree = "<group>"; };
- C0F553DB126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZWorkerRunner_CFRunLoop.h; path = zoolib/ZWorkerRunner_CFRunLoop.h; sourceTree = "<group>"; };
C0F980AB1055F5590072462C /* ZWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZWorker.cpp; path = zoolib/ZWorker.cpp; sourceTree = "<group>"; };
C0F981011056D3040072462C /* FlashHost_Main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FlashHost_Main.mm; path = ../src/FlashHost_Main.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -299,6 +302,9 @@
C0F3B561102B8DA9002231CB /* ZAny.cpp */,
C01176740F24E37400E7E01D /* ZAtomic.cpp */,
C011768E0F24E37400E7E01D /* ZByteSwap.cpp */,
+ C0AF0B1413DF262F00C5661B /* ZCaller_CFRunLoop.cpp */,
+ C0AF0B1A13DF264000C5661B /* ZCaller_EventLoop.cpp */,
+ C0E49CF913C655BF00ED02FB /* ZCallScheduler.cpp */,
C01176900F24E37400E7E01D /* ZCommandLine.cpp */,
C01176940F24E37400E7E01D /* ZCompare.cpp */,
C0406DC611E4D3880000291D /* ZCompare_Integer.cpp */,
@@ -384,13 +390,11 @@
C04ACF6910953A4B00BCCD3A /* ZUtil_POSIXFD.cpp */,
C011786B0F24E37500E7E01D /* ZUtil_Strim.cpp */,
C0768B7413AB76E8008968F6 /* ZUtil_Strim_Operators.cpp */,
+ C0AF0B1513DF262F00C5661B /* ZUtil_string.cpp */,
C01178800F24E37500E7E01D /* ZUtil_Time.cpp */,
C011788A0F24E37500E7E01D /* ZUtil_Win.cpp */,
C07D2E4D1121E0EF003C0AED /* ZVal_Any.cpp */,
C0F980AB1055F5590072462C /* ZWorker.cpp */,
- C0F553DA126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.cpp */,
- C0F553DB126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.h */,
- C008607D118C84290097CFB3 /* ZWorkerRunner_Thread.cpp */,
);
name = cxx;
path = ../../../zoolib/source/cxx;
@@ -548,7 +552,6 @@
C0795FCA117D1021004124C3 /* ZNetscape_Guest_Std.cpp in Sources */,
C0795FCB117D1021004124C3 /* ZNetscape_Guest.cpp in Sources */,
C0086073118C84000097CFB3 /* ZCounted.cpp in Sources */,
- C008607E118C84290097CFB3 /* ZWorkerRunner_Thread.cpp in Sources */,
C0406DC711E4D3880000291D /* ZCompare_Integer.cpp in Sources */,
C0406DCC11E4D3950000291D /* ZCompare_String.cpp in Sources */,
C003F330125F80D800C11A02 /* ZCountedWithoutFinalize.cpp in Sources */,
@@ -557,11 +560,14 @@
C0DA8E461268A2E6001E643C /* NSApplicationDelegate_FlashHost.mm in Sources */,
C0DA8EAE1268A4E3001E643C /* ZObjC.mm in Sources */,
C0F55259126D2C5200A34324 /* ZMacOSX.cpp in Sources */,
- C0F553DC126D3BDF00A34324 /* ZWorkerRunner_CFRunLoop.cpp in Sources */,
C0768B6713AB7688008968F6 /* ZRef_CF.cpp in Sources */,
C0768B6813AB7688008968F6 /* ZUtil_CF.cpp in Sources */,
C0768B7513AB76E8008968F6 /* ZUtil_Strim_Operators.cpp in Sources */,
C0768B7913AB76FA008968F6 /* ZCompare_Real.cpp in Sources */,
+ C0E49CFA13C655BF00ED02FB /* ZCallScheduler.cpp in Sources */,
+ C0AF0B1613DF262F00C5661B /* ZCaller_CFRunLoop.cpp in Sources */,
+ C0AF0B1713DF262F00C5661B /* ZUtil_string.cpp in Sources */,
+ C0AF0B1B13DF264000C5661B /* ZCaller_EventLoop.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/zoolib_samples/FlashHost/src/FlashHost.cpp
===================================================================
--- trunk/zoolib_samples/FlashHost/src/FlashHost.cpp 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/src/FlashHost.cpp 2012-01-11 21:31:41 UTC (rev 2673)
@@ -16,7 +16,6 @@
namespace net_em {
-using std::multimap;
using std::set;
using std::string;
using std::vector;
@@ -30,14 +29,12 @@
#pragma mark -
#pragma mark * spTryLoadGF
-static ZRef<ZNetscape::GuestFactory> spTryLoadGF(const string& iPath)
+static ZRef<ZNetscape::GuestFactory> spTryLoadGF(ZQ<int> iEarliest, ZQ<int> iLatest, const string& iPath)
{
- try
- {
- return ZNetscape::sMakeGuestFactory(iPath);
- }
+ try { return ZNetscape::sMakeGuestFactory(iEarliest, iLatest, iPath); }
catch (...)
{}
+
return null;
}
@@ -99,10 +96,10 @@
static Val spTrail(const Val& iVal, const ZTrail& iTrail)
{
- Val curVal = iVal;
+ ZQ<Val> curVal = iVal;
for (size_t x = 0; curVal && x < iTrail.Count(); ++x)
- curVal = curVal.GetKeyRef().Get(iTrail.At(x));
- return curVal;
+ curVal = curVal->GetKeyRef().QGet(iTrail.At(x));
+ return *curVal;
}
static ZQ<ZTrail> spGetTrailAt(const Val& iRoot, const ZTrail& iTrail)
@@ -181,48 +178,15 @@
return result;
}
-static uint64 spGetVersionNumber(const string16& iPath)
+static ZRef<ZNetscape::GuestFactory> spLoadWindows(ZQ<int> iEarliest, ZQ<int> iLatest)
{
- DWORD dummy;
- if (DWORD theSize = ::GetFileVersionInfoSizeW(const_cast<WCHAR*>(iPath.c_str()), &dummy))
- {
- vector<char> buffer(theSize);
- if (::GetFileVersionInfoW(const_cast<WCHAR*>(iPath.c_str()), 0, theSize, &buffer[0]))
- {
- VS_FIXEDFILEINFO* info;
- UINT infoSize;
- if (::VerQueryValueW(&buffer[0], const_cast<WCHAR*>(L"\\"), (void**)&info, &infoSize)
- && infoSize >= sizeof(VS_FIXEDFILEINFO))
- {
- return uint64(info->dwFileVersionLS) | uint64(info->dwFileVersionMS) << 32;
- }
- }
- }
- return 0;
- }
-
-static uint64 spGetVersionNumber(const ZTrail& iTrail)
- { return spGetVersionNumber(ZUnicode::sAsUTF16(spTrailAsWin(iTrail))); }
-
-static ZRef<ZNetscape::GuestFactory> spLoadWindows(uint64& oVersion)
- {
- set<ZTrail> candidates = spGenerateCandidates();
-
- multimap<uint64, ZTrail> theMap;
+ const set<ZTrail> candidates = spGenerateCandidates();
for (set<ZTrail>::const_iterator i = candidates.begin(); i != candidates.end(); ++i)
{
- const ZTrail theTrail = *i;
- if (const uint64 theVer = spGetVersionNumber(theTrail))
- theMap.insert(std::make_pair(theVer, theTrail));
- }
-
- for (multimap<uint64, ZTrail>::reverse_iterator i = theMap.rbegin(); i != theMap.rend(); ++i)
- {
- if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(spTrailAsWin(i->second)))
+ if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(iEarliest, iLatest, spTrailAsWin(*i)))
{
if (ZLOGF(s, ePriority_Info))
- s << "Using file: " << i->second.AsString();
- oVersion = i->first;
+ s << "Using file: " << i->AsString();
return theGF;
}
}
@@ -236,40 +200,41 @@
#pragma mark -
#pragma mark * sLoadGF
-ZRef<ZNetscape::GuestFactory> sLoadGF(uint64& oVersion, const string* iNativePaths, size_t iCount)
+ZRef<ZNetscape::GuestFactory> sLoadGF
+ (ZQ<int> iEarliest, ZQ<int> iLatest, const string* iNativePaths, size_t iCount)
{
- oVersion = 0;
for (size_t x = 0; x < iCount; ++x)
{
const string& thePath = iNativePaths[x];
if (thePath.size())
{
- if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(thePath))
- {
- #if ZCONFIG_SPI_Enabled(Win)
- oVersion = spGetVersionNumber(ZUnicode::sAsUTF16(thePath));
- #endif
+ if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(iEarliest, iLatest, thePath))
return theGF;
- }
}
}
+ ZRef<ZNetscape::GuestFactory> theGF;
+
#if ZCONFIG_SPI_Enabled(Win)
- if (ZRef<ZNetscape::GuestFactory> theGF = spLoadWindows(oVersion))
+ if (ZRef<ZNetscape::GuestFactory> theGF = spLoadWindows(iEarliest, iLatest))
return theGF;
#endif // ZCONFIG_SPI_Enabled(Win)
#if ZCONFIG_SPI_Enabled(Carbon64)
- string thePath = spFindFolder(kUserDomain, kInternetPlugInFolderType) + "/Flash Player.plugin";
- if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(thePath))
+ if (ZRef<ZNetscape::GuestFactory> theGF =
+ spTryLoadGF(iEarliest, iLatest, spFindFolder(kUserDomain, kInternetPlugInFolderType) + "/Flash Player.plugin"))
+ {
return theGF;
+ }
- thePath = spFindFolder(kLocalDomain, kInternetPlugInFolderType) + "/Flash Player.plugin";
- if (ZRef<ZNetscape::GuestFactory> theGF = spTryLoadGF(thePath))
+ if (ZRef<ZNetscape::GuestFactory> theGF =
+ spTryLoadGF(iEarliest, iLatest, spFindFolder(kLocalDomain, kInternetPlugInFolderType) + "/Flash Player.plugin"))
+ {
return theGF;
+ }
#endif // ZCONFIG_SPI_Enabled(Carbon64)
Modified: trunk/zoolib_samples/FlashHost/src/FlashHost.h
===================================================================
--- trunk/zoolib_samples/FlashHost/src/FlashHost.h 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/src/FlashHost.h 2012-01-11 21:31:41 UTC (rev 2673)
@@ -13,7 +13,8 @@
using ZNetscape::NPVariantH;
using std::string;
-ZRef<ZNetscape::GuestFactory> sLoadGF(uint64& oVersion, const std::string* iNativePaths, size_t iCount);
+ZRef<ZNetscape::GuestFactory> sLoadGF
+ (ZQ<int> iEarliest, ZQ<int> iLatest, const std::string* iNativePaths, size_t iCount);
// =================================================================================================
#pragma mark -
Modified: trunk/zoolib_samples/FlashHost/src/FlashHost_Main.cpp
===================================================================
--- trunk/zoolib_samples/FlashHost/src/FlashHost_Main.cpp 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/src/FlashHost_Main.cpp 2012-01-11 21:31:41 UTC (rev 2673)
@@ -6,7 +6,7 @@
#include "zoolib/ZStdIO.h"
#include "zoolib/ZStrim_Stream.h"
#include "zoolib/ZStrimmer_Streamer.h"
-#include "zoolib/ZUtil_CFType.h"
+#include "zoolib/ZUtil_CF.h"
#include "zoolib/ZUtil_Debug.h"
#include "zoolib/ZUtil_STL_vector.h"
#include "zoolib/ZWND.h"
@@ -105,7 +105,7 @@
if (iCompositing)
title += "/Compositing";
- ::SetWindowTitleWithCFString(theWindowRef, ZUtil_CFType::sString(title));
+ ::SetWindowTitleWithCFString(theWindowRef, ZUtil_CF::sString(title));
::ShowWindow(theWindowRef);
::BringToFront(theWindowRef);
Modified: trunk/zoolib_samples/FlashHost/src/FlashHost_Main.mm
===================================================================
--- trunk/zoolib_samples/FlashHost/src/FlashHost_Main.mm 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/src/FlashHost_Main.mm 2012-01-11 21:31:41 UTC (rev 2673)
@@ -9,7 +9,7 @@
#include "zoolib/ZStrimmer_Streamer.h"
#include "zoolib/ZUtil_CF.h"
#include "zoolib/ZUtil_Debug.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include "zoolib/ZUtil_Strim_Operators.h"
#include "zoolib/ZWND.h"
@@ -179,9 +179,7 @@
, fLogFile("--logfile", "Log: name of file to write log messages to", "-")
, fURL("--url", "URL from which to load an swf",
"http://127.0.0.1/~ag/form1easy.swf")
-// "http://surfer.em.net/~ag/form1easy.swf")
// "http://www.tizag.com/pics/flash/form1easy.swf")
-// "http://www.adobe.com/devnet/flash/samples/game_2/2_amoebas.swf")
// "http://www.adobe.com/content/dotcom/en/devnet/actionscript/samples/game_2/_jcr_content/articlecontentAdobe/generic/file.res/2_amoebas%5b1%5d.swf")
, fFlashLib("--flashlib", "File from which to load the flash plugin", "./NPSWF32.dll")
{}
@@ -247,6 +245,10 @@
if (const ZLog::S& s = ZLog::S(ZLog::ePriority_Info, "ZMain"))
s.Writef("Starting");
+ #if ZCONFIG_SPI_Enabled(Cocoa)
+ ZAutoreleasePool thePool;
+ #endif // ZCONFIG_SPI_Enabled(Cocoa)
+
uint64 theVersion;
ZRef<ZNetscape::GuestFactory> theGF = net_em::sLoadGF(theVersion, &cmd.fFlashLib(), 1);
if (!theGF)
@@ -256,6 +258,12 @@
}
+ if (ZQ<int> theVersion = theGF->GetMajorVersion())
+ {
+ if (ZLOGF(s, eDebug))
+ s << *theVersion;
+ }
+
const string theMIME = "application/x-shockwave-flash";
const string theURL = cmd.fURL();
@@ -276,7 +284,7 @@
theParams.push_back(Param_t("wmode", "transparent"));
}
- #if 0 && ZCONFIG_SPI_Enabled(Carbon)
+ #if 1 && ZCONFIG_SPI_Enabled(Carbon)
for (int useWindowRef = 0; useWindowRef < 2; ++useWindowRef)
{
for (int useAllowCG = 0; useAllowCG < 2; ++useAllowCG)
@@ -288,8 +296,9 @@
if (!useCompositing && !useWindowRef)
continue;
-// if (useCompositing || !useWindowRef || useAllowCG)
- if (!useCompositing || useWindowRef || !useAllowCG)
+ if (useCompositing || !useWindowRef || useAllowCG)
+// if (!useCompositing || useWindowRef || !useAllowCG)
+// if (!useAllowCG)
continue;
ZNetscape::Host_Std* theFlashHost
@@ -313,7 +322,7 @@
// -----
- #if 0 && ZCONFIG_SPI_Enabled(Carbon)
+ #if 1 && ZCONFIG_SPI_Enabled(Carbon)
::RunApplicationEventLoop();
@@ -330,7 +339,6 @@
#else
- ZAutoreleasePool thePool;
extern ZRef<ZNetscape::GuestFactory> sharedGF;
sharedGF = theGF;
Modified: trunk/zoolib_samples/FlashHost/src/NSApplicationDelegate_FlashHost.mm
===================================================================
--- trunk/zoolib_samples/FlashHost/src/NSApplicationDelegate_FlashHost.mm 2012-01-11 21:28:20 UTC (rev 2672)
+++ trunk/zoolib_samples/FlashHost/src/NSApplicationDelegate_FlashHost.mm 2012-01-11 21:31:41 UTC (rev 2673)
@@ -2,6 +2,8 @@
#if ZCONFIG_SPI_Enabled(Cocoa)
+#import <AppKit/NSScreen.h>
+
#include "FlashHost_Cocoa.h"
#include "zoolib/ZUtil_STL_vector.h"
@@ -27,8 +29,10 @@
- (void) awakeFromNib
{
+ ZGRectf iBounds(0, 44, 400, 300);
+
fWindow = [[NSWindow alloc]
- initWithContentRect:ZGRectf(0, 0, 400, 300)
+ initWithContentRect:iBounds.FlippedY([[[NSScreen screens] objectAtIndex:0] frame].size.height)
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
backing:NSBackingStoreBuffered
defer:NO];
@@ -42,7 +46,8 @@
FlashHost_Cocoa* theHost = new FlashHost_Cocoa(sharedGF, theView);
const string theMIME = "application/x-shockwave-flash";
- const string theURL = "http://www.em.net/fl_64/form1easy.swf";
+ const string theURL = "http://www.adobe.com/content/dotcom/en/devnet/actionscript/samples/game_2/_jcr_content/articlecontentAdobe/generic/file.res/2_amoebas%5b1%5d.swf";
+// const string theURL = "http://www.em.net/fl_64/form1easy.swf";
typedef ZNetscape::Host_Std::Param_t Param_t;
vector<Param_t> theParams;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
