From 19d66cc1f6f72a9fe0a0065119a0fee095be7a1f Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Mon, 7 Jan 2002 21:16:46 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/gdi/gdi.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/shell32/control.c | 4 +++- dlls/user/text.c | 2 +- dlls/winedos/dosaspi.c | 2 +- dlls/winedos/int31.c | 8 ++++---- dlls/winedos/winedos.spec | 2 +- objects/font.c | 6 +++--- objects/gdiobj.c | 10 +++++----- objects/metafile.c | 2 +- windows/cursoricon.c | 1 + 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/gdi/gdi.spec b/dlls/gdi/gdi.spec index 3154b2b6daa..e5373142033 100644 --- a/dlls/gdi/gdi.spec +++ b/dlls/gdi/gdi.spec @@ -188,7 +188,7 @@ rsrc version16.res 185 stub STUFFINREGION # W2.0 (only ?) 186 stub DELETEABOVELINEFONTS # W2.0 (only ?) 188 stub GetTextExtentEx -190 pascal16 SetDCHook(word segptr long) SetDCHook +190 pascal16 SetDCHook(word segptr long) SetDCHook16 191 pascal GetDCHook(word ptr) GetDCHook 192 pascal16 SetHookFlags(word word) SetHookFlags16 193 pascal16 SetBoundsRect(word ptr word) SetBoundsRect16 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c491729ae95..9f49610aaf7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -270,7 +270,7 @@ debug_channels (msvcrt) @ cdecl _getw(ptr) _getw @ stub _getws #(wstr) @ cdecl _global_unwind2(ptr) _global_unwind2 -@ stub _heapadd #() +@ cdecl _heapadd (ptr long) _heapadd @ cdecl _heapchk() _heapchk @ cdecl _heapmin() _heapmin @ cdecl _heapset(long) _heapset diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 69b4bf08adb..20da30d7ab0 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -385,7 +385,9 @@ HRESULT WINAPI RunDLL_CallEntry16(DWORD v, DWORD w, DWORD x, DWORD y, DWORD z) return 0; } -/* +/************************************************************************* + * CallCPLEntry16 [SHELL32.166] + * * called by desk.cpl on "Advanced" with: * hMod("DeskCp16.Dll"), pFunc("CplApplet"), 0, 1, 0xc, 0 * diff --git a/dlls/user/text.c b/dlls/user/text.c index 11cf3cdc7d1..56ebf42b1d1 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -598,7 +598,7 @@ static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, IN /*********************************************************************** - * GrayString16 (USER.185) + * GrayString (USER.185) */ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, LPARAM lParam, INT16 cch, INT16 x, INT16 y, diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c index 7e414669a48..0a11d9ac7d1 100644 --- a/dlls/winedos/dosaspi.c +++ b/dlls/winedos/dosaspi.c @@ -167,7 +167,7 @@ void WINAPI ASPI_DOS_func(CONTEXT86 *context) /********************************************************************** - * DOSVM_ASPIHandler (WINEDOS.@) + * ASPIHandler (WINEDOS.@) * * returns the address of a real mode callback to ASPI_DOS_func() */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 3efc177354e..da677a9118c 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -323,7 +323,7 @@ callrmproc_again: /********************************************************************** - * DOSVM_CallRMInt (WINEDOS.@) + * CallRMInt (WINEDOS.@) */ void WINAPI DOSVM_CallRMInt( CONTEXT86 *context ) { @@ -350,7 +350,7 @@ void WINAPI DOSVM_CallRMInt( CONTEXT86 *context ) /********************************************************************** - * DOSVM_CallRMProc (WINEDOS.@) + * CallRMProc (WINEDOS.@) */ void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret ) { @@ -553,7 +553,7 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) /********************************************************************** - * DOSVM_AllocRMCB (WINEDOS.@) + * AllocRMCB (WINEDOS.@) */ void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context ) { @@ -580,7 +580,7 @@ void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context ) /********************************************************************** - * DOSVM_FreeRMCB (WINEDOS.@) + * FreeRMCB (WINEDOS.@) */ void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context ) { diff --git a/dlls/winedos/winedos.spec b/dlls/winedos/winedos.spec index 7030cbe9713..9f08624d28b 100644 --- a/dlls/winedos/winedos.spec +++ b/dlls/winedos/winedos.spec @@ -12,7 +12,7 @@ debug_channels (aspi console ddraw int int21 int31 module relay) # DPMI functions @ stdcall CallRMInt(ptr) DOSVM_CallRMInt -@ stdcall CallRMProc(ptr ptr long long) DOSVM_CallRMProc +@ stdcall CallRMProc(ptr long) DOSVM_CallRMProc @ stdcall AllocRMCB(ptr) DOSVM_AllocRMCB @ stdcall FreeRMCB(ptr) DOSVM_FreeRMCB diff --git a/objects/font.c b/objects/font.c index 33120b6883e..ddb0bca8fc2 100644 --- a/objects/font.c +++ b/objects/font.c @@ -678,7 +678,7 @@ static INT FONT_EnumInstance( LPENUMLOGFONTEXW plf, LPNEWTEXTMETRICEXW ptm, } /*********************************************************************** - * EnumFontFamiliesEx16 (GDI.613) + * EnumFontFamiliesEx (GDI.613) */ INT16 WINAPI EnumFontFamiliesEx16( HDC16 hDC, LPLOGFONT16 plf, FONTENUMPROCEX16 efproc, LPARAM lParam, @@ -773,7 +773,7 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, } /*********************************************************************** - * EnumFontFamilies16 (GDI.330) + * EnumFontFamilies (GDI.330) */ INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, FONTENUMPROC16 efproc, LPARAM lpData ) @@ -818,7 +818,7 @@ INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily, } /*********************************************************************** - * EnumFonts16 (GDI.70) + * EnumFonts (GDI.70) */ INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc, LPARAM lpData ) diff --git a/objects/gdiobj.c b/objects/gdiobj.c index 3cdbd33602f..2e35a64a317 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -854,7 +854,7 @@ BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) /*********************************************************************** - * EnumObjects16 (GDI.71) + * EnumObjects (GDI.71) */ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 nObjType, GOBJENUMPROC16 lpEnumFunc, LPARAM lParam ) @@ -1125,13 +1125,13 @@ WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID, } /*********************************************************************** - * GdiInit2 (GDI.405) + * GdiInit2 (GDI.403) * * See "Undocumented Windows" */ HANDLE16 WINAPI GdiInit216( - HANDLE16 h1, /* GDI object */ - HANDLE16 h2 /* global data */ + HANDLE16 h1, /* [in] GDI object */ + HANDLE16 h2 /* [in] global data */ ) { FIXME("(%04x, %04x), stub.\n", h1, h2); @@ -1143,7 +1143,7 @@ HANDLE16 WINAPI GdiInit216( /*********************************************************************** * FinalGdiInit (GDI.405) */ -void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* fill pattern of desktop */ ) +void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* [in] fill pattern of desktop */ ) { } diff --git a/objects/metafile.c b/objects/metafile.c index ffa003f1aa9..dfa5e300c15 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -576,7 +576,7 @@ BOOL WINAPI PlayMetaFile( /****************************************************************** - * EnumMetaFile16 (GDI.175) + * EnumMetaFile (GDI.175) * */ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc, HMETAFILE16 hmf, diff --git a/windows/cursoricon.c b/windows/cursoricon.c index 812f4288649..a0737b0f73a 100644 --- a/windows/cursoricon.c +++ b/windows/cursoricon.c @@ -1286,6 +1286,7 @@ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor ) /********************************************************************** * DestroyIcon32 (USER.610) + * DestroyIcon32 (USER32.@) * * This routine is actually exported from Win95 USER under the name * DestroyIcon32 ... The behaviour implemented here should mimic