diff --git a/controls/combo.c b/controls/combo.c
index 5c34d137d0f..7254e4affca 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -2326,8 +2326,8 @@ static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPA
 /*************************************************************************
  *           GetComboBoxInfo   (USER32.@)
  */
-BOOL WINAPI GetComboBoxInfo(HWND hwndCombo,      /* handle to combo box */
-			    PCOMBOBOXINFO pcbi   /* combo box information */)
+BOOL WINAPI GetComboBoxInfo(HWND hwndCombo,      /* [in] handle to combo box */
+			    PCOMBOBOXINFO pcbi   /* [in/out] combo box information */)
 {
     FIXME("\n");
     return FALSE;
diff --git a/dlls/avicap32/avicap32.spec b/dlls/avicap32/avicap32.spec
index d608f65e710..61922024504 100644
--- a/dlls/avicap32/avicap32.spec
+++ b/dlls/avicap32/avicap32.spec
@@ -1,4 +1,4 @@
-@ stdcall capCreateCaptureWindowA(str  long long long long ptr long) capCreateCaptureWindowA
-@ stdcall capCreateCaptureWindowW(wstr long long long long ptr long) capCreateCaptureWindowW
+@ stdcall capCreateCaptureWindowA(str  long long long long long long long) capCreateCaptureWindowA
+@ stdcall capCreateCaptureWindowW(wstr long long long long long long long) capCreateCaptureWindowW
 @ stdcall capGetDriverDescriptionA(long ptr long ptr long) capGetDriverDescriptionA
 @ stdcall capGetDriverDescriptionW(long ptr long ptr long) capGetDriverDescriptionW
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index aab7920b634..b730e2ae770 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -189,7 +189,7 @@ void WINAPI AVIFileExit(void) {
 
 /***********************************************************************
  *		AVIFileOpenA		(AVIFIL32.@)
- *		AVIFileOpenA		(AVIFILE.102)
+ *		AVIFileOpen		(AVIFILE.102)
  */
 HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode,
 			    LPCLSID lpHandler)
@@ -307,7 +307,9 @@ ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
 }
 
 /***********************************************************************
+ *		AVIFileInfo		(AVIFIL32.@)
  *		AVIFileInfoA		(AVIFIL32.@)
+ *		AVIFileInfo		(AVIFILE.142)
  */
 HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
 {
@@ -419,6 +421,7 @@ HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size)
 
 /***********************************************************************
  *		AVIFileEndRecord	(AVIFIL32.@)
+ *		AVIFileEndRecord	(AVIFILE.148)
  */
 HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile)
 {
@@ -432,6 +435,7 @@ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile)
 
 /***********************************************************************
  *		AVIStreamAddRef		(AVIFIL32.@)
+ *		AVIStreamAddRef		(AVIFILE.160)
  */
 ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream)
 {
@@ -447,6 +451,7 @@ ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream)
 
 /***********************************************************************
  *		AVIStreamRelease	(AVIFIL32.@)
+ *		AVIStreamRelease	(AVIFILE.161)
  */
 ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream)
 {
@@ -460,6 +465,10 @@ ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream)
   return IAVIStream_Release(pstream);
 }
 
+/***********************************************************************
+ *		AVIStreamCreate		(AVIFIL32.@)
+ *		AVIStreamCreate		(AVIFILE.104)
+ */
 HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
 			       LPCLSID pclsidHandler)
 {
@@ -736,6 +745,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,
 }
 
 /***********************************************************************
+ *		AVIStreamOpenFromFile   (AVIFILE.103)
  *		AVIStreamOpenFromFileA	(AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
@@ -792,6 +802,7 @@ HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi, LPCWSTR szFile,
 }
 
 /***********************************************************************
+ *		AVIStreamStart		(AVIFILE.130)
  *		AVIStreamStart		(AVIFIL32.@)
  */
 LONG WINAPI AVIStreamStart(PAVISTREAM pstream)
@@ -810,6 +821,7 @@ LONG WINAPI AVIStreamStart(PAVISTREAM pstream)
 }
 
 /***********************************************************************
+ *		AVIStreamLength		(AVIFILE.131)
  *		AVIStreamLength		(AVIFIL32.@)
  */
 LONG WINAPI AVIStreamLength(PAVISTREAM pstream)
@@ -828,6 +840,7 @@ LONG WINAPI AVIStreamLength(PAVISTREAM pstream)
 }
 
 /***********************************************************************
+ *		AVIStreamSampleToTime	(AVIFILE.133)
  *		AVIStreamSampleToTime	(AVIFIL32.@)
  */
 LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
@@ -848,6 +861,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
 }
 
 /***********************************************************************
+ *		AVIStreamTimeToSample	(AVIFILE.132)
  *		AVIStreamTimeToSample	(AVIFIL32.@)
  */
 LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
diff --git a/dlls/avifil32/avifile.spec b/dlls/avifil32/avifile.spec
index 41436edfdaa..3eb57bd7d8e 100644
--- a/dlls/avifil32/avifile.spec
+++ b/dlls/avifil32/avifile.spec
@@ -15,7 +15,7 @@
 100 pascal   AVIFileInit() AVIFileInit
 101 pascal   AVIFileExit() AVIFileExit
 102 pascal   AVIFileOpen(ptr str word ptr) AVIFileOpenA
