From b3086a759369a8c1cb143ce1c7c49091856dba26 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Wed, 25 Apr 2001 19:54:21 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/ole32/storage32.c | 3 +++ dlls/setupapi/virtcopy.c | 33 +++++++++++++++++++++++++++------ dlls/wintrust/wintrust_main.c | 6 ++++-- dlls/x11drv/x11ddraw.c | 3 +++ dlls/x11drv/x11drv.spec | 2 +- windows/cursoricon.c | 15 +++++++-------- windows/syscolor.c | 2 +- 8 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c0cb6f27ab0..68411645402 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -400,7 +400,7 @@ debug_channels (msvcrt) @ cdecl _msize(ptr) _msize @ cdecl _nextafter(double double) _nextafter @ cdecl _onexit(ptr) _onexit -@ cdecl _open(str long) _open +@ varargs _open(str long) _open @ cdecl _open_osfhandle(long long) _open_osfhandle @ stub _osver @ stub _outp #(long long) @@ -537,7 +537,7 @@ debug_channels (msvcrt) @ stub _wmakepath #(wstr wstr wstr wstr wstr) @ cdecl _wmkdir(wstr) _wmkdir @ cdecl _wmktemp(wstr) _wmktemp -@ cdecl _wopen(wstr long) _wopen +@ varargs _wopen(wstr long) _wopen @ stub _wperror #(wstr) @ stub _wpgmptr @ stub _wpopen #(wstr wstr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3472e6f9227..a25f6f27d6f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6975,6 +6975,9 @@ HRESULT WINAPI OleConvertIStorageToOLESTREAM ( return hRes; } +/*********************************************************************** + * GetConvertStg (OLE32.68) + */ HRESULT WINAPI GetConvertStg(LPGUID guid) { FIXME("(%s), unimplemented stub!\n",debugstr_guid(guid)); return E_FAIL; diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index 3cd7459c687..632b4c4bdf3 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -52,6 +52,9 @@ static VHSTR vhstr_alloc = 0; #define VALID_VHSTR(x) ((x < vhstr_alloc) && (vhstrlist[x]) && (vhstrlist[x]->refcount)) +/*********************************************************************** + * vsmStringAdd (SETUPX.207) + */ VHSTR WINAPI vsmStringAdd16(LPCSTR lpszName) { VHSTR n; @@ -100,6 +103,9 @@ VHSTR WINAPI vsmStringAdd16(LPCSTR lpszName) return index; } +/*********************************************************************** + * vsmStringDelete (SETUPX.206) + */ INT16 WINAPI vsmStringDelete16(VHSTR vhstr) { if (VALID_VHSTR(vhstr)) @@ -129,8 +135,8 @@ VHSTR WINAPI vsmStringFind16(LPCSTR lpszName) return 0xffff; } -/* - * vsmGetStringName() +/*********************************************************************** + * vsmGetStringName (SETUPX.205) * * Pretty correct, I guess */ @@ -149,8 +155,8 @@ INT16 WINAPI vsmGetStringName16(VHSTR vhstr, LPSTR lpszBuffer, int cbBuffer) return VCPN_FAIL; } -/* - * vsmStringCompare() - not exported from a standard SETUPX.DLL, it seems +/*********************************************************************** + * vsmStringCompare (not exported from a standard SETUPX.DLL, it seems) */ INT16 WINAPI vsmStringCompare16(VHSTR vhstrA, VHSTR vhstrB) { @@ -159,6 +165,9 @@ INT16 WINAPI vsmStringCompare16(VHSTR vhstrA, VHSTR vhstrB) return strcmp(vhstrlist[vhstrA]->pStr, vhstrlist[vhstrB]->pStr); } +/*********************************************************************** + * vsmGetStringRawName (SETUPX.208) + */ LPCSTR WINAPI vsmGetStringRawName16(VHSTR vhstr) { return (VALID_VHSTR(vhstr)) ? vhstrlist[vhstr]->pStr : NULL; @@ -233,7 +242,7 @@ BOOL VCP_VirtnodeDelete(LPVIRTNODE lpvnDel) } /*********************************************************************** - * VcpOpen + * VcpOpen (SETUPX.200) * * Sets up a virtual copy operation. * This means that functions such as GenInstall() @@ -350,6 +359,9 @@ RETERR16 WINAPI VcpQueueRename16( 0); } +/*********************************************************************** + * VcpEnumFiles (SETUPX.@) + */ INT16 WINAPI VcpEnumFiles(VCPENUMPROC vep, LPARAM lParamRef) { WORD n; @@ -360,6 +372,9 @@ INT16 WINAPI VcpEnumFiles(VCPENUMPROC vep, LPARAM lParamRef) return 0; /* FIXME: return value ? */ } +/*********************************************************************** + * VcpExplain (SETUPX.?) + */ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat) { static char buffer[MAX_PATH]; /* FIXME: is this how it's done ? */ @@ -450,7 +465,7 @@ RETERR16 VcpFlush16(WORD fl, LPCSTR lpszBackupDest) } /*********************************************************************** - * VcpClose + * VcpClose (SETUPX.201) * * Does callbacks (-> vifproc) with VCPM_VSTATCLOSESTART, * VCPM_VSTATCLOSEEND. @@ -514,6 +529,9 @@ RETERR16 VCP_RenameFiles(void) return res; } +/*********************************************************************** + * vcpDefCallbackProc (SETUPX.202) + */ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lParamRef) { @@ -655,6 +673,9 @@ RETERR16 VCP_UI_CopyStart(void) return VCPN_OK; } +/*********************************************************************** + * vcpUICallbackProc (SETUPX.213) + */ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lParamRef) { diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index d602311b39c..0c01594f78e 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -8,8 +8,10 @@ DEFAULT_DEBUG_CHANNEL(win32); - -LONG WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) +/*********************************************************************** + * WinVerifyTrust (WINTRUST.@) + */ +LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) { FIXME("(hwnd 0x%04x ActionId %p ActionData %p): stub (nothing will be verified)\n", hwnd, ActionID, ActionData); diff --git a/dlls/x11drv/x11ddraw.c b/dlls/x11drv/x11ddraw.c index 635a3b9b373..47f2ce98ba3 100644 --- a/dlls/x11drv/x11ddraw.c +++ b/dlls/x11drv/x11ddraw.c @@ -4,7 +4,10 @@ * Copyright 2001 TransGaming Technologies, Inc. */ +#include "config.h" + #include + #include "ts_xlib.h" #include "x11drv.h" #include "x11ddraw.h" diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index 914d5aad446..f8bad5e20d4 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec @@ -37,7 +37,7 @@ debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics @ cdecl SetFocus(long) X11DRV_SetFocus @ cdecl SetParent(long long) X11DRV_SetParent @ cdecl SetWindowPos(ptr) X11DRV_SetWindowPos -@ cdecl SetWindowRgn(long long) X11DRV_SetWindowRgn +@ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl IsSingleWindow() X11DRV_IsSingleWindow diff --git a/windows/cursoricon.c b/windows/cursoricon.c index 0ba9df4ee58..52b1b99f3eb 100644 --- a/windows/cursoricon.c +++ b/windows/cursoricon.c @@ -1161,14 +1161,13 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth, * also be done in CreateIconIndirect... */ HICON WINAPI CreateIcon( - HINSTANCE hInstance, /* the application's hInstance, currently unused */ - INT nWidth, /* the width of the provided bitmaps */ - INT nHeight, /* the height of the provided bitmaps */ - BYTE bPlanes, /* the number of planes in the provided bitmaps */ - BYTE bBitsPixel, /* the number of bits per pixel of the lpXORbits bitmap */ - LPCVOID lpANDbits, /* a monochrome bitmap representing the icon's mask */ - LPCVOID lpXORbits /* the icon's 'color' bitmap */ - ) + HINSTANCE hInstance, /* [in] the application's hInstance, currently unused */ + INT nWidth, /* [in] the width of the provided bitmaps */ + INT nHeight, /* [in] the height of the provided bitmaps */ + BYTE bPlanes, /* [in] the number of planes in the provided bitmaps */ + BYTE bBitsPixel, /* [in] the number of bits per pixel of the lpXORbits bitmap */ + LPCVOID lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ + LPCVOID lpXORbits) /* [in] the icon's 'color' bitmap */ { HICON hIcon; HDC hdc; diff --git a/windows/syscolor.c b/windows/syscolor.c index 9c16466a72b..c43a9ce80a6 100644 --- a/windows/syscolor.c +++ b/windows/syscolor.c @@ -277,7 +277,7 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, } /************************************************************************* - * SetSysColors (USER32.@) + * SetSysColorsTemp (USER32.@) */ BOOL WINAPI SetSysColorsTemp( int n, const int* p, const COLORREF* ptr) { -- 2.11.4.GIT