Fixed some issues reported by winapi_check.

dlls/ddraw/main.c

@@ -244,6 +244,9 @@ static LRESULT WINAPI DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
     return DefWindowProcA(hwnd,msg,wParam,lParam);
 }
 
+/***********************************************************************
+ *		DirectDrawCreate
+ */
 HRESULT WINAPI DirectDrawCreate(
 	LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter
 ) {

dlls/ddraw/x11.c

@@ -112,5 +112,6 @@ static void __asm__dummy_dll_init(void) {
     asm("\t.section .init ,\"ax\"\n"
 	        "\tcall X11_register\n"
 		    "\t.previous\n");
+}
 #endif /* defined(__GNUC__) */
 static void X11_register(void) { ddraw_register_driver(&x11_driver); }

dlls/dinput/dinput_main.c

@@ -480,7 +480,7 @@ static DataFormat *create_DataFormat(DIDATAFORMAT *wine_format, DIDATAFORMAT *as
 }
 
 /******************************************************************************
- *	DirectInputCreate32A
+ *	DirectInputCreateA
  */
 HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
 {

dlls/dplayx/dplayx.spec

@@ -2,7 +2,7 @@ name dplayx
 type win32
 init DPLAYX_LibMain
 
-  1 stdcall DirectPlayCreate(ptr ptr ptr ptr) DirectPlayCreate
+  1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
   2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA
   3 stdcall DirectPlayEnumerateW(ptr ptr) DirectPlayEnumerateW
   4 stdcall DirectPlayLobbyCreateA(ptr ptr ptr ptr long) DirectPlayLobbyCreateA

dlls/icmp/icmp_main.c

@@ -182,6 +182,9 @@ HANDLE WINAPI IcmpCreateFile(VOID)
 }
 
 
+/***********************************************************************
+ *		IcmpCloseHandle
+ */
 BOOL WINAPI IcmpCloseHandle(HANDLE  IcmpHandle)
 {
     icmp_t* icp=(icmp_t*)IcmpHandle;

dlls/ntdll/om.c

@@ -353,7 +353,7 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject(
  */
 NTSTATUS WINAPI NtAllocateUuids(LPDWORD lpdwCount, LPDWORD *p2, LPDWORD *p3)
 {
-	FIXME("(%p[%d],%p,%p), stub.\n", lpdwCount,
+	FIXME("(%p[%ld],%p,%p), stub.\n", lpdwCount,
 					 lpdwCount ? *lpdwCount : 0,
 					 p2, p3);
 	return 0;

dlls/shell32/shlwapi.spec

@@ -239,7 +239,7 @@ type win32
 @ stdcall PathMatchSpecW  (str str) PathMatchSpecW
 @ stub    PathParseIconLocationA
 @ stub    PathParseIconLocationW
-@ stdcall PathQuoteSpacesA (ptr) PathQuoteSpacesW
+@ stdcall PathQuoteSpacesA (ptr) PathQuoteSpacesA
 @ stdcall PathQuoteSpacesW (ptr) PathQuoteSpacesW
 @ stub    PathRelativePathToA
 @ stub    PathRelativePathToW

dlls/win87em/emulate.c

@@ -78,6 +78,9 @@ void WIN87_Init( CONTEXT86 *context )
     WIN87_ClearCtrlWord(context);
 }
 
+/***********************************************************************
+ *		WIN87_fpmath
+ */
 void WINAPI WIN87_fpmath( CONTEXT86 *context )
 {
     TRACE("(cs:eip=%x:%lx es=%x bx=%04x ax=%04x dx==%04x)\n",

dlls/wininet/ftp.c

@@ -7,12 +7,16 @@
  * Noureddine Jemmali
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -112,7 +116,7 @@ DWORD FTP_SetResponseError(DWORD dwResponse);
  *    FALSE on failure
  *
  */
-BOOLAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
+BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
     LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
@@ -155,7 +159,7 @@ BOOLAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
  *    FALSE on failure
  *
  */
-BOOLAPI FTP_FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
+BOOL WINAPI FTP_FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
     LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
 {
     HANDLE hFile = (HANDLE)NULL;
@@ -226,7 +230,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
+BOOL WINAPI FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
     LPWININETAPPINFOA hIC = NULL;
@@ -267,7 +271,7 @@ BOOLAPI FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
  *    FALSE on failure
  *
  */
-BOOLAPI FTP_FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
+BOOL WINAPI FTP_FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
 {
     INT nResCode;
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
@@ -325,7 +329,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
+BOOL WINAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
     LPWININETAPPINFOA hIC = NULL;
@@ -364,7 +368,7 @@ BOOLAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
  *    FALSE on failure
  *
  */
-BOOLAPI FTP_FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
+BOOL WINAPI FTP_FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory)
 {
     INT nResCode;
     BOOL bSuccess = FALSE;
@@ -558,7 +562,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, 
+BOOL WINAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, 
 	LPDWORD lpdwCurrentDirectory)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hFtpSession;
@@ -602,7 +606,7 @@ BOOLAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirector
  *    FALSE on failure
  *
  */
-BOOLAPI FTP_FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, 
+BOOL WINAPI FTP_FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, 
 	LPDWORD lpdwCurrentDirectory)
 {
     INT nResCode;
@@ -803,7 +807,7 @@ HINTERNET FTP_FtpOpenFileA(HINTERNET hFtpSession,
  *    FALSE on failure
  *
  */
-BOOLAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFile,
+BOOL WINAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFile,
 	BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags,
 	DWORD dwContext)
 {
@@ -850,7 +854,7 @@ BOOLAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFi
  *    FALSE on failure
  *
  */
-BOOLAPI FTP_FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFile,
+BOOL WINAPI FTP_FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszNewFile,
 	BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags,
 	DWORD dwContext)
 {
@@ -932,7 +936,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName)
+BOOL WINAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hFtpSession;
     LPWININETAPPINFOA hIC = NULL;
@@ -1026,7 +1030,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpRemoveDirectoryA(HINTERNET hFtpSession, LPCSTR lpszDirectory)
+BOOL WINAPI FtpRemoveDirectoryA(HINTERNET hFtpSession, LPCSTR lpszDirectory)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hFtpSession;
     LPWININETAPPINFOA hIC = NULL;
@@ -1121,7 +1125,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDest)
+BOOL WINAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDest)
 {
     LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hFtpSession;
     LPWININETAPPINFOA hIC = NULL;
@@ -1254,7 +1258,7 @@ HINTERNET FTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName,
 
     if (hIC->lpfnStatusCB)
         hIC->lpfnStatusCB(hInternet, dwContext, INTERNET_STATUS_RESOLVING_NAME,
-            lpszServerName, strlen(lpszServerName));
+            (LPSTR) lpszServerName, strlen(lpszServerName));
 
     if (!GetAddress(lpszServerName, nServerPort, &phe, &socketAddr))
     {
@@ -1264,7 +1268,7 @@ HINTERNET FTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName,
 
     if (hIC->lpfnStatusCB)
         hIC->lpfnStatusCB(hInternet, dwContext, INTERNET_STATUS_NAME_RESOLVED,
-            lpszServerName, strlen(lpszServerName));
+            (LPSTR) lpszServerName, strlen(lpszServerName));
 
     if (INVALID_SOCKET == (nsocket = socket(AF_INET,SOCK_STREAM,0)))
     {
@@ -1633,7 +1637,7 @@ lend:
 BOOL FTP_InitListenSocket(LPWININETFTPSESSIONA lpwfs)
 {
     BOOL bSuccess = FALSE;
-    socklen_t namelen = sizeof(struct sockaddr_in);
+    size_t namelen = sizeof(struct sockaddr_in);
 
     TRACE("\n");
 
@@ -1647,7 +1651,7 @@ BOOL FTP_InitListenSocket(LPWININETFTPSESSIONA lpwfs)
     lpwfs->lstnSocketAddress.sin_family = AF_INET;
     lpwfs->lstnSocketAddress.sin_port = htons((u_short) 0);
     lpwfs->lstnSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY); 
-    if (SOCKET_ERROR == bind(lpwfs->lstnSocket,&lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)))
+    if (SOCKET_ERROR == bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)))
     {
         TRACE("Unable to bind socket\n");
         goto lend;
@@ -1659,7 +1663,7 @@ BOOL FTP_InitListenSocket(LPWININETFTPSESSIONA lpwfs)
         goto lend;
     }
 
-    if (SOCKET_ERROR != getsockname(lpwfs->lstnSocket, &lpwfs->lstnSocketAddress, &namelen))
+    if (SOCKET_ERROR != getsockname(lpwfs->lstnSocket, (struct sockaddr *) &lpwfs->lstnSocketAddress, &namelen))
         bSuccess = TRUE;
 
 lend:
@@ -1768,10 +1772,10 @@ lend:
 BOOL FTP_InitDataSocket(LPWININETFTPSESSIONA lpwfs, LPINT nDataSocket)
 {
     struct sockaddr_in saddr;
-    socklen_t addrlen = sizeof(struct sockaddr);
+    size_t addrlen = sizeof(struct sockaddr);
 
     TRACE("\n");
-    *nDataSocket = accept(lpwfs->lstnSocket, &saddr, &addrlen);
+    *nDataSocket = accept(lpwfs->lstnSocket, (struct sockaddr *) &saddr, &addrlen);
     close(lpwfs->lstnSocket);
     lpwfs->lstnSocket = INVALID_SOCKET;
 

dlls/wininet/internet.c

@@ -7,9 +7,13 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <sys/types.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <stdlib.h>
 
 #include "windows.h"
@@ -35,7 +39,7 @@ typedef struct
 } WITHREADERROR, *LPWITHREADERROR;
 
 INTERNET_SCHEME GetInternetScheme(LPSTR lpszScheme);
-BOOLAPI INTERNET_FindNextFileA(HINTERNET hFind, LPVOID lpvFindData);
+BOOL WINAPI INTERNET_FindNextFileA(HINTERNET hFind, LPVOID lpvFindData);
 VOID INTERNET_ExecuteWork();
 
 DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES;
@@ -170,7 +174,7 @@ INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent,
  *    FALSE on failure
  *
  */
-BOOLAPI InternetGetLastResponseInfoA(LPDWORD lpdwError,
+BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError,
     LPSTR lpszBuffer, LPDWORD lpdwBufferLength)
 {
     LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex);
@@ -240,7 +244,7 @@ INTERNETAPI HINTERNET WINAPI InternetConnectA(HINTERNET hInternet,
  *    FALSE on failure
  *
  */
-BOOLAPI InternetFindNextFileA(HINTERNET hFind, LPVOID lpvFindData)
+BOOL WINAPI InternetFindNextFileA(HINTERNET hFind, LPVOID lpvFindData)
 {
     LPWININETAPPINFOA hIC = NULL;
     LPWININETFINDNEXTA lpwh = (LPWININETFINDNEXTA) hFind;
@@ -280,7 +284,7 @@ BOOLAPI InternetFindNextFileA(HINTERNET hFind, LPVOID lpvFindData)
  *    FALSE on failure
  *
  */
-BOOLAPI INTERNET_FindNextFileA(HINTERNET hFind, LPVOID lpvFindData)
+BOOL WINAPI INTERNET_FindNextFileA(HINTERNET hFind, LPVOID lpvFindData)
 {
     BOOL bSuccess = TRUE;
     LPWININETAPPINFOA hIC = NULL;
@@ -350,7 +354,7 @@ lend:
  *    FALSE on failure
  *
  */
-BOOLAPI InternetCloseHandle(HINTERNET hInternet)
+BOOL WINAPI InternetCloseHandle(HINTERNET hInternet)
 {
     BOOL retval = FALSE;
     LPWININETHANDLEHEADER lpwh = (LPWININETHANDLEHEADER) hInternet;
@@ -394,7 +398,7 @@ BOOLAPI InternetCloseHandle(HINTERNET hInternet)
  *    FALSE on failure
  *
  */
-BOOLAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, 
+BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, 
 		LPURL_COMPONENTSA lpUrlComponents)
 {
   /*
@@ -593,7 +597,7 @@ INTERNETAPI DWORD WINAPI InternetAttemptConnect(DWORD dwReserved)
  *    FALSE on failure
  *
  */
-BOOLAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer,
+BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer,
 	LPDWORD lpdwBufferLength, DWORD dwFlags)
 {
     BOOL bSuccess = FALSE;
@@ -649,7 +653,7 @@ INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallback(
  *    FALSE on failure
  *
  */
-BOOLAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer ,
+BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer ,
 	DWORD dwNumOfBytesToWrite, LPDWORD lpdwNumOfBytesWritten)
 {
     BOOL retval = FALSE;
@@ -697,7 +701,7 @@ BOOLAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer ,
  *    FALSE on failure
  *
  */
-BOOLAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, 
+BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, 
 	DWORD dwNumOfBytesToRead, LPDWORD dwNumOfBytesRead)
 {
     BOOL retval = FALSE;

dlls/winmm/mcianim/mcianim.c

@@ -38,9 +38,9 @@ typedef struct {
 /*-----------------------------------------------------------------------*/
 
 /**************************************************************************
- * 				ANIM_drvOpen			[internal]	
+ * 				MCIANIM_drvOpen			[internal]	
  */
-static	DWORD	ANIM_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
+static	DWORD	MCIANIM_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
 {
     WINE_MCIANIM*	wma = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIANIM));
 
@@ -55,9 +55,9 @@ static	DWORD	ANIM_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
 }
 
 /**************************************************************************
- * 				ANIM_drvClose		[internal]	
+ * 				MCIANIM_drvClose		[internal]	
  */
-static	DWORD	ANIM_drvClose(DWORD dwDevID)
+static	DWORD	MCIANIM_drvClose(DWORD dwDevID)
 {
     WINE_MCIANIM*  wma = (WINE_MCIANIM*)mciGetDriverData(dwDevID);
 
@@ -69,9 +69,9 @@ static	DWORD	ANIM_drvClose(DWORD dwDevID)
 }
 
 /**************************************************************************
- * 				ANIM_mciGetOpenDrv		[internal]	
+ * 				MCIANIM_mciGetOpenDrv		[internal]	
  */
-static WINE_MCIANIM*  ANIM_mciGetOpenDrv(UINT16 wDevID)
+static WINE_MCIANIM*  MCIANIM_mciGetOpenDrv(UINT16 wDevID)
 {
     WINE_MCIANIM*	wma = (WINE_MCIANIM*)mciGetDriverData(wDevID);
     
@@ -83,9 +83,9 @@ static WINE_MCIANIM*  ANIM_mciGetOpenDrv(UINT16 wDevID)
 }
 
 /**************************************************************************
- * 				ANIM_mciOpen			[internal]
+ * 				MCIANIM_mciOpen			[internal]
  */
-static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpenParms)
+static DWORD MCIANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpenParms)
 {
     DWORD		dwDeviceID;
     WINE_MCIANIM*	wma = (WINE_MCIANIM*)mciGetDriverData(wDevID);
@@ -144,11 +144,11 @@ static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpen
 }
 
 /**************************************************************************
- * 				ANIM_mciClose		[internal]
+ * 				MCIANIM_mciClose		[internal]
  */
-static DWORD ANIM_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
+static DWORD MCIANIM_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwParam, lpParms);
     
@@ -161,12 +161,12 @@ static DWORD ANIM_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpP
 }
 
 /**************************************************************************
- * 				ANIM_mciGetDevCaps	[internal]
+ * 				MCIANIM_mciGetDevCaps	[internal]
  */
-static DWORD ANIM_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, 
+static DWORD MCIANIM_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, 
 				LPMCI_GETDEVCAPS_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     DWORD		ret;
 
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
@@ -228,9 +228,9 @@ static DWORD ANIM_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags,
 
 
 /**************************************************************************
- * 				ANIM_CalcTime			[internal]
+ * 				MCIANIM_CalcTime			[internal]
  */
-static DWORD ANIM_CalcTime(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwFrame, LPDWORD lpRet)
+static DWORD MCIANIM_CalcTime(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwFrame, LPDWORD lpRet)
 {
     DWORD	dwTime = 0;
     UINT16	wTrack;
@@ -279,9 +279,9 @@ static DWORD ANIM_CalcTime(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwFrame,
 
 
 /**************************************************************************
- * 				ANIM_CalcFrame			[internal]
+ * 				MCIANIM_CalcFrame			[internal]
  */
-static DWORD ANIM_CalcFrame(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwTime)
+static DWORD MCIANIM_CalcFrame(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwTime)
 {
     DWORD	dwFrame = 0;
     UINT16	wTrack;
@@ -321,11 +321,11 @@ static DWORD ANIM_CalcFrame(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwTime)
 }
 
 /**************************************************************************
- * 				ANIM_mciInfo			[internal]
+ * 				MCIANIM_mciInfo			[internal]
  */
-static DWORD ANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms)
+static DWORD MCIANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     LPSTR		str = 0;
     DWORD		ret = 0;
     
@@ -368,11 +368,11 @@ static DWORD ANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpPar
 }
 
 /**************************************************************************
- * 				ANIM_mciStatus		[internal]
+ * 				MCIANIM_mciStatus		[internal]
  */
-static DWORD ANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
+static DWORD MCIANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     DWORD		ret;
 
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
@@ -401,7 +401,7 @@ static DWORD ANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpP
 	    }
 	    else
 		lpParms->dwReturn = wma->dwTotalLen;
-	    lpParms->dwReturn = ANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret);
+	    lpParms->dwReturn = MCIANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret);
 	    TRACE("LENGTH=%lu !\n", lpParms->dwReturn);
 	    break;
 	case MCI_STATUS_MODE:
