diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 91e320a077a..4003e692f11 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -227,7 +227,7 @@ static HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hServiceProvi /* Strip out all dwFlags values for CREATEPLAYER msg */ #define DPMSG_CREATEPLAYER_DWFLAGS(x) 0 -static DWORD kludgePlayerGroupId = 1000; +static LONG kludgePlayerGroupId = 1000; /* ------------------------------------------------------------------ */ diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index b86d3247845..b7b0f0becfa 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -45,7 +45,7 @@ typedef struct IDirectPlay4Impl IDirectPlay4Impl; typedef struct tagDirectPlayIUnknownData { - ULONG ulObjRef; + LONG ulObjRef; CRITICAL_SECTION DP_lock; } DirectPlayIUnknownData; @@ -207,7 +207,7 @@ typedef struct tagDirectPlay4Data } DirectPlay4Data; #define DP_IMPL_FIELDS \ - ULONG ulInterfaceRef; \ + LONG ulInterfaceRef; \ DirectPlayIUnknownData* unk; \ DirectPlay2Data* dp2; \ DirectPlay3Data* dp3; \ diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 8a12aa1b362..26a1519b68b 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); -ULONG dll_count = 0; +LONG dll_count = 0; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 95265a16128..481f65357af 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); -extern ULONG dll_count; +extern LONG dll_count; /*****************************************************************************/ diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 8111f2062f7..85e8398a1b5 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); -extern ULONG dll_count; +extern LONG dll_count; /************************************************************************/ typedef struct _ITSS_IStorageImpl { const IStorageVtbl *vtbl_IStorage; - DWORD ref; + LONG ref; struct chmFile *chmfile; WCHAR dir[1]; } ITSS_IStorageImpl; @@ -66,14 +66,14 @@ struct enum_info typedef struct _IEnumSTATSTG_Impl { const IEnumSTATSTGVtbl *vtbl_IEnumSTATSTG; - DWORD ref; + LONG ref; struct enum_info *first, *last, *current; } IEnumSTATSTG_Impl; typedef struct _IStream_Impl { const IStreamVtbl *vtbl_IStream; - DWORD ref; + LONG ref; ITSS_IStorageImpl *stg; ULONGLONG addr; struct chmUnitInfo ui; diff --git a/dlls/qcap/pin.h b/dlls/qcap/pin.h index bca610eb27f..40a86342e70 100644 --- a/dlls/qcap/pin.h +++ b/dlls/qcap/pin.h @@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin); typedef struct IPinImpl { const struct IPinVtbl * lpVtbl; - ULONG refCount; + LONG refCount; LPCRITICAL_SECTION pCritSec; PIN_INFO pinInfo; IPin * pConnectedTo; diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 6b5414bca91..e5213f7abde 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumFiltersImpl { const IEnumFiltersVtbl * lpVtbl; - ULONG refCount; + LONG refCount; IBaseFilter ** ppFilters; int nFilters; ULONG uIndex; diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c index bd646f191ea..718a11e1d75 100644 --- a/dlls/quartz/enumregfilters.c +++ b/dlls/quartz/enumregfilters.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumRegFiltersImpl { const IEnumRegFiltersVtbl * lpVtbl; - ULONG refCount; + LONG refCount; ULONG size; REGFILTER* RegFilters; ULONG uIndex; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 5cd9f0f410b..8fac0fbda6d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -42,7 +42,7 @@ typedef struct AsyncReader const IBaseFilterVtbl * lpVtbl; const IFileSourceFilterVtbl * lpVtblFSF; - ULONG refCount; + LONG refCount; FILTER_INFO filterInfo; FILTER_STATE state; CRITICAL_SECTION csFilter; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index e248fdfd21a..69272749d87 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -46,7 +46,7 @@ typedef struct FilterMapper2Impl { const IFilterMapper2Vtbl *lpVtbl; const IFilterMapperVtbl *lpVtblFilterMapper; - ULONG refCount; + LONG refCount; } FilterMapper2Impl; static const IFilterMapper2Vtbl fm2vtbl; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 0a4018aaafe..e01ccf5de1a 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin); typedef struct IPinImpl { const struct IPinVtbl * lpVtbl; - ULONG refCount; + LONG refCount; LPCRITICAL_SECTION pCritSec; PIN_INFO pinInfo; IPin * pConnectedTo; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index c358356dd5f..5a65e4881a5 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -41,7 +41,7 @@ typedef struct _RpcConnection /* don't know what MS's structure looks like */ typedef struct _RpcBinding { - DWORD refs; + LONG refs; struct _RpcBinding* Next; BOOL server; UUID ObjectUuid; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 5f548f5cb4e..166296ab2bc 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -117,7 +117,7 @@ static RpcPacket* spacket_head; static RpcPacket* spacket_tail; static HANDLE server_sem; -static DWORD worker_count, worker_free, worker_tls; +static LONG worker_count, worker_free, worker_tls; static UUID uuid_nil; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index cde58012bf1..8ef238a0d78 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -42,7 +42,7 @@ typedef struct { /* IUnknown fields */ const IClassFactoryVtbl *lpVtbl; - DWORD ref; + LONG ref; } IClassFactoryImpl; extern IClassFactoryImpl SHDOCVW_ClassFactory; @@ -55,7 +55,7 @@ typedef struct { /* IUnknown fields */ const IOleObjectVtbl *lpVtbl; - DWORD ref; + LONG ref; } IOleObjectImpl; extern IOleObjectImpl SHDOCVW_OleObject; @@ -67,7 +67,7 @@ typedef struct { /* IUnknown fields */ const IWebBrowserVtbl *lpVtbl; - DWORD ref; + LONG ref; } IWebBrowserImpl; extern IWebBrowserImpl SHDOCVW_WebBrowser; @@ -80,7 +80,7 @@ typedef struct { /* IUnknown fields */ const IProvideClassInfoVtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfoImpl; extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; @@ -93,7 +93,7 @@ typedef struct { /* IUnknown fields */ const IProvideClassInfo2Vtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfo2Impl; extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; @@ -106,7 +106,7 @@ typedef struct { /* IUnknown fields */ const IPersistStorageVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStorageImpl; extern IPersistStorageImpl SHDOCVW_PersistStorage; @@ -119,7 +119,7 @@ typedef struct { /* IUnknown fields */ const IPersistStreamInitVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStreamInitImpl; extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; @@ -132,7 +132,7 @@ typedef struct { /* IUnknown fields */ const IQuickActivateVtbl *lpVtbl; - DWORD ref; + LONG ref; } IQuickActivateImpl; extern IQuickActivateImpl SHDOCVW_QuickActivate; @@ -145,7 +145,7 @@ typedef struct { /* IUnknown fields */ const IConnectionPointContainerVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointContainerImpl; extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; @@ -158,7 +158,7 @@ typedef struct { /* IUnknown fields */ const IConnectionPointVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointImpl; /********************************************************************** diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 1b7dd45759f..e486c1046ab 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -152,7 +152,7 @@ HRESULT WINAPI DllCanUnloadNow(void) */ typedef struct _IBindStatusCallbackImpl { const IBindStatusCallbackVtbl *vtbl; - DWORD ref; + LONG ref; HWND hDialog; BOOL *pbCancelled; } IBindStatusCallbackImpl; diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 4ff732b3004..6abe85a9efa 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -53,7 +53,7 @@ static const SHLWAPI_CLIST SHLWAPI_CLIST_items[] = typedef struct { void* lpVtbl; - ULONG ref; + LONG ref; int readcalls; BOOL failreadcall; BOOL failreadsize; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 01d79b06659..b8c3614297e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -59,7 +59,7 @@ static void test_create(void) typedef struct { const IBindStatusCallbackVtbl *lpVtbl; - ULONG ref; + LONG ref; IBinding *pbind; IStream *pstr; } statusclb; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dc6124f91cc..e860831d4d3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -91,9 +91,9 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr static VOID INTERNET_ExecuteWork(void); static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; -static DWORD dwNumThreads; -static DWORD dwNumIdleThreads; -static DWORD dwNumJobs; +static LONG dwNumThreads; +static LONG dwNumIdleThreads; +static LONG dwNumJobs; static HANDLE hEventArray[2]; #define hQuitEvent hEventArray[0] #define hWorkEvent hEventArray[1] diff --git a/dlls/winmm/mciavi/private_mciavi.h b/dlls/winmm/mciavi/private_mciavi.h index 1241c4b0b8d..64f62e2fbcc 100644 --- a/dlls/winmm/mciavi/private_mciavi.h +++ b/dlls/winmm/mciavi/private_mciavi.h @@ -71,7 +71,7 @@ typedef struct { /* data for playing the audio part */ HANDLE hWave; HANDLE hEvent; /* for synchronization */ - DWORD dwEventCount; /* for synchronization */ + LONG dwEventCount; /* for synchronization */ /* data for play back */ HWND hWnd, hWndPaint; DWORD dwCachedFrame; /* buffered frame */ diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c index d6eb2eab253..d9572fb5e08 100644 --- a/dlls/winmm/mciwave/mciwave.c +++ b/dlls/winmm/mciwave/mciwave.c @@ -50,7 +50,7 @@ typedef struct { DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */ DWORD dwPosition; /* position in bytes in chunk */ HANDLE hEvent; /* for synchronization */ - DWORD dwEventCount; /* for synchronization */ + LONG dwEventCount; /* for synchronization */ BOOL bTemporaryFile; /* temporary file (MCI_RECORD) */ MMCKINFO ckMainRIFF; /* main RIFF chunk */ MMCKINFO ckWaveData; /* data chunk */ diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a97e9967feb..5cef18a4df1 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -140,7 +140,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) struct playsound_data { HANDLE hEvent; - DWORD dwEventCount; + LONG dwEventCount; }; static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index f31c476dbcd..5228edc166a 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -3039,7 +3039,7 @@ struct IDsDriverImpl { /* IUnknown fields */ const IDsDriverVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IDsDriverImpl fields */ UINT wDevID; IDsDriverBufferImpl*primary; @@ -3049,7 +3049,7 @@ struct IDsDriverBufferImpl { /* IUnknown fields */ const IDsDriverBufferVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IDsDriverBufferImpl fields */ IDsDriverImpl* drv; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 081584030b7..557486f61ed 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -132,7 +132,7 @@ typedef struct { DWORD dwThreadID; /* 0C */ DWORD fpThread; /* 10 address of thread proc (segptr or lin depending on dwFlags) */ DWORD dwThreadPmt; /* 14 parameter to be passed upon thread creation to fpThread */ - DWORD dwSignalCount; /* 18 counter used for signaling */ + LONG dwSignalCount; /* 18 counter used for signaling */ HANDLE hEvent; /* 1C event */ HANDLE hVxD; /* 20 return from OpenVxDHandle */ DWORD dwStatus; /* 24 0x00, 0x10, 0x20, 0x30 */ diff --git a/dlls/winmm/wineoss/dscapture.c b/dlls/winmm/wineoss/dscapture.c index a8f9305d278..44ec9812712 100644 --- a/dlls/winmm/wineoss/dscapture.c +++ b/dlls/winmm/wineoss/dscapture.c @@ -74,7 +74,7 @@ struct IDsCaptureDriverPropertySetImpl { /* IUnknown fields */ const IDsDriverPropertySetVtbl *lpVtbl; - DWORD ref; + LONG ref; IDsCaptureDriverBufferImpl* capture_buffer; }; @@ -83,7 +83,7 @@ struct IDsCaptureDriverNotifyImpl { /* IUnknown fields */ const IDsDriverNotifyVtbl *lpVtbl; - DWORD ref; + LONG ref; IDsCaptureDriverBufferImpl* capture_buffer; }; @@ -92,7 +92,7 @@ struct IDsCaptureDriverImpl { /* IUnknown fields */ const IDsCaptureDriverVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IDsCaptureDriverImpl fields */ UINT wDevID; @@ -103,7 +103,7 @@ struct IDsCaptureDriverBufferImpl { /* IUnknown fields */ const IDsCaptureDriverBufferVtbl *lpVtbl; - DWORD ref; + LONG ref; /* IDsCaptureDriverBufferImpl fields */ IDsCaptureDriverImpl* drv;