Changeset 5060

Timestamp:

Feb 3, 2001, 7:52:03 PM (24 years ago)

Author:

sandervl

Message:

Get/SetWindowLongA fixes (last error) + focus hack for realplayer 8

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (9 diffs)
• window.cpp (modified) (4 diffs)
• windowword.cpp (modified) (8 diffs)

trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.85 2000-12-17 15:04:10 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.86 2001-02-03 18:52:02 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -69 +69 @@
         Owner = HWND_DESKTOP;
   }
-  BOOL TopLevel = hwndParent == HWND_DESKTOP;
 
   if(classStyle & CS_SAVEBITS_W) dwWinStyle |= WS_SAVEBITS;
@@ -88 +87 @@
 
   return WinCreateWindow (hwndParent,
-                          hwndParent == HWND_DESKTOP ? WIN32_STDFRAMECLASS : WIN32_STDCLASS,
+                          (hwndParent == HWND_DESKTOP) ? WIN32_STDFRAMECLASS : WIN32_STDCLASS,
                           pszName, dwWinStyle, 0, 0, 0, 0,
                           Owner, (fHWND_BOTTOM) ? HWND_BOTTOM : HWND_TOP,

trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.231 2001-02-02 19:04:03 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.232 2001-02-03 18:52:02 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -889 +889 @@
     if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE && !fActivate)
     {
-    dprintf(("WARNING: WM_NCACTIVATE return code = FALSE -> cancel processing"));
+        dprintf(("WARNING: WM_NCACTIVATE return code = FALSE -> cancel processing"));
         return 0;
     }
@@ -904 +904 @@
             threadidhwnd = O32_GetWindowThreadProcessId(hwndOS2Win, &procidhwnd);
     }
+//Warning: temporary hack to force focus to newly created window
+//RealPlayer 8 does not pass WM_ACTIVATE to defwindowproc and doesn't call
+//setfocus -> keyboard focus not set
+//TODO: Find real cause!!
+    if(GetFocus() == 0 && fActivate) {
+        if(!(getStyle() & WS_MINIMIZE))
+            SetFocus(getWindowHandle());
+    }
+//Warning: temporary hack to force focus to newly created window
 
     if(fActivate) {
@@ -1424 +1433 @@
 
     case WM_ACTIVATE:
-    /* The default action in Windows is to set the keyboard focus to
-     * the window, if it's being activated and not minimized */
+        /* The default action in Windows is to set the keyboard focus to
+         * the window, if it's being activated and not minimized */
         if (LOWORD(wParam) != WA_INACTIVE) {
-        if(!(getStyle() & WS_MINIMIZE))
-            SetFocus(getWindowHandle());
+            if(!(getStyle() & WS_MINIMIZE))
+                SetFocus(getWindowHandle());
         }
         return 0;
@@ -2562 +2571 @@
 }
 //******************************************************************************
+//Note: does not set last error if no parent (verified in NT4, SP6)
 //******************************************************************************
 HWND Win32BaseWindow::GetParent()
@@ -3306 +3316 @@
                 }
                 dprintf(("WARNING: SetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
-                SetLastError(ERROR_INVALID_PARAMETER);
+                SetLastError(ERROR_INVALID_INDEX);      //verified in NT4, SP6
                 return 0;
     }
+    //Note: NT4, SP6 does not set the last error to 0
     SetLastError(ERROR_SUCCESS);
     dprintf2(("SetWindowLong%c %x %d %x returned %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value, oldval));
@@ -3347 +3358 @@
             break;
         }
-        SetLastError(ERROR_INVALID_PARAMETER);
+        SetLastError(ERROR_INVALID_INDEX);      //verified in NT4, SP6
         return 0;
     }
     dprintf2(("GetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    //Note: NT4, SP6 does not set the last error to 0
+    SetLastError(ERROR_SUCCESS);
     return value;
 }
@@ -3363 +3376 @@
         oldval = ((WORD *)userWindowLong)[index/2];
         ((WORD *)userWindowLong)[index/2] = value;
+        //Note: NT4, SP6 does not set the last error to 0
+        SetLastError(ERROR_SUCCESS);
         return oldval;
     }
-    SetLastError(ERROR_INVALID_PARAMETER);
+    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;
 }
@@ -3374 +3389 @@
     if(index >= 0 && index/4 < nrUserWindowLong)
     {
+        //Note: NT4, SP6 does not set the last error to 0
+        SetLastError(ERROR_SUCCESS);
         return ((WORD *)userWindowLong)[index/2];
     }
-    SetLastError(ERROR_INVALID_PARAMETER);
+    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;
 }

trunk/src/user32/window.cpp ¶

@@ -1 @@
-/* $Id: window.cpp,v 1.86 2000-12-29 18:40:00 sandervl Exp $ */
+/* $Id: window.cpp,v 1.87 2001-02-03 18:52:02 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -321 +321 @@
 }
 //******************************************************************************
+//Note: does not set last error if no parent (verified in NT4, SP6)
 //******************************************************************************
 HWND WIN32API GetParent( HWND hwnd)
@@ -332 +333 @@
         return 0;
     }
-//    dprintf(("GetParent %x", hwnd));
+    dprintf2(("GetParent %x", hwnd));
     return window->GetParent();
 }
@@ -348 +349 @@
     }
     if(hwndNewParent == HWND_DESKTOP) {
-    hwndNewParent = GetDesktopWindow();
+        hwndNewParent = GetDesktopWindow();
     }
     else {

trunk/src/user32/windowword.cpp ¶

@@ -1 @@
-/* $Id: windowword.cpp,v 1.9 2001-01-14 17:15:47 sandervl Exp $ */
+/* $Id: windowword.cpp,v 1.10 2001-02-03 18:52:03 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <win32wbase.h>
 
-#define DBG_LOCALLOG    DBG_windowword
+#define DBG_LOCALLOG    DBG_windowword
 #include "dbglocal.h"
 
@@ -27 +27 @@
     if(window)
     {
-      return window->SetWindowLongA(nIndex,lNewLong);
+        return window->SetWindowLongA(nIndex,lNewLong);
     }
     else {
-         dprintf(("SetWindowLongA %d %x; window %x not found!", nIndex, lNewLong, hwnd));
+        dprintf(("SetWindowLongA %d %x; window %x not found!", nIndex, lNewLong, hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************
@@ -43 +44 @@
     if(window)
     {
-      return window->SetWindowLongA(nIndex,lNewLong, TRUE);
+        return window->SetWindowLongA(nIndex,lNewLong, TRUE);
     }
     else {
-         dprintf(("SetWindowLongW; window %x not found!", hwnd));
+        dprintf(("SetWindowLongW; window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************
@@ -64 +66 @@
     {
         dprintf(("GetWindowWord; window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************
@@ -81 +84 @@
     {
         dprintf(("SetWindowWord; window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************
@@ -98 +102 @@
     {
         dprintf(("GetWindowLongA; window %x (%d) not found!", hwnd, nIndex));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************
@@ -115 +120 @@
     {
         dprintf(("GetWindowLongW; window %x not found!", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE); //verified in NT4, SP6
+        return 0;
     }
-    return 0;
 }
 //******************************************************************************