Changeset 1704 for trunk/src/user32/win32wbase.cpp

Timestamp:

Nov 11, 1999, 2:17:33 PM (26 years ago)

Author:

sandervl

Message:

dlg fix, keyboard additions, + misc other things

File:

• trunk/src/user32/win32wbase.cpp (modified) (8 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.80 1999-11-10 20:02:48 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.81 1999-11-11 13:17:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -173 +173 @@
   windowId         = 0xFFFFFFFF;        //default = -1
   userData         = 0;
+  contextHelpId    = 0;
 
   pOldFrameProc = NULL;
@@ -1151 +1152 @@
 
     if(ISMOUSE_CAPTURED()) {
-        POINT point = {x,y};
+        POINT point = {x,y};
 
         MapWindowPoints(getWindowHandle(), HWND_DESKTOP, &point, 1);
-        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, point.x, point.y, keystate))
-                return 0;
+        if(DInputMouseHandler(getWindowHandle(), MOUSEMSG_MOVE, point.x, point.y, keystate))
+            return 0;
     }
 
@@ -2692 +2693 @@
  LONG oldval;
 
-   switch(index) {
+    dprintf2(("SetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    switch(index) {
         case GWL_EXSTYLE:
         {
@@ -2752 +2754 @@
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
-   }
+    }
 }
 //******************************************************************************
@@ -2758 +2760 @@
 ULONG Win32BaseWindow::GetWindowLongA(int index)
 {
-   switch(index) {
+    dprintf2(("GetWindowLongA %x %d", getWindowHandle(), index));
+    switch(index) {
         case GWL_EXSTYLE:
                 return dwExStyle;
@@ -2783 +2786 @@
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
-   }
+    }
 }
 //******************************************************************************
@@ -2838 +2841 @@
  Win32BaseWindow *win32wnd;
  DWORD        magic;
+
+  if(hwnd == OSLIB_HWND_DESKTOP)
+  {
+    return windowDesktop;
+  }
 
   win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);