@@ -430,7 +430,7 @@ static DWORD ANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpP
 		lpParms->dwReturn = wma->lpdwTrackPos[lpParms->dwTrack - 1];
 		TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack);
 	    }
-	    lpParms->dwReturn = ANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret);
+	    lpParms->dwReturn = MCIANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret);
 	    TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn);
 	    break;
 	case MCI_STATUS_READY:
@@ -457,11 +457,11 @@ static DWORD ANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpP
 
 
 /**************************************************************************
- * 				ANIM_mciPlay			[internal]
+ * 				MCIANIM_mciPlay			[internal]
  */
-static DWORD ANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
+static DWORD MCIANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     int 	start, end;
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
@@ -472,11 +472,11 @@ static DWORD ANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
     start = 0; 		end = wma->dwTotalLen;
     wma->nCurTrack = 1;
     if (dwFlags & MCI_FROM) {
-	start = ANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwFrom); 
+	start = MCIANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwFrom); 
         TRACE("MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start);
     }
     if (dwFlags & MCI_TO) {
-	end = ANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwTo);
+	end = MCIANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwTo);
 	TRACE("MCI_TO=%08lX -> %u \n", lpParms->dwTo, end);
     }
     wma->mode = MCI_MODE_PLAY;
@@ -490,11 +490,11 @@ static DWORD ANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 }
 
 /**************************************************************************
- * 				ANIM_mciStop			[internal]
+ * 				MCIANIM_mciStop			[internal]
  */
-static DWORD ANIM_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD MCIANIM_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
     
@@ -512,11 +512,11 @@ static DWORD ANIM_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa
 }
 
 /**************************************************************************
- * 				ANIM_mciPause		[internal]
+ * 				MCIANIM_mciPause		[internal]
  */
-static DWORD ANIM_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD MCIANIM_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
     if (lpParms == NULL) return MCIERR_INTERNAL;
@@ -531,11 +531,11 @@ static DWORD ANIM_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP
 }
 
 /**************************************************************************
- * 				ANIM_mciResume		[internal]
+ * 				MCIANIM_mciResume		[internal]
  */
-static DWORD ANIM_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD MCIANIM_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
     if (lpParms == NULL) return MCIERR_INTERNAL;
@@ -550,11 +550,11 @@ static DWORD ANIM_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp
 }
 
 /**************************************************************************
- * 				ANIM_mciSeek			[internal]
+ * 				MCIANIM_mciSeek			[internal]
  */
-static DWORD ANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
+static DWORD MCIANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     DWORD	dwRet;
     MCI_PLAY_PARMS PlayParms;
     
@@ -573,9 +573,9 @@ static DWORD ANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms
 	PlayParms.dwFrom = lpParms->dwTo;
 	break;
     }
-    dwRet = ANIM_mciPlay(wDevID, MCI_WAIT | MCI_FROM, &PlayParms);
+    dwRet = MCIANIM_mciPlay(wDevID, MCI_WAIT | MCI_FROM, &PlayParms);
     if (dwRet != 0) return dwRet;
-    dwRet = ANIM_mciStop(wDevID, MCI_WAIT, (LPMCI_GENERIC_PARMS)&PlayParms);
+    dwRet = MCIANIM_mciStop(wDevID, MCI_WAIT, (LPMCI_GENERIC_PARMS)&PlayParms);
     if (dwFlags & MCI_NOTIFY) {
 	TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
 
@@ -587,11 +587,11 @@ static DWORD ANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms
 
 
 /**************************************************************************
- * 				ANIM_mciSet			[internal]
+ * 				MCIANIM_mciSet			[internal]
  */
-static DWORD ANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
+static DWORD MCIANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 {
-    WINE_MCIANIM*	wma = ANIM_mciGetOpenDrv(wDevID);
+    WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
     
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
 
@@ -630,16 +630,16 @@ static DWORD ANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 }
 
 /**************************************************************************
- * 				ANIM_DriverProc			[sample driver]
+ * 				MCIANIM_DriverProc	[sample driver]
  */
-LONG 	CALLBACK	MCIANIM_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
-					   DWORD dwParam1, DWORD dwParam2)
+LONG WINAPI MCIANIM_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
+			       DWORD dwParam1, DWORD dwParam2)
 {
     switch (wMsg) {
     case DRV_LOAD:		return 1;
     case DRV_FREE:		return 1; 
-    case DRV_OPEN:		return ANIM_drvOpen((LPSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSA)dwParam2);
-    case DRV_CLOSE:		return ANIM_drvClose(dwDevID);
+    case DRV_OPEN:		return MCIANIM_drvOpen((LPSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSA)dwParam2);
+    case DRV_CLOSE:		return MCIANIM_drvClose(dwDevID);
     case DRV_ENABLE:		return 1;
     case DRV_DISABLE:		return 1;
     case DRV_QUERYCONFIGURE:	return 1;
@@ -647,17 +647,17 @@ LONG 	CALLBACK	MCIANIM_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
     case DRV_INSTALL:		return DRVCNF_RESTART;
     case DRV_REMOVE:		return DRVCNF_RESTART;
 	
-    case MCI_OPEN_DRIVER:	return ANIM_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)dwParam2); 
-    case MCI_CLOSE_DRIVER:	return ANIM_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
-    case MCI_GETDEVCAPS:	return ANIM_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
-    case MCI_INFO:		return ANIM_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2);
-    case MCI_STATUS:		return ANIM_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2);
-    case MCI_SET:		return ANIM_mciSet(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2);
-    case MCI_PLAY:		return ANIM_mciPlay(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2);
-    case MCI_STOP:		return ANIM_mciStop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
-    case MCI_PAUSE:		return ANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
-    case MCI_RESUME:		return ANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
-    case MCI_SEEK:		return ANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2);
+    case MCI_OPEN_DRIVER:	return MCIANIM_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMSA)dwParam2); 
+    case MCI_CLOSE_DRIVER:	return MCIANIM_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
+    case MCI_GETDEVCAPS:	return MCIANIM_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
+    case MCI_INFO:		return MCIANIM_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2);
+    case MCI_STATUS:		return MCIANIM_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2);
+    case MCI_SET:		return MCIANIM_mciSet(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2);
+    case MCI_PLAY:		return MCIANIM_mciPlay(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2);
+    case MCI_STOP:		return MCIANIM_mciStop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
+    case MCI_PAUSE:		return MCIANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
+    case MCI_RESUME:		return MCIANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
+    case MCI_SEEK:		return MCIANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2);
     case MCI_LOAD:		
     case MCI_SAVE:		
     case MCI_FREEZE:		

