Changeset 3800 for trunk/src

Timestamp:

Jul 4, 2000, 10:42:07 AM (25 years ago)

Author:

sandervl

Message:

Rewrote Set/GetViewportExtEx, Set/GetMapMode & moved them from gdi32 to user32 + titlebar fix

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• dc.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.34 2000-06-14 13:15:23 sandervl Exp $
+; $Id: USER32.DEF,v 1.35 2000-07-04 08:42:05 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -649 +649 @@
     OSLibGetScreenHeight__Fv                                     @2013
     OSLibGetScreenWidth__Fv                                      @2014
+
+    _SetMapMode@8                                                @2015
+    _GetMapMode@4                                                @2016
+    _SetViewportExtEx@16                                         @2017
+    _GetViewportExtEx@8                                          @2018

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.64 2000-06-26 10:27:10 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.65 2000-07-04 08:42:05 sandervl Exp $ */
 
 /*
@@ -1655 +1655 @@
 //******************************************************************************
 //******************************************************************************
+int WIN32API SetMapMode(HDC hdc, int mode)
+{
+  Win32BaseWindow *wnd;
+  pDCData          pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+  if(!pHps)
+  {
+      SetLastError(ERROR_INVALID_HANDLE_W);
+      dprintf(("GDI32: SetMapMode %x %x -> invalid hdc!!", hdc, mode));
+      return 0;
+  }
+  wnd = Win32BaseWindow::GetWindowFromHandle(WindowFromDC(hdc));
+  //todo: metafile recording
+
+  dprintf(("GDI32: SetMapMode %x %x", hdc, mode));
+  return setMapMode(wnd, pHps, mode);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetMapMode(HDC hdc)
+{
+   pDCData pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+   if(pHps) {
+      dprintf(("GDI32: GetMapMode %x -> %x", hdc, pHps->MapMode));
+      return pHps->MapMode;
+   }
+   dprintf(("GDI32: GetMapMode: invalid hdc %x!!!", hdc));
+   SetLastError(ERROR_INVALID_HANDLE_W);
+   return 0;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetViewportExtEx(HDC hdc, int xExt, int yExt, LPSIZE pSize)
+{
+  Win32BaseWindow *wnd;
+  pDCData          pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+
+   if(!pHps)
+   {
+      dprintf(("GDI32: SetViewportExtEx %x %d %d %x -> INVALID HDC", hdc, xExt, yExt, pSize));
+      SetLastError(ERROR_INVALID_HANDLE_W);
+      return FALSE;
+   }
+
+   if(pSize) {
+        dprintf(("GDI32: SetViewportExtEx %x %d %d (%d,%d)", hdc, xExt, yExt, pSize->cx, pSize->cy));
+   }
+   else dprintf(("GDI32: SetViewportExtEx %x %d %d NULL", hdc, xExt, yExt));
+
+   if (xExt && yExt )
+   {
+      //todo: Metafile recording!! (done for any map mode)
+
+      if(pHps->MapMode == MM_ISOTROPIC_W || pHps->MapMode == MM_ANISOTROPIC_W)
+      {
+         wnd = Win32BaseWindow::GetWindowFromHandle(WindowFromDC(hdc));
+         if(changePageXForm(wnd, pHps, NULL, xExt, yExt, (PPOINTL) pSize))
+         {
+            SetLastError(ERROR_SUCCESS_W);
+            return TRUE;
+         }
+      }
+      else
+      {
+         pHps->lVwpXExtSave = xExt;
+         pHps->lVwpYExtSave = yExt;
+
+         //if map mode is not ISOTROPIC nor ANISOTROPIC, this function does
+         //nothing and returns TRUE (NT)
+         SetLastError(ERROR_SUCCESS_W);
+         return TRUE;
+      }
+
+      SetLastError(ERROR_SUCCESS_W);
+      return FALSE;
+   }
+
+   SetLastError(ERROR_INVALID_PARAMETER_W);
+   return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetViewportExtEx(HDC hdc, LPSIZE pSize)
+{
+   pDCData pHps = (pDCData)GpiQueryDCData((HPS)hdc);
+   if(!pHps)
+   {
+      dprintf(("GDI32: GetViewportExtEx %x %x -> INVALID HDC", hdc, pSize));
+      SetLastError(ERROR_INVALID_HANDLE_W);
+      return FALSE;
+   }
+
+   if(!pSize)
+   {
+      dprintf(("GDI32: GetViewportExtEx %x NULL -> INVALID parameter", hdc));
+      SetLastError(ERROR_INVALID_PARAMETER_W);
+      return FALSE;
+   }
+
+   pSize->cx = (LONG)pHps->viewportXExt;
+   pSize->cy = (LONG)pHps->viewportYExt;
+   dprintf(("GDI32: GetViewportExtEx %x -> (%d,%d)", hdc, pSize->cx, pSize->cy));
+
+   SetLastError(ERROR_SUCCESS_W);
+   return TRUE;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.97 2000-07-01 09:51:52 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.98 2000-07-04 08:42:06 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -694 +694 @@
 
         rc = WinQueryUpdateRect(hwnd, &rectl);
-        dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
+        dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d) rc=%d", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop, rc));
         if(rc && win32wnd->IsWindowCreated() && (rectl.xLeft != rectl.xRight &&
            rectl.yBottom != rectl.yTop)) 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.205 2000-07-02 14:31:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.206 2000-07-04 08:42:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2291 +2291 @@
     swp.hwnd = OS2Hwnd;
 
-    dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
-    rc = OSLibWinSetMultWindowPos(&swp, 1);
-
     if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
         setStyle(getStyle() | WS_VISIBLE);
         if(hTaskList) {
+                dprintf(("Adding window %x to tasklist", getWindowHandle()));
                 OSLibWinChangeTaskList(hTaskList, OS2Hwnd, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
         }
@@ -2304 +2302 @@
         setStyle(getStyle() & ~WS_VISIBLE);
         if(hTaskList) {
+                dprintf(("Removing window %x from tasklist", getWindowHandle()));
                 OSLibWinChangeTaskList(hTaskList, OS2Hwnd, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
         }
     }
+    dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
+    rc = OSLibWinSetMultWindowPos(&swp, 1);
+
     if(rc == FALSE)
     {