Changeset 329 for trunk/src

Timestamp:

Jul 18, 1999, 4:56:37 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src/user32/new

Files:

• oslibwin.cpp (modified) (3 diffs)
• oslibwin.h (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• user32.cpp (modified) (3 diffs)
• win32wnd.cpp (modified) (6 diffs)
• win32wnd.h (modified) (2 diffs)

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.12 1999-07-18 14:39:35 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.13 1999-07-18 14:56:36 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -256 +256 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinQueryUpdateRect(HWND hwnd, PRECT pRect)
+BOOL OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect)
 {
  BOOL rc;
@@ -263 +263 @@
   rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
   if(rc) {
-        MapOS2ToWin32Rectl(hwnd, &rectl, pRect);
+    MapOS2ToWin32Rectl(hwnd, &rectl, (PRECT)pRect);
   }
   return rc;

trunk/src/user32/new/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.11 1999-07-18 14:39:35 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.12 1999-07-18 14:56:36 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -184 +184 @@
 
 BOOL  OSLibWinDestroyWindow(HWND hwnd);
-BOOL  OSLibWinQueryUpdateRect(HWND hwnd, PRECT pRect);
+BOOL  OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect);
 BOOL  OSLibWinIsIconic(HWND hwnd);
 BOOL  OSLibWinSetActiveWindow(HWND hwnd);

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.9 1999-07-18 14:39:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.10 1999-07-18 14:56:36 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -84 +84 @@
  POSTMSG_PACKET *postmsg;
  Win32Window  *win32wnd;
- ULONG         magic;
  APIRET        rc;
 
@@ -90 +89 @@
   SetWin32TIB();
 
-  win32wnd = (Win32Window *)WinQueryWindowULong(hwnd, OFFSET_WIN32WNDPTR);
-  magic    = WinQueryWindowULong(hwnd, OFFSET_WIN32PM_MAGIC);
-
-  if(msg != WM_CREATE && win32wnd == NULL && magic != WIN32PM_MAGIC) {
+  win32wnd = Win32Window::GetWindowFromOS2Handle(hwnd);
+
+  if(msg != WM_CREATE && win32wnd == NULL) {
         dprintf(("Invalid win32wnd pointer for window %x!!", hwnd));
         goto RunDefWndProc;

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.6 1999-07-18 13:57:47 cbratschi Exp $ */
+/* $Id: user32.cpp,v 1.7 1999-07-18 14:56:36 sandervl Exp $ */
 
 /*
@@ -383 +383 @@
 BOOL WIN32API GetUpdateRect( HWND hWnd, PRECT lpRect, BOOL  bErase)
 {
-    OSRECTL rect;
     ULONG windowH;
     BOOL rc;
@@ -391 +390 @@
 #endif
     if (!lpRect) return FALSE;
+
     hWnd = Win32ToOS2Handle(hWnd);
-    rc = OSLibWinQueryUpdateRect(hWnd,&rect);
-    windowH = OSLibGetWindowHeight(hWnd);
-    OS2ToWin32Rect(lpRect,&rect,windowH);
-    return rc;
+    return OSLibWinQueryUpdateRect(hWnd, (PVOID)&lpRect);
 }
 //******************************************************************************

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.11 1999-07-18 14:39:35 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.12 1999-07-18 14:56:37 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -666 +666 @@
 //******************************************************************************
 ULONG Win32Window::MsgMove(ULONG xParent, ULONG yParent)
-{       
+{
   return SendInternalMessageA(WM_MOVE, 0, MAKELONG((USHORT)xParent, (USHORT)yParent));
 }
@@ -770 +770 @@
 
   if(keystate & WMMOVE_LBUTTON)
-        winstate |= MK_LBUTTON;
+    winstate |= MK_LBUTTON;
   if(keystate & WMMOVE_RBUTTON)
-        winstate |= MK_RBUTTON;
+    winstate |= MK_RBUTTON;
   if(keystate & WMMOVE_MBUTTON)
-        winstate |= MK_MBUTTON;
+    winstate |= MK_MBUTTON;
   if(keystate & WMMOVE_SHIFT)
-        winstate |= MK_SHIFT;
+    winstate |= MK_SHIFT;
   if(keystate & WMMOVE_CTRL)
-        winstate |= MK_CONTROL;
-        
+    winstate |= MK_CONTROL;
+
    return SendInternalMessageA(WM_MOUSEMOVE, keystate, MAKELONG(x, y));
 }
@@ -792 +792 @@
 ULONG Win32Window::MsgEraseBackGround(ULONG hps)
 {
-        if(isIcon) {
-                        return SendInternalMessageA(WM_ICONERASEBKGND, hps, 0);
-        }
-        else    return SendInternalMessageA(WM_ERASEBKGND, hps, 0);
+    if(isIcon) {
+            return SendInternalMessageA(WM_ICONERASEBKGND, hps, 0);
+    }
+    else    return SendInternalMessageA(WM_ERASEBKGND, hps, 0);
 }
 //******************************************************************************
@@ -802 +802 @@
 {
   if(isUnicode) {
-        return SendInternalMessageW(WM_SETTEXT, 0, (LPARAM)lpsz);
+        return SendInternalMessageW(WM_SETTEXT, 0, (LPARAM)lpsz);
   }
   else  return SendInternalMessageA(WM_SETTEXT, 0, (LPARAM)lpsz);
@@ -1469 +1469 @@
 //******************************************************************************
 //******************************************************************************
+Win32Window *Win32Window::GetWindowFromOS2Handle(HWND hwnd)
+{
+ Win32Window *win32wnd;
+ DWORD        magic;
+
+  win32wnd = (Win32Window *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);
+  magic    = OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_MAGIC);
+
+  if(win32wnd && CheckMagicDword(magic)) {
+    return win32wnd;
+  }
+  return 0;
+}
+//******************************************************************************
+//******************************************************************************
 GenericObject *Win32Window::windows  = NULL;

trunk/src/user32/new/win32wnd.h

@@ -1 @@
-/* $Id: win32wnd.h,v 1.10 1999-07-18 14:39:35 sandervl Exp $ */
+/* $Id: win32wnd.h,v 1.11 1999-07-18 14:56:37 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -125 +125 @@
 
 static Win32Window *GetWindowFromHandle(HWND hwnd);
+static Win32Window *GetWindowFromOS2Handle(HWND hwnd);
 
 protected: