From e717b1bf6f689cdd9833e67659a00df51b9a32f6 Mon Sep 17 00:00:00 2001
From: Gerard Patel <gerard.patel@nerim.net>
Date: Mon, 19 Nov 2001 02:07:11 +0000
Subject: [PATCH] Fix exchanged lines in WIN_GetWindowLong.

---
 windows/win.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/windows/win.c b/windows/win.c
index b7d5a9a17c2..b2bdb11b403 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1608,7 +1608,7 @@ HWND WINAPI FindWindowW( LPCWSTR className, LPCWSTR title )
 HWND WINAPI GetDesktopWindow(void)
 {
     if (pWndDesktop) return pWndDesktop->hwndSelf;
-    ERR( "You need the -desktop option when running with native USER\n" );
+    ERR( "Wine init error: either you're trying to use an invalid native USER.EXE config, or some graphics/GUI libraries or DLLs didn't initialize properly. Aborting.\n" );
     ExitProcess(1);
     return 0;
 }
@@ -1851,11 +1851,10 @@ static LONG WIN_GetWindowLong( HWND hwnd, INT offset, WINDOWPROCTYPE type )
             SetLastError( ERROR_INVALID_INDEX );
             return 0;
         }
+        retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
         /* Special case for dialog window procedure */
         if ((offset == DWL_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG))
             retvalue = (LONG)WINPROC_GetProc( (HWINDOWPROC)retvalue, type );
-        else
-            retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset);
         WIN_ReleasePtr( wndPtr );
         return retvalue;
     }
@@ -2133,7 +2132,7 @@ LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval )
  * The user data is reserved for use by the application which created
  * the window.
  *
- * Do not use GWL_STYLE to change the window's WS_DISABLE style;
+ * Do not use GWL_STYLE to change the window's WS_DISABLED style;
  * instead, call the EnableWindow() function to change the window's
  * disabled state.
  *
-- 
GitLab