Changeset 3705 for trunk/src/user32

Timestamp:

Jun 14, 2000, 3:17:51 PM (25 years ago)

Author:

sandervl

Message:

region changes

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• dcrgn.cpp (modified) (4 diffs)
• oslibwin.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (8 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.33 2000-06-08 18:10:08 sandervl Exp $
+; $Id: USER32.DEF,v 1.34 2000-06-14 13:15:23 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -646 +646 @@
     _KEYBOARD_Enable@4                                           @2011
 
-    ;SvL: Belongs in GDI32, but put in dc.cpp to group similar apis
-    _GetClipBox@8                                                @2014
-    _GetClipRgn@8                                                @2015
-    _ExtSelectClipRgn@12                                         @2016
-    _ExcludeClipRect@20                                          @2017
-    _IntersectClipRect@20                                        @2018
-    _OffsetClipRgn@12                                            @2019
-    _SelectClipRgn@8                                             @2020
-
+    ;SvL: Used by GDI32
+    OSLibGetScreenHeight__Fv                                     @2013
+    OSLibGetScreenWidth__Fv                                      @2014

trunk/src/user32/dcrgn.cpp

@@ -1 @@
-/* $Id: dcrgn.cpp,v 1.1 2000-06-08 18:10:10 sandervl Exp $ */
+/* $Id: dcrgn.cpp,v 1.2 2000-06-14 13:15:24 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #include "oslibmsg.h"
 #include <dcdata.h>
+#include <objhandle.h>
+#include <wingdi32.h>
 
 #define INCLUDED_BY_DC
@@ -42 +44 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetClipBox( HDC hdc, PRECT lpRect)
-{
- pDCData  pHps = (pDCData)GpiQueryDCData((HPS)hdc);
- RECTL    rectl;
- LONG     lComplexity;
- int      rc;
-
-    if(!hdc || !lpRect || !pHps) {
-        dprintf(("GDI32: GetClipBox %x %x ERROR_INVALID_PARAMETER", hdc, lpRect));
-        SetLastError(ERROR_INVALID_PARAMETER_W);
-        return ERROR_W;
-    }
-    if(pHps->isPrinter)
-    {
-        lpRect->left   = 0;
-        lpRect->top    = 0;
-        lpRect->right  = GetDeviceCaps( hdc, HORZRES_W);
-        lpRect->bottom = GetDeviceCaps( hdc, VERTRES_W);
-
-        rc = SIMPLEREGION_W;
-    }
-    else {
-        lComplexity = GpiQueryClipBox(pHps->hps, &rectl);
-        if(lComplexity == RGN_ERROR) 
-        {
-                rc = ERROR_W;
-        }
-        else
-        if(lComplexity == RGN_NULL) 
-        {
-                memset(lpRect, 0, sizeof(*lpRect));
-                rc = NULLREGION_W;
-        }
-        else {
-                lpRect->left   = rectl.xLeft;
-                lpRect->right  = rectl.xRight;
-#if 0
-                lpRect->top    = pHps->height - rectl.yTop;
-                lpRect->bottom = pHps->height - rectl.yBottom;
-#else
-                //No conversion required as GpiQueryClipBox is affected by
-                //the y-inversion of the window
-                lpRect->top    = rectl.yBottom;
-                lpRect->bottom = rectl.yTop;
-#endif
-                //Convert including/including to including/excluding
-                if(lpRect->left != lpRect->right) {
-                        lpRect->right++;
-                }
-                if(lpRect->top != lpRect->bottom) {
-                        lpRect->bottom++;
-                }
-                rc = (lComplexity == RGN_RECT) ? SIMPLEREGION_W : COMPLEXREGION_W;
-        }
-    }
-    dprintf(("GDI32: GetClipBox of %X returned %d\n", hdc, rc));
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API GetClipRgn( HDC hdc, HRGN hRgn)
-{
- int rc;
-
-    rc = O32_GetClipRgn(hdc, hRgn);
-    dprintf(("GDI32: GetClipRgn %x %x returned %x", hdc, hRgn, rc));
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API ExcludeClipRect( HDC arg1, int arg2, int arg3, int arg4, int  arg5)
-{
-    dprintf(("GDI32: ExcludeClipRect"));
-    return O32_ExcludeClipRect(arg1, arg2, arg3, arg4, arg5);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API IntersectClipRect(HDC arg1, int arg2, int arg3, int arg4, int  arg5)
-{
- int rc;
-
-  rc = O32_IntersectClipRect(arg1, arg2, arg3, arg4, arg5);
-  dprintf(("GDI32: IntersectClipRect returned %d\n", rc));
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API ExtSelectClipRgn( HDC arg1, HRGN arg2, int  arg3)
-{
-    dprintf(("GDI32: ExtSelectClipRgn"));
-    return O32_ExtSelectClipRgn(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API OffsetClipRgn( HDC arg1, int arg2, int  arg3)
-{
-    dprintf(("GDI32: OffsetClipRgn"));
-    return O32_OffsetClipRgn(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API SelectClipRgn( HDC hdc, HRGN hRgn)
-{
-    dprintf(("GDI32: SelectClipRgn %x %x", hdc, hRgn));
-    return O32_SelectClipRgn(hdc, hRgn);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetUpdateRect (HWND hwnd, LPRECT pRect, BOOL erase)
+BOOL WIN32API GetUpdateRect(HWND hwnd, LPRECT pRect, BOOL erase)
 {
    if (!hwnd)
@@ -228 +122 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetUpdateRgn (HWND hwnd, HRGN hrgn, BOOL erase)
-{
-   LONG Complexity;
-
+int WIN32API GetUpdateRgn(HWND hwnd, HRGN hrgn, BOOL erase)
+{
+   LONG lComplexity;
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-   if (!wnd)
-   {
-      SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
-      return ERROR_W;
-   }
-
-   Complexity = O32_GetUpdateRgn (wnd->getOS2WindowHandle(), hrgn, FALSE);
-   if (erase && (Complexity > NULLREGION_W)) sendEraseBkgnd(wnd);
-
-   return Complexity;
-}
-//******************************************************************************
-//******************************************************************************
-INT WIN32API ExcludeUpdateRgn( HDC hDC, HWND  hWnd)
-{
-    dprintf(("USER32:  ExcludeUpdateRgn\n"));
-    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
-
-    return O32_ExcludeUpdateRgn(hDC,hWnd);
+   hrgn = ObjWinToOS2Region(hrgn);
+   if(!wnd || !hrgn)
+   {
+        dprintf(("WARNING: GetUpdateRgn %x %x %d; invalid handle", hwnd, hrgn, erase));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+        return ERROR_W;
+   }
+   lComplexity = WinQueryUpdateRegion(wnd->getOS2WindowHandle(), hrgn);
+   if(lComplexity == RGN_ERROR) {
+        dprintf(("WARNING: GetUpdateRgn %x %x %d; RGN_ERROR", hwnd, hrgn, erase));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+        return ERROR_W;
+   }
+
+   if(lComplexity != RGN_NULL)
+   {
+        if(!setWinDeviceRegionFromPMDeviceRegion(hrgn, hrgn, NULL, wnd->getOS2WindowHandle()))
+        {
+                dprintf(("WARNING: GetUpdateRgn %x %x %d; setWinDeviceRegionFromPMDeviceRegion failed!", hwnd, hrgn, erase));
+                SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+                return ERROR_W;
+        }
+
+        if(erase) sendEraseBkgnd(wnd);
+   }
+
+   return lComplexity;
+}
+//******************************************************************************
+//TODO: Check
+//******************************************************************************
+INT WIN32API ExcludeUpdateRgn(HDC hdc, HWND hwnd)
+{
+   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+   pDCData          pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+   LONG             lComplexity;
+
+   if(!wnd || !pHps)
+   {
+        dprintf(("WARNING: ExcludeUpdateRgn %x %x; invalid handle", hdc, hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+        return ERROR_W;
+   }
+   dprintf(("USER32: ExcludeUpdateRgn %x %x", hdc, hwnd));
+
+   lComplexity = WinExcludeUpdateRegion(pHps->hps, wnd->getOS2WindowHandle());
+   if(lComplexity == RGN_ERROR) {
+        SetLastError(ERROR_INVALID_HANDLE_W); //todo: correct error
+   }
+   else SetLastError(ERROR_SUCCESS_W); 
+   return lComplexity;      // windows and PM values are identical
 }
 /*****************************************************************************

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.79 2000-06-07 14:51:26 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.80 2000-06-14 13:15:24 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -812 +812 @@
 //******************************************************************************
 //******************************************************************************
+ULONG OSLibGetScreenHeight()
+{
+  return ScreenHeight;
+}
+//******************************************************************************
+//******************************************************************************
+ULONG OSLibGetScreenWidth()
+{
+  return ScreenWidth;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.93 2000-06-08 18:10:10 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.94 2000-06-14 13:15:24 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -200 +200 @@
     case WM_CREATE:
     {
+        RestoreOS2TIB();
+        PMFrameWindowProc(hwnd, msg, mp1, mp2);
+        SetWin32TIB();
 
         if(thdb->newWindow == 0)
@@ -213 +216 @@
             return (MRESULT)TRUE; //discontinue window creation
         }
-        RestoreOS2TIB();
-        PMFrameWindowProc(hwnd, msg, mp1, mp2);
-        SetWin32TIB();
     createfail:
         RestoreOS2TIB();
@@ -235 +235 @@
         win32wnd->MsgDestroy();
         WinSetVisibleRegionNotify(hwnd, FALSE);
-        goto RunDefWndProc;
+        goto RunDefFrameProc;
 
     case WM_ENABLE:
@@ -450 +450 @@
         dprintf(("OS2: WM_ACTIVATE %x %x %x", hwnd, mp1, mp2));
 
+        WinSetWindowUShort(hwnd,QWS_FLAGS, SHORT1FROMMP(mp1) ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
         if(win32wnd->IsWindowCreated()) 
         {
-          WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
           win32wnd->MsgActivate((LOWORD(pWinMsg->wParam) == WA_ACTIVE_W) ? 1 : 0, HIWORD(pWinMsg->wParam), pWinMsg->lParam, (HWND)mp2);
 
@@ -463 +463 @@
           }
         }
-
-        break;
+        RestoreOS2TIB();
+        return 0;
     }
 
@@ -470 +470 @@
     {
         dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp2)));
-        break;
-    }
-
+        goto RunDefWndProc;
+    }
 
     case WM_MINMAXFRAME:
@@ -737 +736 @@
 
     case WM_FOCUSCHANGE:
-        dprintf(("OS2: WM_FOCUSCHANGE %x", win32wnd->getWindowHandle()));
-        goto RunDefWndProc;
+        dprintf(("OS2: WM_FOCUSCHANGE %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        goto RunDefFrameProc;  //partly responsible for activation of frame windows
 
     case WM_QUERYTRACKINFO:

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.200 2000-06-08 18:10:11 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.201 2000-06-14 13:15:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2053 +2053 @@
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
-
+    if(getWindowHandle() == 0x68000030 && nCmdShow == 0) {
+        rc = 0;
+    }
     wasVisible = (getStyle() & WS_VISIBLE) != 0;
 
@@ -2386 +2388 @@
         else DebugInt3();
     }
-
     /* Hide the window */
     if(IsWindowVisible())