-103 pascal   AVIStreamOpenFromFile(ptr str long word ptr) AVIStreamOpenFromFileA
+103 pascal   AVIStreamOpenFromFile(ptr str long long word ptr) AVIStreamOpenFromFileA
 104 pascal   AVIStreamCreate(ptr long long ptr) AVIStreamCreate
 105 stub     AVIMAKECOMPRESSEDSTREAM
 106 stub     AVIMAKEFILEFROMSTREAMS
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index a0caa6ccf4d..1a6febfdf74 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -203,7 +203,7 @@ init	RPCRT4_LibMain
 @ stdcall UuidToStringA(ptr ptr) UuidToStringA
 @ stdcall UuidToStringW(ptr ptr) UuidToStringW
 
-@ stdcall CStdStubBuffer_QueryInterface(ptr ptr) CStdStubBuffer_QueryInterface
+@ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) CStdStubBuffer_QueryInterface
 @ stdcall CStdStubBuffer_AddRef(ptr) CStdStubBuffer_AddRef
 @ stdcall CStdStubBuffer_Connect(ptr ptr) CStdStubBuffer_Connect
 @ stdcall CStdStubBuffer_Disconnect(ptr) CStdStubBuffer_Disconnect
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 603af101bc6..e5b18239305 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -95,7 +95,7 @@
 @ stub SetupDiCreateDevRegKeyW
 @ stub SetupDiCreateDeviceInfoA
 @ stub SetupDiCreateDeviceInfoList
-@ stdcall SetupDiCreateDeviceInfoListExW(ptr ptr)  SetupDiCreateDeviceInfoListExW
+@ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr)  SetupDiCreateDeviceInfoListExW
 @ stub SetupDiCreateDeviceInfoW
 @ stub SetupDiDeleteDevRegKey
 @ stub SetupDiDeleteDeviceInfo
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index 4f4152ad7e3..4cd9710c8a1 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -65,51 +65,85 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 )
     return 0;
 }
 
-/*WINAPI  in description not given*/
+/***********************************************************************
+ *		SetupDiOpenClassRegKeyExW  (SETUPAPI.@)
+ *
+ * WINAPI in description not given
+ */
 HKEY WINAPI SetupDiOpenClassRegKeyExW(LPGUID class, DWORD access, DWORD flags, LPCWSTR  machine, PVOID reserved)
 {
   FIXME("\n");
   return INVALID_HANDLE_VALUE;
 }
 
+/***********************************************************************
+ *		SetupDiGetClassDescriptionExW  (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiGetClassDescriptionExW (GUID* class, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR  machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiClassNameFromGuidExW  (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiClassNameFromGuidExW (GUID* class, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR  machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiBuildClassInfoListExW  (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD flags, LPGUID list, DWORD size, PDWORD required,  LPCWSTR  machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
+
+/***********************************************************************
+ *		SetupDiGetDeviceInfoListDetailW  (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data )
 {
   FIXME("\n");
   return FALSE;
 }
+
+/***********************************************************************
+ *		SetupDiCreateDeviceInfoListExW  (SETUPAPI.@)
+ */
 HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(LPGUID class, HWND parend, LPCWSTR machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
-/* NO WINAPI in description given*/
+
+/***********************************************************************
+ *		  (SETUPAPI.@)
+ *
+ * NO WINAPI in description given
+ */
 HDEVINFO WINAPI SetupDiGetClassDevsExW(LPGUID class, LPCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, LPCWSTR machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
+
+/***********************************************************************
+ *		SetupDiClassGuidsFromNameExW  (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiClassGuidsFromNameExW(LPCWSTR class, LPGUID list, DWORD size, PDWORD required,  LPCWSTR  machine, PVOID reserved)
 {
   FIXME("\n");
   return FALSE;
 }
+
+/***********************************************************************
+ *		CM_Connect_MachineW  (SETUPAPI.@)
+ */
 DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine)
 {
 #define  CR_SUCCESS       0x00000000
@@ -117,6 +151,10 @@ DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine)
   FIXME("\n");
   return  CR_ACCESS_DENIED;
 }
+
+/***********************************************************************
+ *		CM_Disconnect_Machine  (SETUPAPI.@)
+ */
 DWORD WINAPI CM_Disconnect_Machine(DWORD handle)
 {
   FIXME("\n");
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index 02d4af0a54b..3f2e15c465a 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -686,7 +686,7 @@ init	UserClientDllInitialize
 @ cdecl CLIPBOARD_LookupFormat(long) CLIPBOARD_LookupFormat
 @ cdecl CLIPBOARD_ReleaseOwner() CLIPBOARD_ReleaseOwner
 @ cdecl DCE_InvalidateDCE(long ptr) DCE_InvalidateDCE
-@ cdecl HOOK_CallHooks(long long long long) HOOK_CallHooks
+@ cdecl HOOK_CallHooks(long long long long long) HOOK_CallHooks
 @ cdecl NC_GetInsideRect(long ptr) NC_GetInsideRect
 @ cdecl NC_HandleNCHitTest(long long long) NC_HandleNCHitTest
 @ cdecl NC_HandleSetCursor(long long long) NC_HandleSetCursor
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 9c72687d45f..48fbe960706 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -180,7 +180,7 @@ WININET_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  *     FALSE on failure
  *
  */
-BOOL InternetInitializeAutoProxyDll(DWORD dwReserved)
+BOOL WINAPI InternetInitializeAutoProxyDll(DWORD dwReserved)
 {
     FIXME("STUB\n");
     INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED);