[xiph-commits] r11010 - in branches/oggdsf_ce_port/src/lib:
core/directshow/dsfOggDemux2 core/ogg/libOOOggSeek
helper/libilliCore
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Wed Mar 15 02:40:08 PST 2006
Author: illiminable
Date: 2006-03-15 02:39:30 -0800 (Wed, 15 Mar 2006)
New Revision: 11010
Modified:
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/stdafx.h
branches/oggdsf_ce_port/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj
branches/oggdsf_ce_port/src/lib/helper/libilliCore/libilliCore.vcproj
Log:
* Demux filter almost compiles for WM5. One unresolved symbol for a registry function that doesn't exist on WinCE
* Due to name mangling incompatablities, some libraries have to be built with wchar_t as built-in type disabled, otherwise it can't link to certain static libraries
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp 2006-03-15 10:39:30 UTC (rev 11010)
@@ -139,7 +139,8 @@
#ifdef UNICODE
//NOTE::: For various reasons this is all ansi, all strings are internal, not user created.
-bool RegWrap::removeKeyVal(HKEY inHive, string inKeyName, string inValueName)
+// ---- No longer true
+bool RegWrap::removeKeyVal(HKEY inHive, wstring inKeyName, wstring inValueName)
#else
bool RegWrap::removeKeyVal(HKEY inHive, string inKeyName, string inValueName)
#endif
@@ -152,7 +153,7 @@
HKEY locKey;
LONG retVal;
- retVal = RegOpenKeyExA( inHive,
+ retVal = RegOpenKeyEx( inHive,
inKeyName.c_str(),
NULL,
KEY_ALL_ACCESS,
@@ -163,7 +164,7 @@
return false;
}
- retVal = RegDeleteValueA(locKey, inValueName.c_str());
+ retVal = RegDeleteValue(locKey, inValueName.c_str());
RegCloseKey(locKey);
if (retVal != ERROR_SUCCESS) {
return false;
@@ -266,8 +267,8 @@
HKEY locKey;
LONG retVal;
- retVal = RegOpenKeyExA( HKEY_LOCAL_MACHINE,
- "SOFTWARE\\illiminable\\oggcodecs",
+ retVal = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
+ TEXT("SOFTWARE\\illiminable\\oggcodecs"),
NULL,
KEY_ALL_ACCESS,
&locKey);
@@ -277,25 +278,34 @@
return false;
}
- DWORD locBuffSize = 16;
- char locBuff[16];
- retVal = RegQueryValueExA( locKey,
- "MediaDescNum",
+
+ DWORD locBuffSize = 64;
+ char locBuff[64];
+
+ retVal = RegQueryValueEx( locKey,
+ TEXT("MediaDescNum"),
NULL,
NULL,
(BYTE*)&locBuff,
&locBuffSize);
+
+#ifdef UNICODE
+ wstring locBuffStr = (wchar_t*)locBuff;
+#else
+ string locBuffStr = locBuff;
+#endif
+
RegCloseKey(locKey);
if (retVal != ERROR_SUCCESS) {
//debugLog<<"Value not found"<<endl;
return false;
} else {
- RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\Descriptions", locBuff);
- RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\MUIDescriptions", locBuff);
- RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\Types", locBuff);
- RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, "SOFTWARE\\illiminable\\oggcodecs", "MediaDescNum");
+ RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\Descriptions"), locBuffStr.c_str());
+ RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\MUIDescriptions"), locBuffStr.c_str());
+ RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\MediaPlayer\\Player\\Extensions\\Types"), locBuffStr.c_str());
+ RegWrap::removeKeyVal(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\illiminable\\oggcodecs"), TEXT("MediaDescNum"));
//debugLog<<"Value found"<<endl;
return true;
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h 2006-03-15 10:39:30 UTC (rev 11010)
@@ -17,7 +17,7 @@
static bool valueExists(HKEY inHive, wstring inKeyName, wstring inValueName);
static wstring findNextEmptyMediaPlayerDesc();
static bool addMediaPlayerDesc(wstring inDesc, wstring inExts);
- static bool removeKeyVal(HKEY inHive, string inKeyName, string inValueName);
+ static bool removeKeyVal(HKEY inHive, wstring inKeyName, wstring inValueName);
static bool deleteKeyRecurse(HKEY inHive, wstring inKeyName, wstring inSubKeyToDelete);
#else
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2006-03-15 10:39:30 UTC (rev 11010)
@@ -16,34 +16,56 @@
//**********************************
// {C9361F5A-3282-4944-9899-6D99CDC5370B}
-DEFINE_GUID(CLSID_OggDemuxPacketSourceFilter,
-0xc9361f5a, 0x3282, 0x4944, 0x98, 0x99, 0x6d, 0x99, 0xcd, 0xc5, 0x37, 0xb);
+//DEFINE_GUID(CLSID_OggDemuxPacketSourceFilter,
+//0xc9361f5a, 0x3282, 0x4944, 0x98, 0x99, 0x6d, 0x99, 0xcd, 0xc5, 0x37, 0xb);
+static const GUID CLSID_OggDemuxPacketSourceFilter =
+{ 0xc9361f5a, 0x3282, 0x4944, { 0x98, 0x99, 0x6d, 0x99, 0xcd, 0xc5, 0x37, 0xb } };
+//static const GUID <<name>> =
+//{ 0xb15c4790, 0xc332, 0x4162, { 0xb7, 0xd, 0xb4, 0x3e, 0x5a, 0x69, 0xd8, 0x51 } };
+
+
// {60891713-C24F-4767-B6C9-6CA05B3338FC}
-DEFINE_GUID(MEDIATYPE_OggPacketStream,
-0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
+//DEFINE_GUID(MEDIATYPE_OggPacketStream,
+//0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
+static const GUID MEDIATYPE_OggPacketStream =
+{0x60891713, 0xc24f, 0x4767, { 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc } };
+
// {95388704-162C-42a9-8149-C3577C12AAF9}
-DEFINE_GUID(FORMAT_OggIdentHeader,
-0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
+//DEFINE_GUID(FORMAT_OggIdentHeader,
+//0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
+static const GUID FORMAT_OggIdentHeader =
+{ 0x95388704, 0x162c, 0x42a9, { 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9 } };
+
// {43F0F818-10B0-4c86-B9F1-F6B6E2D33462}
-DEFINE_GUID(IID_IOggDecoder,
-0x43f0f818, 0x10b0, 0x4c86, 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62);
+//DEFINE_GUID(IID_IOggDecoder,
+//0x43f0f818, 0x10b0, 0x4c86, 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62);
+static const GUID IID_IOggDecoder =
+{ 0x43f0f818, 0x10b0, 0x4c86, { 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62 } };
+
// {83D7F506-53ED-4f15-B6D8-7D8E9E72A918}
-DEFINE_GUID(IID_IOggOutputPin,
-0x83d7f506, 0x53ed, 0x4f15, 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18);
+//DEFINE_GUID(IID_IOggOutputPin,
+//0x83d7f506, 0x53ed, 0x4f15, 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18);
+static const GUID IID_IOggOutputPin =
+{ 0x83d7f506, 0x53ed, 0x4f15, { 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18 } };
// {EB5AED9C-8CD0-4c4b-B5E8-F5D10AD1314D}
-DEFINE_GUID(IID_IOggBaseTime,
-0xeb5aed9c, 0x8cd0, 0x4c4b, 0xb5, 0xe8, 0xf5, 0xd1, 0xa, 0xd1, 0x31, 0x4d);
+//DEFINE_GUID(IID_IOggBaseTime,
+//0xeb5aed9c, 0x8cd0, 0x4c4b, 0xb5, 0xe8, 0xf5, 0xd1, 0xa, 0xd1, 0x31, 0x4d);
+static const GUID IID_IOggBaseTime =
+{ 0xeb5aed9c, 0x8cd0, 0x4c4b, { 0xb5, 0xe8, 0xf5, 0xd1, 0xa, 0xd1, 0x31, 0x4d } };
+
// {23EF732D-DAAF-41ee-85FB-BB97B1D01FF3}
-DEFINE_GUID(IID_ICustomSource,
-0x23ef732d, 0xdaaf, 0x41ee, 0x85, 0xfb, 0xbb, 0x97, 0xb1, 0xd0, 0x1f, 0xf3);
+//DEFINE_GUID(IID_ICustomSource,
+//0x23ef732d, 0xdaaf, 0x41ee, 0x85, 0xfb, 0xbb, 0x97, 0xb1, 0xd0, 0x1f, 0xf3);
+static const GUID IID_ICustomSource =
+{ 0x23ef732d, 0xdaaf, 0x41ee, { 0x85, 0xfb, 0xbb, 0x97, 0xb1, 0xd0, 0x1f, 0xf3 } };
//// {3913F0AB-E7ED-41c4-979B-1D1FDD983C07}
//DEFINE_GUID(MEDIASUBTYPE_FLAC,
@@ -91,7 +113,7 @@
//Structure defining the registration details of the filter
#ifdef WINCE
-AMOVIESETUP_FILTER OggDemuxPacketSourceFilterReg = {
+static const AMOVIESETUP_FILTER OggDemuxPacketSourceFilterReg = {
&CLSID_OggDemuxPacketSourceFilter, // Filter CLSID.
L"Ogg Demux Packet Source Filter", // Filter name.
MERIT_NORMAL, // Merit.
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj 2006-03-15 10:39:30 UTC (rev 11010)
@@ -967,6 +967,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="0"
WarningLevel="4"
/>
@@ -1035,7 +1036,7 @@
>
</File>
<File
- RelativePath=".\ds_guid.cpp"
+ RelativePath=".\ds_guids.cpp"
>
</File>
<File
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2006-03-15 10:39:30 UTC (rev 11010)
@@ -29,6 +29,7 @@
//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//===========================================================================
#include "stdafx.h"
+
#include "oggdllstuff.h"
#include "RegWrap.h"
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.h 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.h 2006-03-15 10:39:30 UTC (rev 11010)
@@ -42,7 +42,10 @@
#include <streams.h>
#include <pullpin.h>
+
+#ifndef WINCE
#include <initguid.h>
+#endif
//#pragma warning( pop )
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/stdafx.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/stdafx.h 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/stdafx.h 2006-03-15 10:39:30 UTC (rev 11010)
@@ -58,7 +58,7 @@
#include "OggDemuxPacketSourcePin.h"
#include <Dshow.h>
-#include <Initguid.h>
+//#include <Initguid.h>
#include <Qnetwork.h>
//#include "OggStreamMapper.h"
//#include "OggStream.h"
Modified: branches/oggdsf_ce_port/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/core/ogg/libOOOggSeek/libOOOggSeek.vcproj 2006-03-15 10:39:30 UTC (rev 11010)
@@ -1461,6 +1461,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOOGGSEEK_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
DisableSpecificWarnings="4251"
Modified: branches/oggdsf_ce_port/src/lib/helper/libilliCore/libilliCore.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/helper/libilliCore/libilliCore.vcproj 2006-03-15 08:49:06 UTC (rev 11009)
+++ branches/oggdsf_ce_port/src/lib/helper/libilliCore/libilliCore.vcproj 2006-03-15 10:39:30 UTC (rev 11010)
@@ -1248,6 +1248,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);LIBILLICORE_EXPORTS"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
/>
More information about the commits
mailing list