DMLOADER: fix gcc 4.0 -Wpointer-sign warnings

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

DMLOADER: fix gcc 4.0 -Wpointer-sign warnings

Mike McCormack
ChangeLog:
* fix gcc 4.0 -Wpointer-sign warnings

Index: dlls/dmloader/dmloader_main.c
===================================================================
RCS file: /home/wine/wine/dlls/dmloader/dmloader_main.c,v
retrieving revision 1.6
diff -u -p -r1.6 dmloader_main.c
--- dlls/dmloader/dmloader_main.c 13 May 2004 00:00:22 -0000 1.6
+++ dlls/dmloader/dmloader_main.c 4 Jul 2005 07:12:22 -0000
@@ -21,8 +21,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
 
-DWORD dwDirectMusicContainer = 0;
-DWORD dwDirectMusicLoader = 0;
+LONG dwDirectMusicContainer = 0;
+LONG dwDirectMusicLoader = 0;
 
 /******************************************************************
  * DllMain
Index: dlls/dmloader/dmloader_private.h
===================================================================
RCS file: /home/wine/wine/dlls/dmloader/dmloader_private.h,v
retrieving revision 1.14
diff -u -p -r1.14 dmloader_private.h
--- dlls/dmloader/dmloader_private.h 30 May 2005 10:01:10 -0000 1.14
+++ dlls/dmloader/dmloader_private.h 4 Jul 2005 07:12:23 -0000
@@ -45,8 +45,8 @@
 #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
 
 /* dmloader.dll global (for DllCanUnloadNow) */
-extern DWORD dwDirectMusicLoader; /* number of DirectMusicLoader(CF) instances */
-extern DWORD dwDirectMusicContainer; /* number of DirectMusicContainer(CF) instances */
+extern LONG dwDirectMusicLoader; /* number of DirectMusicLoader(CF) instances */
+extern LONG dwDirectMusicContainer; /* number of DirectMusicContainer(CF) instances */
 
 /*****************************************************************************
  * Interfaces
@@ -87,7 +87,7 @@ extern HRESULT WINAPI DMUSIC_DestroyDire
 struct IDirectMusicLoaderCF {
  /* IUnknown fields */
  const IClassFactoryVtbl *lpVtbl;
- DWORD dwRef;
+ LONG dwRef;
 };
 
 /* IUnknown / IClassFactory: */
@@ -100,7 +100,7 @@ extern ULONG   WINAPI IDirectMusicLoader
 struct IDirectMusicContainerCF {
  /* IUnknown fields */
  const IClassFactoryVtbl *lpVtbl;
- DWORD dwRef;
+ LONG dwRef;
 };
 
 /* IUnknown / IClassFactory: */
@@ -130,7 +130,7 @@ struct IDirectMusicLoaderImpl {
  /* VTABLEs */
  const IDirectMusicLoader8Vtbl *LoaderVtbl;
  /* reference counter */
- DWORD dwRef;
+ LONG dwRef;
  /* simple cache (linked list) */
  struct list *pObjects;
  /* settings for certain object classes */
@@ -162,7 +162,7 @@ struct IDirectMusicContainerImpl {
  const IDirectMusicObjectVtbl *ObjectVtbl;
  const IPersistStreamVtbl *PersistStreamVtbl;
  /* reference counter */
- DWORD dwRef;
+ LONG dwRef;
  /* stream */
  LPSTREAM pStream;
  /* header */
@@ -191,7 +191,7 @@ struct IDirectMusicLoaderFileStream {
  const IStreamVtbl *StreamVtbl;
  const IDirectMusicGetLoaderVtbl *GetLoaderVtbl;
  /* reference counter */
- DWORD dwRef;
+ LONG dwRef;
  /* file */
  WCHAR wzFileName[MAX_PATH]; /* for clone */
  HANDLE hFile;
@@ -217,7 +217,7 @@ struct IDirectMusicLoaderResourceStream
  const IStreamVtbl *StreamVtbl;
  const IDirectMusicGetLoaderVtbl *GetLoaderVtbl;
  /* reference counter */
- DWORD dwRef;
+ LONG dwRef;
  /* data */
  LPBYTE pbMemData;
  LONGLONG llMemLength;
@@ -245,7 +245,7 @@ struct IDirectMusicLoaderGenericStream {
  const IStreamVtbl *StreamVtbl;
  const IDirectMusicGetLoaderVtbl *GetLoaderVtbl;
  /* reference counter */
- DWORD dwRef;
+ LONG dwRef;
  /* stream */
  LPSTREAM pStream;
  /* loader */
Index: dlls/dmloader/loader.c
===================================================================
RCS file: /home/wine/wine/dlls/dmloader/loader.c,v
retrieving revision 1.18
diff -u -p -r1.18 loader.c
--- dlls/dmloader/loader.c 30 May 2005 10:01:10 -0000 1.18
+++ dlls/dmloader/loader.c 4 Jul 2005 07:12:23 -0000
@@ -827,7 +827,7 @@ HRESULT WINAPI DMUSIC_GetDefaultGMPath (
  char szPath[MAX_PATH];
 
  if ((RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\DirectMusic" , 0, KEY_READ, &hkDM) != ERROR_SUCCESS) ||
-    (RegQueryValueExA (hkDM, "GMFilePath", NULL, &returnType, szPath, &sizeOfReturnBuffer) != ERROR_SUCCESS)) {
+    (RegQueryValueExA (hkDM, "GMFilePath", NULL, &returnType, (LPBYTE) szPath, &sizeOfReturnBuffer) != ERROR_SUCCESS)) {
  WARN(": registry entry missing\n" );
  return E_FAIL;
  }