From a62a26ced0150c687a597cada6900d2d4c5e9b70 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Mon, 9 Sep 2002 19:26:55 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/gdi/gdi16.c | 6 ++++-- dlls/ntdll/signal_i386.c | 5 ++++- dlls/shlwapi/reg.c | 4 ++-- dlls/shlwapi/shlwapi.spec | 2 +- objects/clipping.c | 15 ++++++++++----- objects/dc.c | 12 ++++++++---- objects/dcvalues.c | 3 ++- objects/metafile.c | 1 + objects/palette.c | 1 + windows/queue.c | 3 ++- 10 files changed, 35 insertions(+), 17 deletions(-) diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c index 3ba6d17c853..dfa980b8dbf 100644 --- a/dlls/gdi/gdi16.c +++ b/dlls/gdi/gdi16.c @@ -1595,7 +1595,8 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette ) /*********************************************************************** - * GDISelectPalette (GDI.361) + * GDISelectPalette (GDI.361) + * GDISelectPalette16 (GDI32.@) */ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg ) { @@ -1604,7 +1605,8 @@ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg /*********************************************************************** - * GDIRealizePalette (GDI.362) + * GDIRealizePalette (GDI.362) + * GDIRealizePalette16 (GDI32.@) */ UINT16 WINAPI GDIRealizePalette16( HDC16 hdc ) { diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f21bb01d815..f7ebbe80015 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1177,7 +1177,7 @@ void SIGNAL_Reset(void) #ifdef __HAVE_VM86 /********************************************************************** - * __wine_enter_vm86 + * __wine_enter_vm86 (NTDLL.@) * * Enter vm86 mode with the specified register context. */ @@ -1255,6 +1255,9 @@ cancel_vm86: } #else /* __HAVE_VM86 */ +/********************************************************************** + * __wine_enter_vm86 (NTDLL.@) + */ void __wine_enter_vm86( CONTEXT *context ) { MESSAGE("vm86 mode not supported on this platform\n"); diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 45a0e31cc6a..3e114d381b2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1633,7 +1633,7 @@ BOOL WINAPI SHLWAPI_323(LPCWSTR lpszSubKey) * NOTES * The base path for the key is "MIME\Database\Content Type\" */ -BOOL SHLWAPI_328(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) +BOOL WINAPI SHLWAPI_328(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) { TRACE("(%s,%p,%ld)\n", debugstr_a(lpszType), lpszBuffer, dwLen); @@ -1656,7 +1656,7 @@ BOOL SHLWAPI_328(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) * * Unicode version of SHLWAPI_328. */ -BOOL SHLWAPI_329(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen) +BOOL WINAPI SHLWAPI_329(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen) { TRACE("(%s,%p,%ld)\n", debugstr_w(lpszType), lpszBuffer, dwLen); diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3ba3b6dfd7b..50c013ba619 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -326,7 +326,7 @@ init SHLWAPI_LibMain 324 stdcall @(str str) SHLWAPI_324 325 stdcall @(wstr wstr) SHLWAPI_325 326 stdcall @(str) SHLWAPI_326 -326 stdcall @(wstr) SHLWAPI_327 +327 stdcall @(wstr) SHLWAPI_327 328 stdcall @(str ptr long) SHLWAPI_328 329 stdcall @(wstr ptr long) SHLWAPI_329 330 stub @ diff --git a/objects/clipping.c b/objects/clipping.c index af2fa45ff82..bf88d3ace74 100644 --- a/objects/clipping.c +++ b/objects/clipping.c @@ -117,7 +117,8 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } /*********************************************************************** - * SelectVisRgn (GDI.105) + * SelectVisRgn (GDI.105) + * SelectVisRgn16 (GDI32.@) */ INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn ) { @@ -265,7 +266,8 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom /*********************************************************************** - * ExcludeVisRect (GDI.73) + * ExcludeVisRect (GDI.73) + * ExcludeVisRect16 (GDI32.@) */ INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top, INT16 right, INT16 bottom ) @@ -297,7 +299,8 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top, /*********************************************************************** - * IntersectVisRect (GDI.98) + * IntersectVisRect (GDI.98) + * IntersectVisRect16 (GDI32.@) */ INT16 WINAPI IntersectVisRect16( HDC16 hdc, INT16 left, INT16 top, INT16 right, INT16 bottom ) @@ -410,7 +413,8 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) } /*********************************************************************** - * SaveVisRgn (GDI.129) + * SaveVisRgn (GDI.129) + * SaveVisRgn16 (GDI32.@) */ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc ) { @@ -450,7 +454,8 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc ) /*********************************************************************** - * RestoreVisRgn (GDI.130) + * RestoreVisRgn (GDI.130) + * RestoreVisRgn16 (GDI32.@) */ INT16 WINAPI RestoreVisRgn16( HDC16 hdc ) { diff --git a/objects/dc.c b/objects/dc.c index 50e0bea61b8..213d4cb62b7 100644 --- a/objects/dc.c +++ b/objects/dc.c @@ -267,7 +267,8 @@ void DC_UpdateXforms( DC *dc ) /*********************************************************************** - * GetDCState (GDI.179) + * GetDCState (GDI.179) + * GetDCState16 (GDI32.@) */ HDC16 WINAPI GetDCState16( HDC16 hdc ) { @@ -356,7 +357,8 @@ HDC16 WINAPI GetDCState16( HDC16 hdc ) /*********************************************************************** - * SetDCState (GDI.180) + * SetDCState (GDI.180) + * SetDCState16 (GDI32.@) */ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs ) { @@ -898,7 +900,8 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp ) /*********************************************************************** - * SetDCOrg (GDI.117) + * SetDCOrg (GDI.117) + * SetDCOrg16 (GDI32.@) */ DWORD WINAPI SetDCOrg16( HDC16 hdc, INT16 x, INT16 y ) { @@ -1165,7 +1168,8 @@ DWORD WINAPI GetDCHook16( HDC16 hdc, FARPROC16 *phookProc ) /*********************************************************************** - * SetHookFlags (GDI.192) + * SetHookFlags (GDI.192) + * SetHookFlags16 (GDI32.@) */ WORD WINAPI SetHookFlags16(HDC16 hDC, WORD flags) { diff --git a/objects/dcvalues.c b/objects/dcvalues.c index 3c459c864ad..eed2d2755f0 100644 --- a/objects/dcvalues.c +++ b/objects/dcvalues.c @@ -398,7 +398,8 @@ BOOL WINAPI GetWindowOrgEx( HDC hdc, LPPOINT pt ) /**** 16-bit functions ***/ /*********************************************************************** - * InquireVisRgn (GDI.131) + * InquireVisRgn (GDI.131) + * InquireVisRgn16 (GDI32.@) */ HRGN16 WINAPI InquireVisRgn16( HDC16 hdc ) { diff --git a/objects/metafile.c b/objects/metafile.c index d8b8ea034ff..0abf40c7ed8 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -182,6 +182,7 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf ) /****************************************************************** * DeleteMetaFile (GDI.127) + * DeleteMetaFile16 (GDI32.@) */ BOOL16 WINAPI DeleteMetaFile16( HMETAFILE16 hmf ) { diff --git a/objects/palette.c b/objects/palette.c index 238e7ad0324..37ee6033ce2 100644 --- a/objects/palette.c +++ b/objects/palette.c @@ -732,6 +732,7 @@ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc ) /*********************************************************************** * IsDCCurrentPalette (GDI.412) + * IsDCCurrentPalette16 (GDI32.@) */ BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC) { diff --git a/windows/queue.c b/windows/queue.c index 88d2f745544..cd320a0c0a6 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -456,7 +456,8 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd ) } /*********************************************************************** - * InitThreadInput (USER.409) + * InitThreadInput (USER.409) + * InitThreadInput16 (USER32.@) */ HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags ) {