Skip to content

W
wine-winehq
Commit 69f2ea69 authored by Juergen Schmied's avatar Juergen Schmied Committed by Alexandre Julliard
Browse files
Options

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.
parent 01d1a6a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 101 deletions
include/d3d.h
View file @ 69f2ea69
......@@ -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 {
......
include/mmsystem.h
View file @ 69f2ea69
......@@ -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);
......
include/oleauto.h
View file @ 69f2ea69
......@@ -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;
......
include/winversion.h
View file @ 69f2ea69
......@@ -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 */
ole/compobj.c
View file @ 69f2ea69
......@@ -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);
}
/***********************************************************************
......
ole/ole2.c
View file @ 69f2ea69
......@@ -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;
}
......
ole/ole2nls.c
View file @ 69f2ea69
......@@ -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);
......
ole/storage.c
View file @ 69f2ea69
......@@ -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,
};
/******************************************************************************
......
ole/typelib.c
View file @ 69f2ea69
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment