Fixed some of the issues reported by winapi-check.

diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 632f193..305815e 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -19,7 +19,7 @@
  11 stdcall DPA_Merge(ptr ptr long ptr ptr long) DPA_Merge
 #12 stub Cctl1632_ThunkData32
  13 stdcall MakeDragList(long) MakeDragList
- 14 stdcall LBItemFromPt(long long long) LBItemFromPt
+ 14 stdcall LBItemFromPt(long long long long) LBItemFromPt
  15 stdcall DrawInsert(long long long) DrawInsert
  16 stdcall CreateUpDownControl(long long long long long long long long long long long long) CreateUpDownControl
  17 stdcall InitCommonControls() InitCommonControls
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index b250efc..ca54037 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -337,9 +337,11 @@
 /***********************************************************************
  *           DebugBreak16   (KERNEL.203)
  */
-void WINAPI DebugBreak16( CONTEXT *context )
+void WINAPI DebugBreak16( CONTEXT86 *context )
 {
+#ifdef __i386__
     REGS_FUNC(DebugBreak)( context );
+#endif  /* defined(__i386__) */
 }
 
 
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 35b8c9c..44a687c 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -150,12 +150,13 @@
  */
 NTSTATUS WINAPI NtSetVolumeInformationFile(
 	IN HANDLE FileHandle,
-	IN PVOID VolumeInformationClass,
-	PVOID VolumeInformation,
-	ULONG Length) 
+	PIO_STATUS_BLOCK IoStatusBlock,
+	PVOID FsInformation,
+        ULONG Length,
+	FS_INFORMATION_CLASS FsInformationClass) 
 {
-	FIXME("(0x%08x,%p,%p,0x%08lx) stub\n",
-	FileHandle,VolumeInformationClass,VolumeInformation,Length);
+	FIXME("(0x%08x,%p,%p,0x%08lx,0x%08x) stub\n",
+	FileHandle,IoStatusBlock,FsInformation,Length,FsInformationClass);
 	return 0;
 }
 
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 8674fb5..a9d6a85 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -92,7 +92,7 @@
 084 stub NtCreateSemaphore
 085 stub NtCreateSymbolicLinkObject
 086 stub NtCreateThread
-087 stdcall NtCreateTimer(long long long) NtCreateTimer
+087 stdcall NtCreateTimer(ptr long ptr long) NtCreateTimer
 088 stub NtCreateToken
 089 stdcall NtCurrentTeb() NtCurrentTeb
 090 stub NtDelayExecution
@@ -164,7 +164,7 @@
 156 stdcall NtQueryInformationToken (long long long long long) NtQueryInformationToken
 157 stub NtQueryIntervalProfile
 158 stub NtQueryIoCompletion
-159 stdcall NtQueryKey (long long long long) NtQueryKey
+159 stdcall NtQueryKey (long long ptr long ptr) NtQueryKey
 160 stub NtQueryMutant
 161 stdcall NtQueryObject(long long long long long) NtQueryObject
 162 stdcall NtQueryPerformanceCounter (long long) NtQueryPerformanceCounter
@@ -226,10 +226,10 @@
 218 stub NtSetSystemInformation
 219 stub NtSetSystemPowerState
 220 stub NtSetSystemTime
-221 stdcall NtSetTimer(long long long long long long) NtSetTimer
+221 stdcall NtSetTimer(long ptr ptr ptr long long ptr) NtSetTimer
 222 stub NtSetTimerResolution
 223 stdcall NtSetValueKey(long long long long long long) NtSetValueKey
-224 stdcall NtSetVolumeInformationFile(long long long long long) NtSetVolumeInformationFile
+224 stdcall NtSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile
 225 stub NtShutdownSystem
 226 stub NtStartProfile
 227 stub NtStopProfile
@@ -314,7 +314,7 @@
 306 stdcall RtlCreateAcl(ptr long long) RtlCreateAcl
 307 stub RtlCreateAndSetSD
 308 stdcall RtlCreateEnvironment(long long) RtlCreateEnvironment
-309 stdcall RtlCreateHeap(long ptr long long ptr) RtlCreateHeap
+309 stdcall RtlCreateHeap(long ptr long long ptr ptr) RtlCreateHeap
 310 stub RtlCreateProcessParameters
 311 stub RtlCreateQueryDebugBuffer
 312 stub RtlCreateRegistryKey
@@ -376,7 +376,7 @@
 368 stub RtlFindSetBits
 369 stub RtlFindSetBitsAndClear
 370 stdcall RtlFirstFreeAce(ptr ptr) RtlFirstFreeAce
-371 stdcall RtlFormatCurrentUserKeyPath() RtlFormatCurrentUserKeyPath
+371 stdcall RtlFormatCurrentUserKeyPath(wstr) RtlFormatCurrentUserKeyPath
 372 stub RtlFormatMessage
 373 stdcall RtlFreeAnsiString(long) RtlFreeAnsiString
 374 stdcall RtlFreeHeap(long long long) RtlFreeHeap
@@ -594,7 +594,7 @@
 586 stub ZwCreateSemaphore
 587 stub ZwCreateSymbolicLinkObject
 588 stub ZwCreateThread
-589 stdcall ZwCreateTimer(long long long) NtCreateTimer
+589 stdcall ZwCreateTimer(ptr long ptr long) NtCreateTimer
 590 stub ZwCreateToken
 591 stub ZwDelayExecution
 592 stub ZwDeleteFile
@@ -727,10 +727,10 @@
 719 stub ZwSetSystemInformation
 720 stub ZwSetSystemPowerState
 721 stub ZwSetSystemTime
-722 stdcall ZwSetTimer(long long long long long long) NtSetTimer
+722 stdcall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer
 723 stub ZwSetTimerResolution
 724 stdcall ZwSetValueKey(long long long long long long) NtSetValueKey
-725 stdcall ZwSetVolumeInformationFile(long long long long long) NtSetVolumeInformationFile
+725 stdcall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile
 726 stub ZwShutdownSystem
 727 stub ZwStartProfile
 728 stub ZwStopProfile
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 33db513..ab2f557 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -431,9 +431,9 @@
 /******************************************************************************
  *  RtlFormatCurrentUserKeyPath		[NTDLL.371] 
  */
-DWORD WINAPI RtlFormatCurrentUserKeyPath(DWORD x)
+DWORD WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING String)
 {
-    FIXME("(0x%08lx): stub\n",x);
+    FIXME("(%p): stub\n",String);
     return 1;
 }
 
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec
index e418c59..85395dc 100644
--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
@@ -71,7 +71,7 @@
  63 stdcall lineSetCallPrivilege(long long) lineSetCallPrivilege
  64 stdcall lineSetCurrentLocation(long long) lineSetCurrentLocation
  65 stdcall lineSetDevConfig(long ptr long str) lineSetDevConfig
- 66 stdcall lineSetMediaControl(long long long long ptr) lineSetMediaControl
+ 66 stdcall lineSetMediaControl(long long long long ptr long ptr long ptr long ptr long) lineSetMediaControl
  67 stdcall lineSetMediaMode(long long) lineSetMediaMode
  68 stdcall lineSetNumRings(long long long) lineSetNumRings
  69 stdcall lineSetStatusMessages(long long long) lineSetStatusMessages
@@ -106,7 +106,7 @@
  95 stdcall phoneGetStatusMessages(long ptr ptr ptr) phoneGetStatusMessages
  96 stdcall phoneGetVolume(long long ptr) phoneGetVolume
  97 stdcall phoneInitialize(ptr long ptr str ptr) phoneInitialize
- 98 stdcall phoneNegotiateAPIVersion(long long long long long ptr ptr)
+ 98 stdcall phoneNegotiateAPIVersion(long long long long ptr ptr)
  phoneNegotiateAPIVersion
  99 stdcall phoneNegotiateExtVersion(long long long long long ptr)
  phoneNegotiateExtVersion
diff --git a/if1632/builtin.c b/if1632/builtin.c
index 3019141..6fb852b 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -322,7 +322,7 @@
  *
  * Default interrupt handler.
  */
-void BUILTIN_DefaultIntHandler( CONTEXT86 *context )
+void WINAPI BUILTIN_DefaultIntHandler( CONTEXT86 *context )
 {
     WORD ordinal;
     char name[80];
diff --git a/if1632/gdi.spec b/if1632/gdi.spec
index 0dfda6d..7c09bea 100644
--- a/if1632/gdi.spec
+++ b/if1632/gdi.spec
@@ -261,7 +261,7 @@
 379 pascal16 StartPage(word) StartPage16
 380 pascal16 EndPage(word) EndPage16
 381 pascal16 SetAbortProc(word segptr) SetAbortProc16
-382 pascal16 AbortDoc() AbortDoc16
+382 pascal16 AbortDoc(word) AbortDoc16
 400 pascal16 FastWindowFrame(word ptr s_word s_word long) FastWindowFrame16
 401 stub GDIMOVEBITMAP
 403 stub GDIINIT2
diff --git a/if1632/mmsystem.spec b/if1632/mmsystem.spec
index d09bbdf..8e778f5 100644
--- a/if1632/mmsystem.spec
+++ b/if1632/mmsystem.spec
@@ -123,7 +123,7 @@
 717    pascal  mciGetCreatorTask(word) mciGetCreatorTask16
 800    pascal  mixerGetNumDevs() mixerGetNumDevs16
 801    pascal  mixerGetDevCaps(word ptr word) mixerGetDevCaps16
-802    pascal  mixerOpen(ptr word long long) mixerOpen16
+802    pascal  mixerOpen(ptr word long long long) mixerOpen16
 803    pascal  mixerClose(word) mixerClose16
 804    pascal  mixerMessage(word word long long) mixerMessage16
 805    pascal  mixerGetLineInfo(word ptr long) mixerGetLineInfo16
diff --git a/if1632/user.spec b/if1632/user.spec
index f3aeff2..c49074b 100644
--- a/if1632/user.spec
+++ b/if1632/user.spec
@@ -454,7 +454,7 @@
 506 pascal16 WNetCancelJob(ptr word) WNetCancelJob16
 507 pascal16 WNetSetJobCopies(ptr word word) WNetSetJobCopies16
 508 pascal16 WNetWatchQueue(word ptr ptr word) WNetWatchQueue16
-509 pascal16 WNetUnwatchQueue(word ptr ptr word) WNetUnwatchQueue16
+509 pascal16 WNetUnwatchQueue(str) WNetUnwatchQueue16
 510 pascal16 WNetLockQueueData(ptr ptr ptr) WNetLockQueueData16
 511 pascal16 WNetUnlockQueueData(ptr) WNetUnlockQueueData16
 512 pascal16 WNetGetConnection(ptr ptr ptr) WNetGetConnection16
@@ -474,7 +474,7 @@
 526 pascal16 WNetDisconnectDialog(word word) WNetDisconnectDialog16
 527 pascal16 WNetConnectionDialog(word word) WNetConnectionDialog16
 528 pascal16 WNetViewQueueDialog(word ptr) WNetViewQueueDialog16
-529 pascal16 WNetPropertyDialog(word word ptr word) WNetPropertyDialog16
+529 pascal16 WNetPropertyDialog(word word word str word) WNetPropertyDialog16
 530 pascal16 WNetGetDirectoryType(ptr ptr) WNetGetDirectoryType16
 531 pascal16 WNetDirectoryNotify(word ptr word) WNetDirectoryNotify16
 532 pascal16 WNetGetPropertyText(word word str str word word) WNetGetPropertyText16
diff --git a/include/multimedia.h b/include/multimedia.h
index ffcff20..6f41b43 100644
--- a/include/multimedia.h
+++ b/include/multimedia.h
@@ -147,7 +147,7 @@
 LRESULT 		WINAPI 	mmTaskSignal16(HTASK16 ht);
 void    		WINAPI  mmTaskYield16(void);
 
-void		CALLBACK	WINE_mmThreadEntryPoint(DWORD _pmt);
+void		        WINAPI  WINE_mmThreadEntryPoint(DWORD _pmt);
 LRESULT 		WINAPI 	mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE lpHndl, DWORD dwPmt, DWORD dwFlags);
 void 			WINAPI 	mmThreadSignal16(HANDLE16 hndl);
 void    		WINAPI	mmThreadBlock16(HANDLE16 hndl);
diff --git a/include/ntddk.h b/include/ntddk.h
index 7c49bcd..919287e 100644
--- a/include/ntddk.h
+++ b/include/ntddk.h
@@ -104,6 +104,18 @@
 	FileMaximumInformation
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 
+typedef enum _FSINFOCLASS {
+	FileFsVolumeInformation = 1,
+	FileFsLabelInformation,
+	FileFsSizeInformation,
+	FileFsDeviceInformation,
+	FileFsAttributeInformation,
+	FileFsControlInformation,
+	FileFsFullSizeInformation,
+	FileFsObjectIdInformation,
+	FileFsMaximumInformation
+} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
+
 typedef enum _SECTION_INHERIT 
 {
 	ViewShare = 1,
@@ -589,7 +601,7 @@
 BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type);
 INT WINAPI RtlExtendedLargeIntegerDivide(LARGE_INTEGER dividend, DWORD divisor, LPDWORD rest);
 long long WINAPI RtlExtendedIntegerMultiply(LARGE_INTEGER factor1,INT factor2);
-DWORD WINAPI RtlFormatCurrentUserKeyPath(DWORD x);
+DWORD WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING String);
 DWORD WINAPI RtlOpenCurrentUser(DWORD x1, DWORD *x2);
 BOOLEAN WINAPI RtlDosPathNameToNtPathName_U( LPWSTR from,PUNICODE_STRING us,DWORD x2,DWORD x3);
 DWORD WINAPI RtlCreateEnvironment(DWORD x1,DWORD x2);
diff --git a/include/olectl.h b/include/olectl.h
index 2f61581..ebe85ca 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -3,8 +3,6 @@
 
 #include "windef.h"
 
-#define WINOLECTLAPI INT WINAPI
-
 #ifdef __cplusplus
 #define DUMMY_UNION_NAME
 #else
@@ -84,7 +82,9 @@
 #define FONTSIZE(n) { n##0000, 0 }
 
 /* COREL MOD PQ mar 9 - redecl in mfc */
-/*WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, VOID** ppvObj);*/
+#if 0
+WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, VOID** ppvObj);
+#endif
 
 #define PICTYPE_UNINITIALIZED (-1)
 #define PICTYPE_NONE          0
diff --git a/include/winsock.h b/include/winsock.h
index ca4f9b6..ca63988 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -429,8 +429,8 @@
 INT16 	  WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle);
 INT     WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle);
 
-INT16     WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT lEvent);
-INT     WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent);
+INT16     WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent);
+INT     WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent);
 
 
 /*
diff --git a/misc/network.c b/misc/network.c
index afccdd4..e332ebe 100644
--- a/misc/network.c
+++ b/misc/network.c
@@ -824,7 +824,6 @@
  */
 DWORD WINAPI WNetCancelConnectionA(
   LPCSTR lpName, 
-  DWORD dwFlags, 
   BOOL fForce) {
 
   FIXME_(wnet)(": stub\n");
@@ -836,7 +835,6 @@
  */
 DWORD WINAPI WNetCancelConnectionW(
   LPCWSTR lpName, 
-  DWORD dwFlags, 
   BOOL fForce) {
 
   FIXME_(wnet)(": stub\n");
diff --git a/misc/system.c b/misc/system.c
index d737e8e..2bdd049 100644
--- a/misc/system.c
+++ b/misc/system.c
@@ -157,7 +157,7 @@
 /***********************************************************************
  *           Get80x87SaveSize16   (SYSTEM.7)
  */
-WORD Get80x87SaveSize16(void)
+WORD WINAPI Get80x87SaveSize16(void)
 {
     return 94;
 }
@@ -166,7 +166,7 @@
 /***********************************************************************
  *           Save80x87State16   (SYSTEM.8)
  */
-void Save80x87State16( char *ptr )
+void WINAPI Save80x87State16( char *ptr )
 {
 #ifdef __i386__
     __asm__(".byte 0x66; fsave %0; fwait" : "=m" (ptr) );
@@ -177,7 +177,7 @@
 /***********************************************************************
  *           Restore80x87State16   (SYSTEM.9)
  */
-void Restore80x87State16( const char *ptr )
+void WINAPI Restore80x87State16( const char *ptr )
 {
 #ifdef __i386__
     __asm__(".byte 0x66; frstor %0" : : "m" (ptr) );
diff --git a/misc/winsock.c b/misc/winsock.c
index b7d016b..75f4d33 100644
--- a/misc/winsock.c
+++ b/misc/winsock.c
@@ -1241,12 +1241,12 @@
 /***********************************************************************
  *		ioctlsocket()		(WSOCK32.12)
  */
-INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp)
+INT WINAPI WINSOCK_ioctlsocket(SOCKET s, LONG cmd, ULONG *argp)
 {
   ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
   LPWSINFO      pwsi = wsi_find(GetCurrentTask());
 
-  TRACE("(%08x): socket %04x, cmd %08x, ptr %8x\n", 
+  TRACE("(%08x): socket %04x, cmd %08lx, ptr %8x\n", 
 			  (unsigned)pwsi, s, cmd, (unsigned) argp);
   if( _check_ws(pwsi, pws) )
   {
@@ -1279,7 +1279,7 @@
 
 	default:	  
 		/* Netscape tries hard to use bogus ioctl 0x667e */
-		WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd);
+		WARN("\tunknown WS_IOCTL cmd (%08lx)\n", cmd);
     }
     if( ioctl(pws->fd, newcmd, (char*)argp ) == 0 ) return 0;
     SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); 
@@ -1290,7 +1290,7 @@
 /***********************************************************************
  *              ioctlsocket()           (WINSOCK.12)
  */
-INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, UINT cmd, UINT *argp)
+INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, LONG cmd, ULONG *argp)
 {
     return (INT16)WINSOCK_ioctlsocket( s, cmd, argp );
 }
@@ -2284,7 +2284,7 @@
     return ( num_posted ) ? TRUE : FALSE;
 }
 
-INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent)
+INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
 {
     ws_socket*    pws  = (ws_socket*)WS_HANDLE2PTR(s);
     LPWSINFO      pwsi = wsi_find(GetCurrentTask());
@@ -2361,7 +2361,7 @@
     return SOCKET_ERROR; 
 }
 
-INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, UINT lEvent)
+INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent)
 {
     return (INT16)WSAAsyncSelect( s, hWnd, wMsg, lEvent );
 }
diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c
index fd35821..423f348 100644
--- a/multimedia/mmsystem.c
+++ b/multimedia/mmsystem.c
@@ -5026,7 +5026,7 @@
 /**************************************************************************
  * 				mmThreadGetTask			[internal]
  */
