Fix gcc 4.0 -Wpointer-sign warnings.

dlls/dmloader/dmloader_main.c

@@ -21,8 +21,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
 
-DWORD dwDirectMusicContainer = 0;
-DWORD dwDirectMusicLoader = 0;
+LONG dwDirectMusicContainer = 0;
+LONG dwDirectMusicLoader = 0;
 
 /******************************************************************
  *		DllMain

dlls/dmloader/dmloader_private.h

@@ -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_DestroyDirectMusicLoaderGenericStream (LPSTREAM ifa
 struct IDirectMusicLoaderCF {
 	/* IUnknown fields */
 	const IClassFactoryVtbl *lpVtbl;
-	DWORD dwRef;
+	LONG dwRef;
 };
 
 /* IUnknown / IClassFactory: */
@@ -100,7 +100,7 @@ extern ULONG   WINAPI IDirectMusicLoaderCF_AddRef (LPCLASSFACTORY iface);
 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 */

dlls/dmloader/loader.c

@@ -827,7 +827,7 @@ HRESULT WINAPI DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) {
 	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;
 	}

dlls/ole32/antimoniker.c

@@ -49,7 +49,7 @@ typedef struct AntiMonikerImpl{
      */
     const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
 } AntiMonikerImpl;
 

dlls/ole32/bindctx.c

@@ -52,7 +52,7 @@ typedef struct BindCtxImpl{
 
     const IBindCtxVtbl *lpVtbl; /* VTable relative to the IBindCtx interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
     BindCtxObject* bindCtxTable; /* this is a table in which all bounded objects are stored*/
     DWORD          bindCtxTableLastIndex;  /* first free index in the table */

dlls/ole32/clipboard.c

@@ -122,7 +122,7 @@ struct OLEClipbrd
   /*
    * Reference count of this object
    */
-  ULONG                      ref;
+  LONG                       ref;
 };
 
 typedef struct OLEClipbrd OLEClipbrd;
@@ -145,7 +145,7 @@ typedef struct
   /*
    * Reference count of this object
    */
-  DWORD                        ref;
+  LONG                         ref;
 
   /*
    * IUnknown implementation of the parent data object.

dlls/ole32/compobj_private.h

@@ -112,7 +112,7 @@ struct proxy_manager
   OXID oxid;                /* object exported ID (RO) */
   OID oid;                  /* object ID (RO) */
   struct list interfaces;   /* imported interfaces (CS cs) */
-  DWORD refs;               /* proxy reference count (LOCK) */
+  LONG refs;                /* proxy reference count (LOCK) */
   CRITICAL_SECTION cs;      /* thread safety for this object and children */
   ULONG sorflags;           /* STDOBJREF flags (RO) */
   IRemUnknown *remunk;      /* proxy to IRemUnknown used for lifecycle management (CS cs) */
