Alexandre Julliard : kernel32: Use explicit prototypes for function pointers.

Alexandre Julliard julliard at winehq.org
Wed Sep 9 09:56:48 CDT 2009


Module: wine
Branch: master
Commit: 858f08789e90e794ffff52f53f45180edba70061
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=858f08789e90e794ffff52f53f45180edba70061

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep  9 13:12:28 2009 +0200

kernel32: Use explicit prototypes for function pointers.

---

 dlls/kernel32/comm.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c
index 0fbd7e3..f4edfd3 100644
--- a/dlls/kernel32/comm.c
+++ b/dlls/kernel32/comm.c
@@ -1237,7 +1237,7 @@ BOOL WINAPI CommConfigDialogW(
     HWND hWnd,                 /* [in] parent window for the dialog */
     LPCOMMCONFIG lpCommConfig) /* [out] pointer to struct to fill */
 {
-    FARPROC pCommConfigDialog;
+    DWORD (WINAPI *pCommConfigDialog)(LPCWSTR, HWND, LPCOMMCONFIG);
     HMODULE hConfigModule;
     DWORD   res = ERROR_INVALID_PARAMETER;
 
@@ -1245,7 +1245,7 @@ BOOL WINAPI CommConfigDialogW(
     hConfigModule = LoadLibraryW(lpszSerialUI);
 
     if (hConfigModule) {
-        pCommConfigDialog = GetProcAddress(hConfigModule, "drvCommConfigDialogW");
+        pCommConfigDialog = (void *)GetProcAddress(hConfigModule, "drvCommConfigDialogW");
         if (pCommConfigDialog) {
             res = pCommConfigDialog(lpszDevice, hWnd, lpCommConfig);
         }
@@ -1333,7 +1333,7 @@ BOOL WINAPI SetCommConfig(
  */
 BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize)
 {
-    FARPROC lpfnSetDefaultCommConfig;
+    BOOL (WINAPI *lpfnSetDefaultCommConfig)(LPCWSTR, LPCOMMCONFIG, DWORD);
     HMODULE hConfigModule;
     BOOL r = FALSE;
 
@@ -1343,7 +1343,7 @@ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig,
     if(!hConfigModule)
         return r;
 
-    lpfnSetDefaultCommConfig = GetProcAddress(hConfigModule, "drvSetDefaultCommConfigW");
+    lpfnSetDefaultCommConfig = (void *)GetProcAddress(hConfigModule, "drvSetDefaultCommConfigW");
     if (lpfnSetDefaultCommConfig)
         r = lpfnSetDefaultCommConfig(lpszDevice, lpCommConfig, dwSize);
 
@@ -1398,7 +1398,7 @@ BOOL WINAPI GetDefaultCommConfigW(
                               afterwards the number of bytes copied to the buffer or
                               the needed size of the buffer. */
 {
-    FARPROC pGetDefaultCommConfig;
+    DWORD (WINAPI *pGetDefaultCommConfig)(LPCWSTR, LPCOMMCONFIG, LPDWORD);
     HMODULE hConfigModule;
     DWORD   res = ERROR_INVALID_PARAMETER;
 
@@ -1406,7 +1406,7 @@ BOOL WINAPI GetDefaultCommConfigW(
     hConfigModule = LoadLibraryW(lpszSerialUI);
 
     if (hConfigModule) {
-        pGetDefaultCommConfig = GetProcAddress(hConfigModule, "drvGetDefaultCommConfigW");
+        pGetDefaultCommConfig = (void *)GetProcAddress(hConfigModule, "drvGetDefaultCommConfigW");
         if (pGetDefaultCommConfig) {
             res = pGetDefaultCommConfig(lpszName, lpCC, lpdwSize);
         }




More information about the wine-cvs mailing list