-void	CALLBACK	WINE_mmThreadEntryPoint(DWORD _pmt)
+void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
 {
     HANDLE16		hndl = (HANDLE16)_pmt;
     WINE_MMTHREAD*	lpMMThd = (WINE_MMTHREAD*)PTR_SEG_OFF_TO_LIN(hndl, 0);
diff --git a/ole/olefont.c b/ole/olefont.c
index b17b4c5..48beac3 100644
--- a/ole/olefont.c
+++ b/ole/olefont.c
@@ -226,7 +226,7 @@
 /******************************************************************************
  *		OleCreateFontIndirect	[OLEAUT32.420]
  */
-WINOLECTLAPI OleCreateFontIndirect(
+INT WINAPI OleCreateFontIndirect(
   LPFONTDESC lpFontDesc,
   REFIID     riid,
   VOID**     ppvObj)
diff --git a/relay32/kernel32.spec b/relay32/kernel32.spec
index 15c8e14..1a89647 100644
--- a/relay32/kernel32.spec
+++ b/relay32/kernel32.spec
@@ -373,7 +373,7 @@
 355 stdcall GetNumberFormatA(long long str ptr ptr long) GetNumberFormatA
 356 stdcall GetNumberFormatW(long long wstr ptr ptr long) GetNumberFormatW
 357 stdcall GetNumberOfConsoleInputEvents(long ptr) GetNumberOfConsoleInputEvents
-358 stdcall GetNumberOfConsoleMouseButtons(long ptr) GetNumberOfConsoleMouseButtons
+358 stdcall GetNumberOfConsoleMouseButtons(ptr) GetNumberOfConsoleMouseButtons
 359 stdcall GetOEMCP() GetOEMCP
 360 stub GetOverlappedResult
 361 stdcall GetPriorityClass(long) GetPriorityClass
diff --git a/relay32/oleaut32.spec b/relay32/oleaut32.spec
index ffc1e36..aeb7ed5 100644
--- a/relay32/oleaut32.spec
+++ b/relay32/oleaut32.spec
@@ -12,9 +12,9 @@
 9 stdcall VariantClear(ptr) VariantClear
 10 stdcall VariantCopy(ptr ptr) VariantCopy
 11 stdcall VariantCopyInd(ptr ptr) VariantCopyInd
-12 stdcall VariantChangeType(ptr ptr) VariantChangeType
+12 stdcall VariantChangeType(ptr ptr long long) VariantChangeType
 13 stub VariantTimeToDosDateTime
-14 stdcall DosDateTimeToVariantTime(long ptr) DosDateTimeToVariantTime
+14 stdcall DosDateTimeToVariantTime(long long ptr) DosDateTimeToVariantTime
 15 stdcall SafeArrayCreate(long long ptr) SafeArrayCreate
 16 stdcall SafeArrayDestroy(ptr) SafeArrayDestroy
 17 stdcall SafeArrayGetDim(ptr) SafeArrayGetDim
@@ -126,7 +126,7 @@
 137 stub VarUI1FromDisp
 138 stdcall VarUI1FromBool(long ptr) VarUI1FromBool
 146 stub DispCallFunc
-147 stdcall VariantChangeTypeEx(ptr ptr) VariantChangeTypeEx
+147 stdcall VariantChangeTypeEx(ptr ptr long long long) VariantChangeTypeEx
 148 stub SafeArrayPtrOfIndex
 149 stdcall SysStringByteLen(ptr) SysStringByteLen
 150 stdcall SysAllocStringByteLen(ptr long) SysAllocStringByteLen
diff --git a/relay32/user32.spec b/relay32/user32.spec
index db1be11..22d2595 100644
--- a/relay32/user32.spec
+++ b/relay32/user32.spec
@@ -227,7 +227,7 @@
 223 stdcall GetClipboardFormatNameA(long ptr long) GetClipboardFormatNameA
 224 stdcall GetClipboardFormatNameW(long ptr long) GetClipboardFormatNameW
 225 stdcall GetClipboardOwner() GetClipboardOwner
-226 stdcall GetClipboardViewer(long) GetClipboardViewer
+226 stdcall GetClipboardViewer() GetClipboardViewer
 227 stdcall GetCursor() GetCursor
 228 stub GetCursorInfo
 229 stdcall GetCursorPos(ptr) GetCursorPos
@@ -458,8 +458,8 @@
 454 stdcall SendMessageA(long long long long) SendMessageA
 455 stdcall SendMessageCallbackA(long long long long ptr long) SendMessageCallbackA
 456 stdcall SendMessageCallbackW(long long long long ptr long) SendMessageCallbackW
-457 stdcall SendMessageTimeoutA(long long long long ptr ptr) SendMessageTimeoutA
-458 stdcall SendMessageTimeoutW(long long long long ptr ptr) SendMessageTimeoutW
+457 stdcall SendMessageTimeoutA(long long long long long long ptr) SendMessageTimeoutA
+458 stdcall SendMessageTimeoutW(long long long long long long ptr) SendMessageTimeoutW
 459 stdcall SendMessageW(long long long long) SendMessageW
 460 stdcall SendNotifyMessageA(long long long long) SendNotifyMessageA
 461 stdcall SendNotifyMessageW(long long long long) SendNotifyMessageW
@@ -529,7 +529,7 @@
 525 stdcall SetWindowsHookA(long ptr) SetWindowsHookA
 526 stdcall SetWindowsHookExA(long long long long) SetWindowsHookExA
 527 stdcall SetWindowsHookExW(long long long long) SetWindowsHookExW
-528 stdcall SetWindowsHookW(long long long long) SetWindowsHookW
+528 stdcall SetWindowsHookW(long ptr) SetWindowsHookW
 529 stdcall ShowCaret(long) ShowCaret
 530 stdcall ShowCursor(long) ShowCursor
 531 stdcall ShowOwnedPopups(long long) ShowOwnedPopups
diff --git a/relay32/winmm.spec b/relay32/winmm.spec
index 1428dc7..c6d167b 100644
--- a/relay32/winmm.spec
+++ b/relay32/winmm.spec
@@ -55,7 +55,7 @@
  51 stdcall mciSendStringA(str ptr long long) mciSendStringA
  52 stdcall mciSendStringW(str ptr long long) mciSendStringW
  53 stdcall mciSetDriverData(long long) mciSetDriverData
- 54 stdcall mciSetYieldProc(ptr) mciSetYieldProc
+ 54 stdcall mciSetYieldProc(long ptr long) mciSetYieldProc
  55 stub midiConnect
  56 stub midiDisconnect
  57 stdcall midiInAddBuffer(long ptr long) midiInAddBuffer
@@ -64,7 +64,7 @@
  60 stdcall midiInGetDevCapsW(long ptr long) midiInGetDevCapsW
  61 stdcall midiInGetErrorTextA(long ptr long) midiInGetErrorTextA
  62 stdcall midiInGetErrorTextW(long ptr long) midiInGetErrorTextW
- 63 stdcall midiInGetID(long) midiInGetID
+ 63 stdcall midiInGetID(long ptr) midiInGetID
  64 stdcall midiInGetNumDevs() midiInGetNumDevs
  65 stdcall midiInMessage(long long long long) midiInMessage
  66 stdcall midiInOpen(ptr long long long long) midiInOpen
@@ -80,7 +80,7 @@
  76 stdcall midiOutGetDevCapsW(long ptr long) midiOutGetDevCapsW
  77 stdcall midiOutGetErrorTextA(long ptr long) midiOutGetErrorTextA
  78 stdcall midiOutGetErrorTextW(long ptr long) midiOutGetErrorTextW
- 79 stdcall midiOutGetID(long) midiOutGetID
+ 79 stdcall midiOutGetID(long ptr) midiOutGetID
  80 stdcall midiOutGetNumDevs() midiOutGetNumDevs
  81 stdcall midiOutGetVolume(long ptr) midiOutGetVolume
  82 stdcall midiOutLongMsg(long ptr long) midiOutLongMsg