graphics/ttydrv/palette.c

@@ -9,6 +9,7 @@
 #include "color.h"
 #include "debugtools.h"
 #include "palette.h"
+#include "winbase.h"
 #include "ttydrv.h"
 
 DEFAULT_DEBUG_CHANNEL(ttydrv)

include/wine/winbase16.h

@@ -36,11 +36,7 @@ typedef struct _SEGINFO {
 
 #include "poppack.h"
 
-HMODULE16   WINAPI GetModuleHandle16(LPCSTR);
-HLOCAL16    WINAPI LocalAlloc16(UINT16,WORD);
-LPVOID      WINAPI LockResource16(HGLOBAL16);
-
-#ifdef __WINE__
+/* undocumented functions */
 WORD        WINAPI AllocCStoDSAlias16(WORD);
 WORD        WINAPI AllocDStoCSAlias16(WORD);
 HGLOBAL16   WINAPI AllocResource16(HINSTANCE16,HRSRC16,DWORD);
@@ -104,7 +100,7 @@ VOID        WINAPI SwitchStackTo16(WORD,WORD,WORD);
 BOOL16      WINAPI WaitEvent16(HTASK16);
 VOID        WINAPI WriteOutProfiles16(void);
 VOID        WINAPI hmemcpy16(LPVOID,LPCVOID,LONG);
-#endif  /* __WINE__ */
+
 
 INT16       WINAPI AccessResource16(HINSTANCE16,HRSRC16);
 ATOM        WINAPI AddAtom16(LPCSTR);
@@ -127,6 +123,7 @@ UINT16      WINAPI GetDriveType16(UINT16); /* yes, the arguments differ */
 DWORD       WINAPI GetFileAttributes16(LPCSTR);
 DWORD       WINAPI GetFreeSpace16(UINT16);
 INT16       WINAPI GetModuleFileName16(HINSTANCE16,LPSTR,INT16);
+HMODULE16   WINAPI GetModuleHandle16(LPCSTR);
 UINT16      WINAPI GetPrivateProfileInt16(LPCSTR,LPCSTR,INT16,LPCSTR);
 INT16       WINAPI GetPrivateProfileSection16(LPCSTR,LPSTR,UINT16,LPCSTR);
 WORD        WINAPI GetPrivateProfileSectionNames16(LPSTR,UINT16,LPCSTR);
@@ -154,6 +151,7 @@ BOOL16      WINAPI IsBadStringPtr16(SEGPTR,UINT16);
 BOOL16      WINAPI IsBadWritePtr16(SEGPTR,UINT16);
 BOOL16      WINAPI IsDBCSLeadByte16(BYTE);
 HGLOBAL16   WINAPI LoadResource16(HINSTANCE16,HRSRC16);
+HLOCAL16    WINAPI LocalAlloc16(UINT16,WORD);
 UINT16      WINAPI LocalCompact16(UINT16);
 UINT16      WINAPI LocalFlags16(HLOCAL16);
 HLOCAL16    WINAPI LocalFree16(HLOCAL16);
@@ -163,6 +161,7 @@ HLOCAL16    WINAPI LocalReAlloc16(HLOCAL16,WORD,UINT16);
 UINT16      WINAPI LocalShrink16(HGLOBAL16,UINT16);
 UINT16      WINAPI LocalSize16(HLOCAL16);
 BOOL16      WINAPI LocalUnlock16(HLOCAL16);
+LPVOID      WINAPI LockResource16(HGLOBAL16);
 HGLOBAL16   WINAPI LockSegment16(HGLOBAL16);
 FARPROC16   WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
 VOID        WINAPI OutputDebugString16(LPCSTR);

relay32/utthunk.c

@@ -52,6 +52,8 @@ typedef struct _UTINFO
 
 } UTINFO;
 
+typedef DWORD (CALLBACK *UTGLUEPROC)( LPVOID lpBuff, DWORD dwUserDefined );
+
 BOOL WINAPI UTRegister( HMODULE hModule, LPSTR lpsz16BITDLL, 
                         LPSTR lpszInitName, LPSTR lpszProcName,
                         FARPROC *ppfn32Thunk, FARPROC pfnUT32CallBack, 
@@ -63,8 +65,8 @@ VOID WINAPI UTUnRegister( HMODULE hModule );
 /****************************************************************************
  *		UTGlue16     (WPROCS.*)
  */
-DWORD WINAPI UTGlue16( LPVOID lpBuff, DWORD dwUserDefined, SEGPTR translationList[], 
-                       DWORD (CALLBACK *target)( LPVOID lpBuff, DWORD dwUserDefined ) )
+DWORD WINAPI UTGlue16( LPVOID lpBuff, DWORD dwUserDefined, SEGPTR *translationList,
+		       UTGLUEPROC target )
 {
     INT i;