Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu May  1 12:31:14 2014 +0200

user32: Don't bother returning a value from the SetWindowRgn driver entry point.

---

dlls/user32/driver.c       |    7 +++----
 dlls/user32/user_private.h |    2 +-
 dlls/winemac.drv/window.c  |    4 +---
 dlls/winex11.drv/window.c  |    3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 672f194..e0bc38c 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent )
 {
 }

-static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
+static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
 {
-    return 1;
 }

static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon )
@@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key,
     load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags );
 }

-static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
+static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
 {
-    return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw );
+    load_driver()->pSetWindowRgn( hwnd, hrgn, redraw );
 }

static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index f2345e8..2bb869a 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER {
     void   (CDECL *pSetFocus)(HWND);
     void   (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
     void   (CDECL *pSetParent)(HWND,HWND,HWND);
-    int    (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL);
+    void   (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL);
     void   (CDECL *pSetWindowIcon)(HWND,UINT,HICON);
     void   (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*);
     void   (CDECL *pSetWindowText)(HWND,LPCWSTR);
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 6ef227c..e61a517 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent)
  *
  * Assign specified region to window (for non-rectangular windows)
  */
-int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw)
+void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw)
 {
     struct macdrv_win_data *data;

@@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw)
         if (procid != GetCurrentProcessId())
             SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0);
     }
-
-    return TRUE;
 }

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index d98b9f6..77cf304 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2435,7 +2435,7 @@ done:
  *
  * Assign specified region to window (for non-rectangular windows)
  */
-int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
+void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
 {
     struct x11drv_win_data *data;

@@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
     {
         SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 );
     }
-    return TRUE;
 }