Warning fixes for devenum by Stefan Ginsberg

svn path=/trunk/; revision=34414

diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index 316c3f5..9a153bf 100644 (file)
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">

-<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true" unicode="yes">
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" unicode="yes">

        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
        <importlibrary definition="devenum.spec.def" />
        <include base="devenum">.</include>
        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
        <importlibrary definition="devenum.spec.def" />
        <include base="devenum">.</include>

diff --git a/reactos/dll/directx/devenum/devenum_private.h b/reactos/dll/directx/devenum/devenum_private.h
index 5ee8da6..2241f48 100644 (file)
--- a/reactos/dll/directx/devenum/devenum_private.h
+++ b/reactos/dll/directx/devenum/devenum_private.h
@@ -67,7 +67,7 @@ typedef struct
 typedef struct
 {
     IEnumMonikerVtbl *lpVtbl;
 typedef struct
 {
     IEnumMonikerVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

     DWORD index;
     HKEY hkey;
 } EnumMonikerImpl;
     DWORD index;
     HKEY hkey;
 } EnumMonikerImpl;


@@ -76,7 +76,7 @@ typedef struct
 {
     IMonikerVtbl *lpVtbl;
 
 {
     IMonikerVtbl *lpVtbl;
 

-    ULONG ref;
+    LONG ref;

     HKEY hkey;
 } MediaCatMoniker;
 
     HKEY hkey;
 } MediaCatMoniker;
 

diff --git a/reactos/dll/directx/devenum/mediacatenum.c b/reactos/dll/directx/devenum/mediacatenum.c
index d8d0a3f..b8c5074 100644 (file)
--- a/reactos/dll/directx/devenum/mediacatenum.c
+++ b/reactos/dll/directx/devenum/mediacatenum.c
@@ -40,7 +40,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface);
 typedef struct
 {
     IPropertyBagVtbl *lpVtbl;
 typedef struct
 {
     IPropertyBagVtbl *lpVtbl;

-    DWORD ref;
+    LONG ref;

     HKEY hkey;
 } RegPropBagImpl;
 
     HKEY hkey;
 } RegPropBagImpl;
 


@@ -103,7 +103,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read(
     IErrorLog* pErrorLog)
 {
     LPVOID pData = NULL;
     IErrorLog* pErrorLog)
 {
     LPVOID pData = NULL;

-    LONG received;
+    DWORD received;

     DWORD type = 0;
     RegPropBagImpl *This = (RegPropBagImpl *)iface;
     HRESULT res = S_OK;
     DWORD type = 0;
     RegPropBagImpl *This = (RegPropBagImpl *)iface;
     HRESULT res = S_OK;