@@ -124,12 +124,12 @@ struct apartment
 {
   struct list entry;       
 
-  DWORD refs;              /* refcount of the apartment (LOCK) */
+  LONG  refs;              /* refcount of the apartment (LOCK) */
   DWORD model;             /* threading model (RO) */
   DWORD tid;               /* thread id (RO) */
   HANDLE thread;           /* thread handle (RO) */
   OXID oxid;               /* object exporter ID (RO) */
-  DWORD ipidc;             /* interface pointer ID counter, starts at 1 (LOCK) */
+  LONG ipidc;              /* interface pointer ID counter, starts at 1 (LOCK) */
   HWND win;                /* message window (RO) */
   CRITICAL_SECTION cs;     /* thread safety */
   LPMESSAGEFILTER filter;  /* message filter (CS cs) */

dlls/ole32/compositemoniker.c

@@ -54,7 +54,7 @@ typedef struct CompositeMonikerImpl{
      */
     const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
     IMoniker** tabMoniker; /* dynamaic table containing all components (monikers) of this composite moniker */
 
@@ -70,7 +70,7 @@ typedef struct EnumMonikerImpl{
 
     const IEnumMonikerVtbl *lpVtbl;  /* VTable relative to the IEnumMoniker interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
     IMoniker** tabMoniker; /* dynamic table containing the enumerated monikers */
 

dlls/ole32/datacache.c

@@ -103,7 +103,7 @@ struct DataCache
   /*
    * Reference count of this object
    */
-  ULONG ref;
+  LONG ref;
 
   /*
    * IUnknown implementation of the outer object.

dlls/ole32/defaulthandler.c

@@ -78,7 +78,7 @@ struct DefaultHandler
   /*
    * Reference count of this object
    */
-  ULONG ref;
+  LONG ref;
 
   /*
    * IUnknown implementation of the outer object.

dlls/ole32/errorinfo.c

@@ -131,7 +131,7 @@ typedef struct ErrorInfoImpl
 	const IErrorInfoVtbl           *lpvtei;
 	const ICreateErrorInfoVtbl     *lpvtcei;
 	const ISupportErrorInfoVtbl    *lpvtsei;
-	DWORD				ref;
+	LONG				ref;
 
 	GUID m_Guid;
 	BSTR bstrSource;

dlls/ole32/filemoniker.c

@@ -53,7 +53,7 @@ typedef struct FileMonikerImpl{
      */
     const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
     LPOLESTR filePathName; /* path string identified by this filemoniker */
 

dlls/ole32/ftmarshal.c

@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 typedef struct _FTMarshalImpl {
 	const IUnknownVtbl *lpVtbl;
-	DWORD ref;
+	LONG ref;
 	const IMarshalVtbl *lpvtblFTM;
 
 	IUnknown *pUnkOuter;

dlls/ole32/hglobalstream.c

@@ -60,7 +60,7 @@ struct HGLOBALStreamImpl
   /*
    * Reference count
    */
-  ULONG		     ref;
+  LONG		     ref;
 
   /*
    * Support for the stream

dlls/ole32/ifs.c

@@ -366,7 +366,7 @@ static const IMallocSpyVtbl VT_IMallocSpy;
 
 typedef struct {
         const IMallocSpyVtbl *lpVtbl;
-        DWORD ref;
+        LONG ref;
 } _MallocSpy;
 
 /* this is the static object instance */

dlls/ole32/itemmoniker.c

@@ -52,7 +52,7 @@ typedef struct ItemMonikerImpl{
      */
     const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData interface.*/
 
-    ULONG ref; /* reference counter for this object */
+    LONG ref; /* reference counter for this object */
 
     LPOLESTR itemName; /* item name identified by this ItemMoniker */
 

dlls/ole32/marshal.c

@@ -763,7 +763,7 @@ HRESULT apartment_disconnectproxies(struct apartment *apt)
 typedef struct _StdMarshalImpl
 {
     const IMarshalVtbl	*lpvtbl;
-    DWORD		ref;
+    LONG		ref;
 
     IID			iid;
     DWORD		dwDestContext;

dlls/ole32/memlockbytes.c

@@ -57,7 +57,7 @@ struct HGLOBALLockBytesImpl
   /*
    * Reference count
    */
-  ULONG        ref;
+  LONG        ref;
 
   /*
    * Support for the LockBytes object

dlls/ole32/memlockbytes16.c

@@ -53,7 +53,7 @@ struct HGLOBALLockBytesImpl16
    * since we want to cast this in an ILockBytes pointer
    */
   const ILockBytes16Vtbl *lpVtbl;
-  ULONG        ref;
+  LONG        ref;
 
   /*
    * Support for the LockBytes object

dlls/ole32/moniker.c

@@ -60,7 +60,7 @@ struct rot_entry
 typedef struct RunningObjectTableImpl
 {
     const IRunningObjectTableVtbl *lpVtbl;
-    ULONG ref;
+    LONG ref;
 
     struct list rot; /* list of ROT entries */
     CRITICAL_SECTION lock;
@@ -73,7 +73,7 @@ static RunningObjectTableImpl* runningObjectTableInstance = NULL;
 static inline HRESULT WINAPI
 IrotRegister(DWORD *cookie)
 {
-    static DWORD last_cookie = 1;
+    static LONG last_cookie = 1;
     *cookie = InterlockedIncrement(&last_cookie);
     return S_OK;
 }
@@ -82,7 +82,7 @@ IrotRegister(DWORD *cookie)
 typedef struct EnumMonikerImpl
 {
     const IEnumMonikerVtbl *lpVtbl;
-    ULONG      ref;
+    LONG ref;
 
     MInterfacePointer **monikers;
     ULONG moniker_count;
@@ -988,7 +988,7 @@ typedef struct MonikerMarshal
     const IUnknownVtbl *lpVtbl;
     const IMarshalVtbl *lpVtblMarshal;
     
-    ULONG ref;
+    LONG ref;
     IMoniker *moniker;
 } MonikerMarshal;
 

dlls/ole32/ole16.c

@@ -370,7 +370,7 @@ HRESULT WINAPI ProgIDFromCLSID16(
 
   if (ret == S_OK)
   {
-    DWORD buf2len;
+    LONG buf2len;
     char *buf2 = HeapAlloc(GetProcessHeap(), 0, 255);
     buf2len = 255;
     if (RegQueryValueA(xhkey, NULL, buf2, &buf2len))

dlls/ole32/ole2.c

@@ -394,7 +394,7 @@ HRESULT WINAPI OleRegGetUserType(
   DWORD   cbData;
   HKEY    clsidKey;
   LONG    hres;
-  LPBYTE  buffer;
+  LPSTR   buffer;
   HRESULT retVal;
   /*
    * Initialize the out parameter.
@@ -464,7 +464,7 @@ HRESULT WINAPI OleRegGetUserType(
 			  "",
 			  NULL,
 			  &dwKeyType,
-			  buffer,
+			  (LPBYTE) buffer,
 			  &cbData);
 
   RegCloseKey(clsidKey);

dlls/ole32/oleobj.c

@@ -43,7 +43,7 @@ typedef struct OleAdviseHolderImpl
 {
   const IOleAdviseHolderVtbl *lpVtbl;
 
-  DWORD ref;
+  LONG ref;
 
   DWORD         maxSinks;
   IAdviseSink** arrayOfSinks;
@@ -357,7 +357,7 @@ typedef struct DataAdviseHolder
 {
   const IDataAdviseHolderVtbl *lpVtbl;
 
-  DWORD                 ref;
+  LONG                  ref;
   DWORD                 maxCons;
   DataAdviseConnection* Connections;
 } DataAdviseHolder;

dlls/ole32/oleproxy.c

@@ -88,7 +88,7 @@ const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0,
  */
 typedef struct _CFStub {
     const IRpcStubBufferVtbl   *lpvtbl;
-    DWORD			ref;
+    LONG			ref;
 
     LPUNKNOWN			pUnkServer;
 } CFStub;
@@ -268,7 +268,7 @@ CFStub_Construct(LPRPCSTUBBUFFER *ppv) {
 typedef struct _CFProxy {
     const IClassFactoryVtbl		*lpvtbl_cf;
     const IRpcProxyBufferVtbl	*lpvtbl_proxy;
-    DWORD				ref;
+    LONG				ref;
 
     IRpcChannelBuffer			*chanbuf;
     IUnknown *outer_unknown;
@@ -459,7 +459,7 @@ CFProxy_Construct(IUnknown *pUnkOuter, LPVOID *ppv,LPVOID *ppProxy) {
 typedef struct
 {
     const IRpcStubBufferVtbl *lpVtbl;
-    ULONG refs;
+    LONG refs;
     IRemUnknown *iface;
 } RemUnkStub;
 
@@ -664,7 +664,7 @@ static HRESULT RemUnkStub_Construct(IRpcStubBuffer **ppStub)
 typedef struct _RemUnkProxy {
     const IRemUnknownVtbl		*lpvtbl_remunk;
     const IRpcProxyBufferVtbl	*lpvtbl_proxy;
-    DWORD				refs;
+    LONG				refs;
 
     IRpcChannelBuffer			*chan;
     IUnknown *outer_unknown;

dlls/ole32/rpc.c

@@ -88,7 +88,7 @@ static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid)
 typedef struct
 {
     const IRpcChannelBufferVtbl *lpVtbl;
-    DWORD                  refs;
+    LONG                  refs;
 } RpcChannelBuffer;
 
 typedef struct

dlls/ole32/stg_prop.c

@@ -155,7 +155,7 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl;
 typedef struct tagPropertyStorage_impl
 {
     const IPropertyStorageVtbl *vtbl;
-    DWORD ref;
+    LONG ref;
     CRITICAL_SECTION cs;
     IStream *stm;
     BOOL  dirty;

dlls/ole32/storage.c

@@ -956,7 +956,7 @@ typedef struct
 {
         /* IUnknown fields */
         const IStream16Vtbl            *lpVtbl;
-        DWORD                           ref;
+        LONG                            ref;
         /* IStream16 fields */
         SEGPTR                          thisptr; /* pointer to this struct as segmented */
         struct storage_pps_entry        stde;
@@ -1450,7 +1450,7 @@ typedef struct
 {
         /* IUnknown fields */
         const IStreamVtbl              *lpVtbl;
-        DWORD                           ref;
+        LONG                            ref;
         /* IStream32 fields */
         struct storage_pps_entry        stde;
         int                             ppsent;
@@ -1504,7 +1504,7 @@ typedef struct
 {
         /* IUnknown fields */
         const IStorage16Vtbl           *lpVtbl;
-        DWORD                           ref;
+        LONG                            ref;
         /* IStorage16 fields */
         SEGPTR                          thisptr; /* pointer to this struct as segmented */
         struct storage_pps_entry        stde;

dlls/ole32/storage32.h

@@ -222,7 +222,7 @@ struct StorageBaseImpl
   /*
    * Reference count of this object
    */
-  ULONG ref;
+  LONG ref;
 
   /*
    * Ancestor storage (top level)
@@ -430,7 +430,7 @@ struct IEnumSTATSTGImpl
   const IEnumSTATSTGVtbl *lpVtbl;    /* Needs to be the first item in the struct
 				* since we want to cast this in an IEnumSTATSTG pointer */
 
-  ULONG		 ref;		        /* Reference count */
+  LONG		 ref;		        /* Reference count */
   StorageImpl* parentStorage;         /* Reference to the parent storage */
   ULONG          firstPropertyNode;     /* Index of the root of the storage to enumerate */
 
@@ -487,7 +487,7 @@ struct StgStreamImpl
   /*
    * Reference count
    */
-  ULONG		     ref;
+  LONG		     ref;
 
   /*
    * Storage that is the parent(owner) of the stream

dlls/ole32/stubmanager.c

@@ -539,7 +539,7 @@ const IID IID_IRemUnknown = { 0x00000131, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }
 typedef struct rem_unknown
 {
     const IRemUnknownVtbl *lpVtbl;
-    ULONG refs;
+    LONG refs;
 } RemUnknown;
 
 static const IRemUnknownVtbl RemUnknown_Vtbl;