From 69f2ea69f5140c3bba654cf2e4928f346a6ac7c3 Mon Sep 17 00:00:00 2001 From: Juergen Schmied Date: Sat, 26 Dec 1998 19:44:13 +0000 Subject: [PATCH] Fixed tons of incomplete prototypes, assignment's of pointer with different signedness, superflous ',' and ';' in structures, wrong return-types, lose of digits and some small glitches. --- include/d3d.h | 2 +- include/mmsystem.h | 22 ++++----- include/oleauto.h | 4 +- include/storage.h | 104 +++++++++++++++++++++---------------------- include/winversion.h | 4 +- ole/compobj.c | 4 +- ole/ole2.c | 6 +-- ole/ole2nls.c | 6 +-- ole/storage.c | 42 ++++++++--------- ole/typelib.c | 8 ++-- 10 files changed, 101 insertions(+), 101 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 59f43be7ea4..3cc18579cf0 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -309,7 +309,7 @@ typedef enum { D3DLIGHT_SPOT = 2, D3DLIGHT_DIRECTIONAL = 3, D3DLIGHT_PARALLELPOINT = 4, - D3DLIGHT_FORCE_DWORD = 0x7fffffff, /* force 32-bit size enum */ + D3DLIGHT_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ } D3DLIGHTTYPE; typedef struct _D3DCOLORVALUE { diff --git a/include/mmsystem.h b/include/mmsystem.h index 79acb8e2f91..7db3ccb3005 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -350,8 +350,8 @@ typedef struct { /* extra information (after cbSize) */ } WAVEFORMATEX,*LPWAVEFORMATEX; -UINT16 WINAPI waveOutGetNumDevs16(); -UINT32 WINAPI waveOutGetNumDevs32(); +UINT16 WINAPI waveOutGetNumDevs16(void); +UINT32 WINAPI waveOutGetNumDevs32(void); #define waveOutGetNumDevs WINELIB_NAME(waveOutGetNumDevs) UINT16 WINAPI waveOutGetDevCaps16(UINT16,LPWAVEOUTCAPS16,UINT16); UINT32 WINAPI waveOutGetDevCaps32A(UINT32,LPWAVEOUTCAPS32A,UINT32); @@ -416,8 +416,8 @@ DWORD WINAPI waveOutMessage16(HWAVEOUT16,UINT16,DWORD,DWORD); DWORD WINAPI waveOutMessage32(HWAVEOUT32,UINT32,DWORD,DWORD); #define waveOutMessage WINELIB_NAME(waveOutMessage) -UINT16 WINAPI waveInGetNumDevs16(); -UINT32 WINAPI waveInGetNumDevs32(); +UINT16 WINAPI waveInGetNumDevs16(void); +UINT32 WINAPI waveInGetNumDevs32(void); #define waveInGetNumDevs WINELIB_NAME(waveInGetNumDevs) UINT16 WINAPI waveInGetDevCaps16(UINT16,LPWAVEINCAPS16,UINT16); UINT32 WINAPI waveInGetDevCaps32A(UINT32,LPWAVEINCAPS32A,UINT32); @@ -648,8 +648,8 @@ typedef struct { #define MEVT_TEMPO 0x01 #define MEVT_VERSION 0x84 -UINT16 WINAPI midiOutGetNumDevs16(); -UINT32 WINAPI midiOutGetNumDevs32(); +UINT16 WINAPI midiOutGetNumDevs16(void); +UINT32 WINAPI midiOutGetNumDevs32(void); #define midiOutGetNumDevs WINELIB_NAME(midiOutGetNumDevs) UINT16 WINAPI midiOutGetDevCaps16(UINT16,LPMIDIOUTCAPS16,UINT16); UINT32 WINAPI midiOutGetDevCaps32A(UINT32,LPMIDIOUTCAPS32A,UINT32); @@ -807,8 +807,8 @@ typedef struct { #define AUXCAPS_VOLUME 0x0001 /* supports volume control */ #define AUXCAPS_LRVOLUME 0x0002 /* separate left-right volume control */ -UINT16 WINAPI auxGetNumDevs16(); -UINT32 WINAPI auxGetNumDevs32(); +UINT16 WINAPI auxGetNumDevs16(void); +UINT32 WINAPI auxGetNumDevs32(void); #define auxGetNumDevs WINELIB_NAME(auxGetNumDevs) UINT16 WINAPI auxGetDevCaps16 (UINT16,LPAUXCAPS16,UINT16); UINT32 WINAPI auxGetDevCaps32A(UINT32,LPAUXCAPS32A,UINT32); @@ -856,7 +856,7 @@ DECL_WINELIB_TYPE(LPTIMECAPS) MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16,UINT16); MMRESULT32 WINAPI timeGetSystemTime32(LPMMTIME32,UINT32); #define timeGetSystemTime WINELIB_NAME(timeGetSystemTime) -DWORD WINAPI timeGetTime(); /* same for win32/win16 */ +DWORD WINAPI timeGetTime(void); /* same for win32/win16 */ MMRESULT16 WINAPI timeSetEvent16(UINT16,UINT16,LPTIMECALLBACK16,DWORD,UINT16); MMRESULT32 WINAPI timeSetEvent32(UINT32,UINT32,LPTIMECALLBACK32,DWORD,UINT32); #define timeSetEvent WINELIB_NAME(timeSetEvent) @@ -1497,8 +1497,8 @@ typedef struct { #define MIXER_SETCONTROLDETAILSF_CUSTOM 0x00000001L #define MIXER_SETCONTROLDETAILSF_QUERYMASK 0x0000000FL -UINT16 WINAPI mixerGetNumDevs16(); -UINT32 WINAPI mixerGetNumDevs32(); +UINT16 WINAPI mixerGetNumDevs16(void); +UINT32 WINAPI mixerGetNumDevs32(void); #define mixerGetNumDevs WINELIB_NAME(mixerGetNumDevs) UINT16 WINAPI mixerOpen16(LPHMIXER16,UINT16,DWORD,DWORD,DWORD); UINT32 WINAPI mixerOpen32(LPHMIXER32,UINT32,DWORD,DWORD,DWORD); diff --git a/include/oleauto.h b/include/oleauto.h index ed52dfef594..1271b2057ae 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -36,8 +36,8 @@ typedef ITypeLib * LPTYPELIB; */ typedef short VARIANT_BOOL; -#define VARIANT_TRUE 0xFFFF -#define VARIANT_FALSE 0x0000 +#define VARIANT_TRUE ((VARIANT_BOOL)0xFFFF) +#define VARIANT_FALSE ((VARIANT_BOOL)0x0000) typedef LONG SCODE; diff --git a/include/storage.h b/include/storage.h index c8f3cb535ce..1edb4e86469 100644 --- a/include/storage.h +++ b/include/storage.h @@ -84,21 +84,21 @@ typedef struct { */ #define ICOM_INTERFACE IStorage16 ICOM_BEGIN(IStorage16,IUnknown) - ICOM_METHOD5(HRESULT,CreateStream, LPCOLESTR16,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream16**,ppstm); - ICOM_METHOD5(HRESULT,OpenStream, LPCOLESTR16,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream16**,ppstm); - ICOM_METHOD5(HRESULT,CreateStorage, LPCOLESTR16,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage16**,ppstg); - ICOM_METHOD6(HRESULT,OpenStorage, LPCOLESTR16,pwcsName, IStorage16*,pstgPriority, DWORD,grfMode, SNB16,snb16Exclude, DWORD,reserved, IStorage16**,ppstg); - ICOM_METHOD4(HRESULT,CopyTo, DWORD,ciidExclude, const IID*,rgiidExclude, SNB16,snb16Exclude, IStorage16*,pstgDest); - ICOM_METHOD4(HRESULT,MoveElementTo, LPCOLESTR16,pwcsName, IStorage16*,pstgDest, LPCOLESTR16,pwcsNewName, DWORD,grfFlags); - ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags); - ICOM_METHOD (HRESULT,Revert); - ICOM_METHOD4(HRESULT,EnumElements, DWORD,reserved1, void*,reserved2, DWORD,reserved3, IEnumSTATSTG**,ppenum); - ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR16,pwcsName); - ICOM_METHOD2(HRESULT,RenameElement, LPCOLESTR16,pwcsOldName, LPCOLESTR16,pwcsNewName); - ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR16,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime); - ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid); - ICOM_METHOD2(HRESULT,SetStateBits, DWORD,grfStateBits, DWORD,grfMask); - ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag); + ICOM_METHOD5(HRESULT,CreateStream, LPCOLESTR16,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream16**,ppstm) + ICOM_METHOD5(HRESULT,OpenStream, LPCOLESTR16,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream16**,ppstm) + ICOM_METHOD5(HRESULT,CreateStorage, LPCOLESTR16,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage16**,ppstg) + ICOM_METHOD6(HRESULT,OpenStorage, LPCOLESTR16,pwcsName, IStorage16*,pstgPriority, DWORD,grfMode, SNB16,snb16Exclude, DWORD,reserved, IStorage16**,ppstg) + ICOM_METHOD4(HRESULT,CopyTo, DWORD,ciidExclude, const IID*,rgiidExclude, SNB16,snb16Exclude, IStorage16*,pstgDest) + ICOM_METHOD4(HRESULT,MoveElementTo, LPCOLESTR16,pwcsName, IStorage16*,pstgDest, LPCOLESTR16,pwcsNewName, DWORD,grfFlags) + ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags) + ICOM_METHOD (HRESULT,Revert) + ICOM_METHOD4(HRESULT,EnumElements, DWORD,reserved1, void*,reserved2, DWORD,reserved3, IEnumSTATSTG**,ppenum) + ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR16,pwcsName) + ICOM_METHOD2(HRESULT,RenameElement, LPCOLESTR16,pwcsOldName, LPCOLESTR16,pwcsNewName) + ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR16,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime) + ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid) + ICOM_METHOD2(HRESULT,SetStateBits, DWORD,grfStateBits, DWORD,grfMask) + ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag) ICOM_END(IStorage16) #undef ICOM_INTERFACE @@ -131,21 +131,21 @@ ICOM_END(IStorage16) */ #define ICOM_INTERFACE IStorage32 ICOM_BEGIN(IStorage32,IUnknown) - ICOM_METHOD5(HRESULT,CreateStream, LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream32**,ppstm); - ICOM_METHOD5(HRESULT,OpenStream, LPCOLESTR32,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream32**,ppstm); - ICOM_METHOD5(HRESULT,CreateStorage, LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage32**,ppstg); - ICOM_METHOD6(HRESULT,OpenStorage, LPCOLESTR32,pwcsName, IStorage32*,pstgPriority, DWORD,grfMode, SNB32,snb16Exclude, DWORD,reserved, IStorage32**,ppstg); - ICOM_METHOD4(HRESULT,CopyTo, DWORD,ciidExclude, const IID*,rgiidExclude, SNB32,snb16Exclude, IStorage32*,pstgDest); - ICOM_METHOD4(HRESULT,MoveElementTo, LPCOLESTR32,pwcsName, IStorage32*,pstgDest, LPCOLESTR32,pwcsNewName, DWORD,grfFlags); - ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags); - ICOM_METHOD (HRESULT,Revert); - ICOM_METHOD4(HRESULT,EnumElements, DWORD,reserved1, void*,reserved2, DWORD,reserved3, IEnumSTATSTG**,ppenum); - ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR32,pwcsName); - ICOM_METHOD2(HRESULT,RenameElement, LPCOLESTR32,pwcsOldName, LPCOLESTR32,pwcsNewName); - ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR32,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime); - ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid); - ICOM_METHOD2(HRESULT,SetStateBits, DWORD,grfStateBits, DWORD,grfMask); - ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag); + ICOM_METHOD5(HRESULT,CreateStream, LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,reserved1, DWORD,reserved2, IStream32**,ppstm) + ICOM_METHOD5(HRESULT,OpenStream, LPCOLESTR32,pwcsName, void*,reserved1, DWORD,grfMode, DWORD,reserved2, IStream32**,ppstm) + ICOM_METHOD5(HRESULT,CreateStorage, LPCOLESTR32,pwcsName, DWORD,grfMode, DWORD,dwStgFmt, DWORD,reserved2, IStorage32**,ppstg) + ICOM_METHOD6(HRESULT,OpenStorage, LPCOLESTR32,pwcsName, IStorage32*,pstgPriority, DWORD,grfMode, SNB32,snb16Exclude, DWORD,reserved, IStorage32**,ppstg) + ICOM_METHOD4(HRESULT,CopyTo, DWORD,ciidExclude, const IID*,rgiidExclude, SNB32,snb16Exclude, IStorage32*,pstgDest) + ICOM_METHOD4(HRESULT,MoveElementTo, LPCOLESTR32,pwcsName, IStorage32*,pstgDest, LPCOLESTR32,pwcsNewName, DWORD,grfFlags) + ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags) + ICOM_METHOD (HRESULT,Revert) + ICOM_METHOD4(HRESULT,EnumElements, DWORD,reserved1, void*,reserved2, DWORD,reserved3, IEnumSTATSTG**,ppenum) + ICOM_METHOD1(HRESULT,DestroyElement, LPCOLESTR32,pwcsName) + ICOM_METHOD2(HRESULT,RenameElement, LPCOLESTR32,pwcsOldName, LPCOLESTR32,pwcsNewName) + ICOM_METHOD4(HRESULT,SetElementTimes,LPCOLESTR32,pwcsName, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime) + ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid) + ICOM_METHOD2(HRESULT,SetStateBits, DWORD,grfStateBits, DWORD,grfMask) + ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag) ICOM_END(IStorage32) #undef ICOM_INTERFACE @@ -178,17 +178,17 @@ ICOM_END(IStorage32) */ #define ICOM_INTERFACE IStream16 ICOM_BEGIN(IStream16,IUnknown) - ICOM_METHOD3(HRESULT,Read, void*,pv, ULONG,cb, ULONG*,pcbRead); - ICOM_METHOD3(HRESULT,Write, const void*,pv, ULONG,cb, ULONG*,pcbWritten); - ICOM_METHOD3(HRESULT,Seek, LARGE_INTEGER,dlibMove, DWORD,dwOrigin, ULARGE_INTEGER*,plibNewPosition); - ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,libNewSize); - ICOM_METHOD4(HRESULT,CopyTo, IStream16*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten); - ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags); - ICOM_METHOD (HRESULT,Revert); - ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType); - ICOM_METHOD3(HRESULT,UnlockRegion,ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType); - ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag); - ICOM_METHOD1(HRESULT,Clone, IStream16**,ppstm); + ICOM_METHOD3(HRESULT,Read, void*,pv, ULONG,cb, ULONG*,pcbRead) + ICOM_METHOD3(HRESULT,Write, const void*,pv, ULONG,cb, ULONG*,pcbWritten) + ICOM_METHOD3(HRESULT,Seek, LARGE_INTEGER,dlibMove, DWORD,dwOrigin, ULARGE_INTEGER*,plibNewPosition) + ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,libNewSize) + ICOM_METHOD4(HRESULT,CopyTo, IStream16*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten) + ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags) + ICOM_METHOD (HRESULT,Revert) + ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) + ICOM_METHOD3(HRESULT,UnlockRegion,ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) + ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag) + ICOM_METHOD1(HRESULT,Clone, IStream16**,ppstm) ICOM_END(IStream16) #undef ICOM_INTERFACE @@ -217,17 +217,17 @@ ICOM_END(IStream16) */ #define ICOM_INTERFACE IStream32 ICOM_BEGIN(IStream32,IUnknown) - ICOM_METHOD3(HRESULT,Read, void*,pv, ULONG,cb, ULONG*,pcbRead); - ICOM_METHOD3(HRESULT,Write, const void*,pv, ULONG,cb, ULONG*,pcbWritten); - ICOM_METHOD3(HRESULT,Seek, LARGE_INTEGER,dlibMove, DWORD,dwOrigin, ULARGE_INTEGER*,plibNewPosition); - ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,libNewSize); - ICOM_METHOD4(HRESULT,CopyTo, IStream32*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten); - ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags); - ICOM_METHOD (HRESULT,Revert); - ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType); - ICOM_METHOD3(HRESULT,UnlockRegion,ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType); - ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag); - ICOM_METHOD1(HRESULT,Clone, IStream32**,ppstm); + ICOM_METHOD3(HRESULT,Read, void*,pv, ULONG,cb, ULONG*,pcbRead) + ICOM_METHOD3(HRESULT,Write, const void*,pv, ULONG,cb, ULONG*,pcbWritten) + ICOM_METHOD3(HRESULT,Seek, LARGE_INTEGER,dlibMove, DWORD,dwOrigin, ULARGE_INTEGER*,plibNewPosition) + ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,libNewSize) + ICOM_METHOD4(HRESULT,CopyTo, IStream32*,pstm, ULARGE_INTEGER,cb, ULARGE_INTEGER*,pcbRead, ULARGE_INTEGER*,pcbWritten) + ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags) + ICOM_METHOD (HRESULT,Revert) + ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) + ICOM_METHOD3(HRESULT,UnlockRegion,ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) + ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag) + ICOM_METHOD1(HRESULT,Clone, IStream32**,ppstm) ICOM_END(IStream32) #undef ICOM_INTERFACE diff --git a/include/winversion.h b/include/winversion.h index 9b2c6e83b80..a9f798e5e44 100644 --- a/include/winversion.h +++ b/include/winversion.h @@ -10,8 +10,8 @@ typedef enum NB_WINDOWS_VERSIONS } WINDOWS_VERSION; -extern WINDOWS_VERSION VERSION_GetVersion(); -extern char *VERSION_GetVersionName(); +extern WINDOWS_VERSION VERSION_GetVersion(void); +extern char *VERSION_GetVersionName(void); extern BOOL32 VERSION_OsIsUnicode(void); #endif /* __WINE_WINVERSION_H */ diff --git a/ole/compobj.c b/ole/compobj.c index 97e5331b48c..d1264e714d8 100644 --- a/ole/compobj.c +++ b/ole/compobj.c @@ -739,7 +739,7 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, HRESULT hres = E_UNEXPECTED; char dllName[MAX_PATH+1]; - LONG dllNameLen = sizeof(dllName); + DWORD dllNameLen = sizeof(dllName); HINSTANCE32 hLibrary; typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); @@ -962,7 +962,7 @@ VOID WINAPI CoTaskMemFree( HRESULT ret = CoGetMalloc32(0,&lpmalloc); if (ret) return; - return lpmalloc->lpvtbl->fnFree(lpmalloc,ptr); + lpmalloc->lpvtbl->fnFree(lpmalloc,ptr); } /*********************************************************************** diff --git a/ole/ole2.c b/ole/ole2.c index fe2a9161487..d0a4706338d 100644 --- a/ole/ole2.c +++ b/ole/ole2.c @@ -14,7 +14,7 @@ /****************************************************************************** * OleBuildVersion [OLE2.1] */ -DWORD WINAPI OleBuildVersion() +DWORD WINAPI OleBuildVersion(void) { TRACE(ole,"(void)\n"); return (rmm<<16)+rup; @@ -35,7 +35,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved) * NOTES * Is DWORD really the correct return type for this function? */ -DWORD WINAPI CoGetCurrentProcess() { +DWORD WINAPI CoGetCurrentProcess(void) { return (DWORD)PROCESS_Current(); } @@ -50,7 +50,7 @@ void WINAPI OleUninitialize(void) /*********************************************************************** * OleFlushClipboard [OLE2.76] */ -HRESULT WINAPI OleFlushClipboard() +HRESULT WINAPI OleFlushClipboard(void) { return S_OK; } diff --git a/ole/ole2nls.c b/ole/ole2nls.c index 73336d858fb..82059ed49d1 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -788,7 +788,7 @@ BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum, } i=0; - while (languages[i].langid!=NULL) + while (languages[i].langid!=0) { LPWSTR cp; char xbuffer[10]; @@ -830,7 +830,7 @@ BOOL32 WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A lpfnLocaleEnum, return TRUE; } i=0; - while (languages[i].langid!=NULL) { + while (languages[i].langid!=0) { sprintf(buffer,"%08lx",(DWORD)languages[i].langid); if (!lpfnLocaleEnum(buffer)) break; @@ -2897,7 +2897,7 @@ INT32 WINAPI GetDateFormat32W(LCID locale,DWORD flags, LPCWSTR format, LPWSTR date, INT32 datelen) { - short datearr[] = {'1','9','9','4','-','1','-','1',0}; + unsigned short datearr[] = {'1','9','9','4','-','1','-','1',0}; FIXME(ole, "STUB (should call OLE_GetFormatW)\n"); lstrcpyn32W(date, datearr, datelen); diff --git a/ole/storage.c b/ole/storage.c index 6627383b35b..83ce52ece49 100644 --- a/ole/storage.c +++ b/ole/storage.c @@ -1182,14 +1182,14 @@ static ICOM_VTABLE(IStream32) strvt32 = { IStream32_fnAddRef, IStream32_fnRelease }, - (void*)4, - (void*)5, - (void*)6, - (void*)7, - (void*)8, - (void*)9, - (void*)10, - (void*)11, + (void*)0xdead0004, + (void*)0xdead0005, + (void*)0xdead0006, + (void*)0xdead0007, + (void*)0xdead0008, + (void*)0xdead0009, + (void*)0xdead0010, + (void*)0xdead0011 }; @@ -1644,19 +1644,19 @@ static ICOM_VTABLE(IStorage32) stvt32 = { }, IStorage32_fnCreateStream, IStorage32_fnOpenStream, - (void*)6, - (void*)7, - (void*)8, - (void*)9, - (void*)10, - (void*)11, - (void*)12, - (void*)13, - (void*)14, - (void*)15, - (void*)16, - (void*)17, - (void*)18, + (void*)0xdead0006, + (void*)0xdead0007, + (void*)0xdead0008, + (void*)0xdead0009, + (void*)0xdead0010, + (void*)0xdead0011, + (void*)0xdead0012, + (void*)0xdead0013, + (void*)0xdead0014, + (void*)0xdead0015, + (void*)0xdead0016, + (void*)0xdead0017, + (void*)0xdead0018, }; /****************************************************************************** diff --git a/ole/typelib.c b/ole/typelib.c index 0f5537809ae..913a83965ae 100644 --- a/ole/typelib.c +++ b/ole/typelib.c @@ -108,7 +108,7 @@ HRESULT WINAPI LoadTypeLib16( OLECHAR32 *szFile, /* [in] Name of file to load from */ void * *pptLib) /* [out] Pointer to pointer to loaded type library */ { - FIXME(ole, "('%s',%p): stub\n",debugstr_a(szFile),pptLib); + FIXME(ole, "('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib); return E_FAIL; } @@ -127,7 +127,7 @@ HRESULT WINAPI LoadTypeLib32( OLECHAR32 *szFile, /* [in] Name of file to load from */ void * *pptLib) /* [out] Pointer to pointer to loaded type library */ { - FIXME(ole, "('%s',%p): stub\n",debugstr_a(szFile),pptLib); + FIXME(ole, "('%s',%p): stub\n",debugstr_w(szFile),pptLib); (long *)pptLib=0x123; return S_OK; /* fixme: pretend everything is OK*/ } @@ -148,7 +148,7 @@ HRESULT WINAPI RegisterTypeLib32( ITypeLib * ptlib, /*[in] Pointer to the library*/ OLECHAR32 * szFullPath, /*[in] full Path of the library*/ OLECHAR32 * szHelpDir) /*[in] dir to the helpfile for the library, may be NULL*/ -{ FIXME(ole, "(%p,%s,%s): stub\n",ptlib, szFullPath,szHelpDir); +{ FIXME(ole, "(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir)); return S_OK; /* FIXME: pretend everything is OK */ } @@ -157,7 +157,7 @@ HRESULT WINAPI RegisterTypeLib32( * RETURNS * path of typelib */ -DWORD WINAPI OABuildVersion() +DWORD WINAPI OABuildVersion(void) { WINDOWS_VERSION ver = VERSION_GetVersion();