Fixed some issues reported by winapi_check.
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 5aaab88..54d366b 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -485,7 +485,7 @@
@ cdecl strtol(str ptr long) strtol
@ cdecl strtoul(str ptr long) strtoul
@ cdecl strxfrm(ptr str long) strxfrm
-@ varargs swprintf() wsprintfW
+@ varargs swprintf(wstr wstr) wsprintfW
@ stub swscanf
@ cdecl system(str) CRTDLL_system
@ cdecl tan(double) tan
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index d68ba58..6be618e 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -915,7 +915,7 @@
@ stub pow
@ stub qsort
@ stub sin
-@ varargs sprintf() wsprintfA
+@ varargs sprintf(str str) wsprintfA
@ stub sqrt
@ varargs sscanf() sscanf
@ cdecl strcat(str str) strcat
@@ -931,7 +931,7 @@
@ cdecl strrchr(str long) strrchr
@ cdecl strspn(str str) strspn
@ cdecl strstr(str str) strstr
-@ varargs swprintf() wsprintfW
+@ varargs swprintf(wstr wstr) wsprintfW
@ stub tan
@ cdecl tolower(long) tolower
@ cdecl toupper(long) toupper
diff --git a/graphics/painting.c b/graphics/painting.c
index e8aad37..7f3d371 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -402,7 +402,7 @@
* Success: Pixel format index closest to given format
* Failure: 0
*/
-INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
+INT WINAPI ChoosePixelFormat( HDC hdc, const LPPIXELFORMATDESCRIPTOR ppfd )
{
FIXME("(%d,%p): stub\n",hdc,ppfd);
return 1;
@@ -420,8 +420,8 @@
*
* RETURNS STD
*/
-BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat,
- const PIXELFORMATDESCRIPTOR* ppfd)
+BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat,
+ const PIXELFORMATDESCRIPTOR *ppfd)
{
FIXME("(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
return TRUE;
@@ -439,7 +439,7 @@
* Success: Currently selected pixel format
* Failure: 0
*/
-int WINAPI GetPixelFormat( HDC hdc )
+INT WINAPI GetPixelFormat( HDC hdc )
{
FIXME("(%d): stub\n",hdc);
return 1;
@@ -460,7 +460,7 @@
* Success: Maximum pixel format index of the device context
* Failure: 0
*/
-int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
+INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes,
LPPIXELFORMATDESCRIPTOR ppfd )
{
FIXME("(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
diff --git a/include/ddeml.h b/include/ddeml.h
index 6866611..8605c17 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -339,8 +339,8 @@
BOOL WINAPI DdeUnaccessData(HDDEDATA);
BOOL16 WINAPI DdeEnableCallback16(DWORD,HCONV,UINT16);
BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
-int WINAPI DdeCmpStringHandles16(HSZ,HSZ);
-int WINAPI DdeCmpStringHandles(HSZ,HSZ);
+INT16 WINAPI DdeCmpStringHandles16(HSZ,HSZ);
+INT WINAPI DdeCmpStringHandles(HSZ,HSZ);
HDDEDATA WINAPI DdeNameService16(DWORD,HSZ,HSZ,UINT16);
HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
diff --git a/include/wingdi.h b/include/wingdi.h
index 6aac1ff..569e63c 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -3062,7 +3062,7 @@
BOOL WINAPI ArcTo(HDC, INT, INT, INT, INT, INT, INT, INT, INT);
BOOL WINAPI BeginPath(HDC);
BOOL WINAPI BitBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,DWORD);
-INT WINAPI ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR*);
+INT WINAPI ChoosePixelFormat(HDC,const LPPIXELFORMATDESCRIPTOR);
BOOL WINAPI Chord(HDC,INT,INT,INT,INT,INT,INT,INT,INT);
HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
BOOL WINAPI CloseFigure(HDC);
diff --git a/relay32/kernel32.spec b/relay32/kernel32.spec
index a4003ff..d787bb8 100644
--- a/relay32/kernel32.spec
+++ b/relay32/kernel32.spec
@@ -29,7 +29,7 @@
12 stdcall k32OemToCharA(ptr ptr) OemToCharA
13 stdcall k32OemToCharBuffA(ptr ptr long) OemToCharBuffA
14 stdcall k32LoadStringA(long long ptr long) LoadStringA
- 15 varargs k32wsprintfA() wsprintfA
+ 15 varargs k32wsprintfA(str str) wsprintfA
16 stdcall k32wvsprintfA(ptr str ptr) wvsprintfA
17 register CommonUnimpStub() CommonUnimpStub
18 stdcall GetProcessDword(long long) GetProcessDword
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 3c8c587..7303f53 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -199,7 +199,7 @@
#ifdef __i386__
-/* PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ); */
+PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare );
__ASM_GLOBAL_FUNC(InterlockedCompareExchange,
"movl 12(%esp),%eax\n\t"
"movl 8(%esp),%ecx\n\t"
@@ -207,21 +207,21 @@
"lock; cmpxchgl %ecx,(%edx)\n\t"
"ret $12");
-/* LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); */
+LONG WINAPI InterlockedExchange( PLONG dest, LONG val );
__ASM_GLOBAL_FUNC(InterlockedExchange,
"movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t"
"lock; xchgl %eax,(%edx)\n\t"
"ret $8");
-/* LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ); */
+LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
__ASM_GLOBAL_FUNC(InterlockedExchangeAdd,
"movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t"
"lock; xaddl %eax,(%edx)\n\t"
"ret $8");
-/* LONG WINAPI InterlockedIncrement( PLONG dest ); */
+LONG WINAPI InterlockedIncrement( PLONG dest );
__ASM_GLOBAL_FUNC(InterlockedIncrement,
"movl 4(%esp),%edx\n\t"
"movl $1,%eax\n\t"
@@ -229,7 +229,7 @@
"incl %eax\n\t"
"ret $4");
-/* LONG WINAPI InterlockedDecrement( PLONG dest ); */
+LONG WINAPI InterlockedDecrement( PLONG dest );
__ASM_GLOBAL_FUNC(InterlockedDecrement,
"movl 4(%esp),%edx\n\t"
"movl $-1,%eax\n\t"
diff --git a/win32/newfns.c b/win32/newfns.c
index efb40d3..f8b75d5 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -312,8 +312,8 @@
}
-BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, int nIndex,
- LPVOID pvInfo, DWORD nLength )
+BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, INT nIndex,
+ LPVOID pvInfo, DWORD nLength )
{
FIXME("(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength);
return TRUE;
diff --git a/windows/painting.c b/windows/painting.c
index 25d88ff..063d371 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -1395,7 +1395,7 @@
/**********************************************************************
* DrawAnimatedRects (USER32.153)
*/
-BOOL WINAPI DrawAnimatedRects( HWND hwnd, int idAni,
+BOOL WINAPI DrawAnimatedRects( HWND hwnd, INT idAni,
const RECT* lprcFrom,
const RECT* lprcTo )
{
