commit 2997fc51a4411a48cb1ba57c8fe87b714580314a
author Alexandre Julliard <julliard@winehq.org> Mon Jul 18 13:20:18 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 18 13:20:18 2005 +0000
tree 092b874facab1572e91409b417397ed8f968a814
parent 8c02f6367e0cbf0b956e16a1e7f2c3854ce4656e

Fixed a few prototypes in the USER driver.

dlls/user/sysparams.c

diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c
index 1da490d..ae59d3c 100644
--- a/dlls/user/sysparams.c
+++ b/dlls/user/sysparams.c
@@ -2634,8 +2634,8 @@
                                       DWORD flags, LPVOID lparam )
 {
     /* Pass the request on to the driver */
-    if (!USER_Driver.pChangeDisplaySettingsExW) return DISP_CHANGE_FAILED;
-    return USER_Driver.pChangeDisplaySettingsExW( devname, devmode, hwnd, flags, lparam );
+    if (!USER_Driver.pChangeDisplaySettingsEx) return DISP_CHANGE_FAILED;
+    return USER_Driver.pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam );
 }
 
 
@@ -2696,6 +2696,6 @@
                                    LPDEVMODEW lpDevMode, DWORD dwFlags)
 {
     /* Pass the request on to the driver */
-    if (!USER_Driver.pEnumDisplaySettingsExW) return FALSE;
-    return USER_Driver.pEnumDisplaySettingsExW(lpszDeviceName, iModeNum, lpDevMode, dwFlags);
+    if (!USER_Driver.pEnumDisplaySettingsEx) return FALSE;
+    return USER_Driver.pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags);
 }

dlls/user/user_main.c

diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index 523d040..58465da 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -122,8 +122,8 @@
     GET_USER_FUNC(GetClipboardFormatName);
     GET_USER_FUNC(EndClipboardUpdate);
     GET_USER_FUNC(ResetSelectionOwner);
-    GET_USER_FUNC(ChangeDisplaySettingsExW);
-    GET_USER_FUNC(EnumDisplaySettingsExW);
+    GET_USER_FUNC(ChangeDisplaySettingsEx);
+    GET_USER_FUNC(EnumDisplaySettingsEx);
     GET_USER_FUNC(CreateDesktopWindow);
     GET_USER_FUNC(CreateWindow);
     GET_USER_FUNC(DestroyWindow);

dlls/user/user_private.h

diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h
index c294cac..ae84d69 100644
--- a/dlls/user/user_private.h
+++ b/dlls/user/user_private.h
@@ -125,24 +125,24 @@
     void   (*pAcquireClipboard)(HWND);                     /* Acquire selection */
     BOOL   (*pCountClipboardFormats)(void);                /* Count available clipboard formats */
     void   (*pEmptyClipboard)(BOOL);                       /* Empty clipboard data */
-    BOOL   (*pEndClipboardUpdate)(void);                   /* End clipboard update */
-    BOOL   (*pEnumClipboardFormats)(UINT);                 /* Enumerate clipboard formats */
+    void   (*pEndClipboardUpdate)(void);                   /* End clipboard update */
+    UINT   (*pEnumClipboardFormats)(UINT);                 /* Enumerate clipboard formats */
     BOOL   (*pGetClipboardData)(UINT, HANDLE16*, HANDLE*); /* Get specified selection data */
-    BOOL   (*pGetClipboardFormatName)(UINT, LPWSTR, UINT); /* Get a clipboard format name */
+    INT    (*pGetClipboardFormatName)(UINT, LPWSTR, UINT); /* Get a clipboard format name */
     BOOL   (*pIsClipboardFormatAvailable)(UINT);           /* Check if specified format is available */
-    INT    (*pRegisterClipboardFormat)(LPCWSTR);           /* Register a clipboard format */
+    UINT   (*pRegisterClipboardFormat)(LPCWSTR);           /* Register a clipboard format */
     void   (*pResetSelectionOwner)(HWND, BOOL);
     BOOL   (*pSetClipboardData)(UINT, HANDLE16, HANDLE, BOOL);   /* Set specified selection data */
     /* display modes */
-    LONG   (*pChangeDisplaySettingsExW)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-    BOOL   (*pEnumDisplaySettingsExW)(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
+    LONG   (*pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
+    BOOL   (*pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
     /* windowing functions */
     BOOL   (*pCreateDesktopWindow)(HWND);
     BOOL   (*pCreateWindow)(HWND,CREATESTRUCTA*,BOOL);
-    BOOL   (*pDestroyWindow)(HWND);
+    void   (*pDestroyWindow)(HWND);
     HDC    (*pGetDCEx)(HWND,HRGN,DWORD);
     DWORD  (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
-    BOOL   (*pReleaseDC)(HWND,HDC,BOOL);
+    INT    (*pReleaseDC)(HWND,HDC,BOOL);
     BOOL   (*pScrollDC)(HDC, INT, INT, const RECT *, const RECT *, HRGN, LPRECT);
     void   (*pSetFocus)(HWND);
     HWND   (*pSetParent)(HWND,HWND);
@@ -150,7 +150,7 @@
     int    (*pSetWindowRgn)(HWND,HRGN,BOOL);
     void   (*pSetWindowIcon)(HWND,UINT,HICON);
     void   (*pSetWindowStyle)(HWND,DWORD);
-    BOOL   (*pSetWindowText)(HWND,LPCWSTR);
+    void   (*pSetWindowText)(HWND,LPCWSTR);
     BOOL   (*pShowWindow)(HWND,INT);
     void   (*pSysCommandSizeMove)(HWND,WPARAM);
     HWND   (*pWindowFromDC)(HDC);