commit 9aded5135c98e2d940c64e556ec904744e913d4d
author Marcus Meissner <marcus@jet.franken.de> Sat May 01 10:23:45 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 01 10:23:45 1999 +0000
tree 42cfe4950bbde05e7d81d53f5d66cd1b29588551
parent f78e41a3dc4d7e8dcd4738715757fa48a1ff3c12

Removed the gotos from the WndProcs, always use a small wrapper that
locks the window, calls the real wndproc, unlocks the window.

controls/desktop.c

diff --git a/controls/desktop.c b/controls/desktop.c
index 3df5156..462625f 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -194,16 +194,15 @@
 
 
 /***********************************************************************
- *           DesktopWndProc
+ *           DesktopWndProc_locked
  *
  * Window procedure for the desktop window.
  */
-LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+static inline LRESULT WINAPI DesktopWndProc_locked( WND *wndPtr, UINT message,
                                WPARAM wParam, LPARAM lParam )
 {
-    LRESULT retvalue;
-    WND *wndPtr = WIN_FindWndPtr( hwnd );
     DESKTOP *desktopPtr = (DESKTOP *)wndPtr->wExtra;
+    HWND hwnd = wndPtr->hwndSelf;
 
       /* Most messages are ignored (we DON'T call DefWindowProc) */
 
@@ -216,33 +215,37 @@
 	desktopPtr->hbitmapWallPaper = 0;
 	SetDeskPattern();
 	SetDeskWallPaper( (LPSTR)-1 );
-        retvalue = 1;
-        goto END;
+        return  1;
 	
     case WM_ERASEBKGND:
 	if(!DESKTOP_IsSingleWindow())
-        {
-            retvalue = 1;
-            goto END;
-        }
-        retvalue = DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );
-        goto END;
+            return  1;
+        return  DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );
 
     case WM_SYSCOMMAND:
         if ((wParam & 0xfff0) != SC_CLOSE)
-        {
-            retvalue = 0;
-            goto END;
-        }
+            return  0;
 	ExitWindows16( 0, 0 ); 
 
     case WM_SETCURSOR:
-        retvalue = (LRESULT)SetCursor16( LoadCursor16( 0, IDC_ARROW16 ) );
-        goto END;
+        return  (LRESULT)SetCursor16( LoadCursor16( 0, IDC_ARROW16 ) );
     }
     
-    retvalue = 0;
-END:
+    return 0;
+}
+
+/***********************************************************************
+ *           DesktopWndProc
+ *
+ * This is just a wrapper for the DesktopWndProc which does windows
+ * locking and unlocking.
+ */
+LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message,
+                               WPARAM wParam, LPARAM lParam )
+{
+    WND *wndPtr = WIN_FindWndPtr( hwnd );
+    LRESULT retvalue = DesktopWndProc_locked(wndPtr,message,wParam,lParam);
+
     WIN_ReleaseWndPtr(wndPtr);
     return retvalue;
 }