Changeset 1073 for trunk/src/user32/dc.cpp

Timestamp:

Sep 27, 1999, 8:21:25 PM (26 years ago)

Author:

dengert

Message:

minor dc changes

File:

• trunk/src/user32/dc.cpp (modified) (17 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.7 1999-09-26 15:25:55 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.8 1999-09-27 18:21:25 dengert Exp $ */
 
 /*
@@ -24 +24 @@
 #include <limits.h>
 #include "oslibwin.h"
+#include "dcdata.h"
+
+#undef SEVERITY_ERROR
+#include <winerror.h>
 
 #ifndef OPEN32API
@@ -30 +34 @@
 
 /*********************/
-typedef struct _tagXFORM
-{
-    FLOAT eM11;
-    FLOAT eM12;
-    FLOAT eM21;
-    FLOAT eM22;
-    FLOAT eDx;
-    FLOAT eDy;
-} XFORM_W, *PXFORM_W, *LPXFORM_W;
-
 typedef struct
 {
@@ -159 +153 @@
 #define MM_ANISOTROPIC_W      8
 
-enum PS_Type { MICRO_CACHED, MICRO, NORMAL };
-enum HDC_Type{ TYPE_0, TYPE_1, TYPE_2, TYPE_3, TYPE_4 };
-
-typedef struct _DCData
-{
-   HDC         hdc;
-   HWND        hwnd;
-   HPS         hps;
-
-   UINT        lastBrushHandle;
-   PVOID       lastBrushObject;
-   UINT        lastPenHandle;
-   pPenObject  lastPenObject;
-   UINT        lastFontHandle;
-   PVOID       lastFontObject;
-   UINT        lastBitmapHandle;
-   PVOID       lastBitmapObject;
-   UINT        lastPaletteHandle;
-   PVOID       lastPaletteObject;
-
-   UINT        nullBitmapHandle;
-
-   ULONG       BkColor;
-   ULONG       TextColor;
-   ULONG       BkColor_PM;
-   ULONG       TextColor_PM;
-
-   int         BkMode;
-   ULONG       BkMode_PM;
-
-   int         ROP2Mode;
-   int         ROP2Mode_PM;
-
-   unsigned    isMemoryPS:1;
-   unsigned    isMetaPS:1;
-   unsigned    isPrinter:1;
-   unsigned    isFrameWindow:1;
-   unsigned    isOD_QUEUED:1;
-   unsigned    isOD_INFO:1;
-   unsigned    isClient:1;
-   unsigned    isClientArea:1;
-   unsigned    isLeftLeft:1;
-   unsigned    isTopTop:1;
-   unsigned    isWideLine:1;
-   unsigned    alignUpdateCP:1;
-   unsigned    isCacheable:1;
-   unsigned    penIsExtPen:1;
-   unsigned    isValid:1;
-   unsigned    inPath:1;
-   unsigned    isStartDoc:1;
-   unsigned    resetStockFonts:1;
-   unsigned    unused:14;
-
-   ULONG       MapMode;
-   HBITMAP     bitmapHandle;
-   ULONG       bitmapHeight;
-   ULONG       bitmapWidth;
-   ULONG       hMeta;
-   PVOID       pMetaFileObject;
-   int         polyFillMode;
-   int         arcDirection;
-   int         stretchBltMode;
-   int         graphicsMode;
-   HRGN        hrgnHDC;
-
-   PS_Type     psType;
-
-   HDC_Type    hdcType;
-   USHORT      usFiller;
-   POINTL      viewportOrg;
-   double      viewportXExt;
-   double      viewportYExt;
-   POINTL      windowOrg;
-   SIZEL       windowExt;
-   HRGN        hrgnVis;
-   POINTL      ptlOrigin;
-   ULONG       printPageHeight;
-   PVOID       printerObject;
-
-   LONG        taMode;
-   XFORM_W     xform;
-
-   INT         worldYDeltaFor1Pixel;
-   INT         worldXDeltaFor1Pixel;
-   ULONG       colorMode;
-   PULONG      pLogColorTable;
-
-   ULONG       lcidBitfield;
-
-   HWND        hwndRealize;
-   ULONG       cpeMap;
-
-   LONG        lTechnology;
-
-   LONG        lWndXExtSave, lWndYExtSave,
-               lVwpXExtSave, lVwpYExtSave;
-
-   int         height;
-
-   POINTL      brushOrgPoint;
-
-   PVOID       pEnhMetaPalette;
-   PVOID       lpAbortProc;
-   ULONG       HPStoHDCInversionHeight;
-
-   int         saveLevel;
-
-   struct      _DCData *nextDCData;
-} tDCData, *pDCData;
-
 /*********************/
 
@@ -366 +250 @@
       case MM_ISOTROPIC_W  : flOptions = PU_LOMETRIC ; break;
       default:
-//         SET_ERROR_WIN(ERROR_INVALID_PARAMETER_W);
+         _O32_SetLastError (ERROR_INVALID_PARAMETER);
          return FALSE;
    }
@@ -391 +275 @@
       if (DevEscape(pHps->hdc ? pHps->hdc : pHps->hps, DEVESC_SETPS, 12, (PBYTE)data, 0, 0) == DEVESC_ERROR)
       {
-//         SET_ERROR_LAST();
+         _O32_SetLastError (ERROR_INVALID_PARAMETER);
          return 0;
       }
@@ -699 +583 @@
    if ( !lpps )
    {
-//      SET_ERROR_WIN( ERROR_INVALID_PARAMETER_W );
+      _O32_SetLastError (ERROR_INVALID_PARAMETER);
       return (HDC)NULLHANDLE;
    }
@@ -712 +596 @@
       if (!pHps)
       {
-//         SET_ERROR_LAST();
+         _O32_SetLastError (ERROR_INVALID_PARAMETER);
          SetFS(sel);
          return (HDC)NULLHANDLE;
@@ -802 +686 @@
    if (hwnd)
    {
-//      SET_ERROR_WIN( ERROR_INVALID_HANDLE_W );
+      _O32_SetLastError (ERROR_INVALID_HANDLE);
       return FALSE;
    }
@@ -824 +708 @@
          if (!pHps)
          {
-//            SET_ERROR_WIN(ERROR_INVALID_HANDLE_W);
+            _O32_SetLastError (ERROR_INVALID_HANDLE);
             SetFS(sel);
             return FALSE;
@@ -1024 +908 @@
       _O32_DeleteObject (pHps->nullBitmapHandle);
    }
-//   SET_ERROR_LAST();
+   _O32_SetLastError (ERROR_INVALID_PARAMETER);
    SetFS(sel);
    return NULL;
@@ -1095 +979 @@
    if (redraw & (RDW_FRAME_W | RDW_NOFRAME_W))
    {
-//      SET_ERROR_WIN( ERROR_NOT_SUPPORTED_W );
+      _O32_SetLastError (ERROR_NOT_SUPPORTED);
       return FALSE;
    }
@@ -1112 +996 @@
       if (!wnd)
       {
-//         SET_ERROR_LAST();
+         _O32_SetLastError (ERROR_INVALID_PARAMETER);
          SetFS(sel);
          return FALSE;
@@ -1248 +1132 @@
       wnd->setSupressErase (TRUE);
 
-//   if (!success)
-//      SET_ERROR_LAST();
+   if (!success)
+      _O32_SetLastError (ERROR_INVALID_PARAMETER);
 
    SetFS(sel);
@@ -1312 +1196 @@
     //Rectangle could be relative to parent window, so fix this
     if(clientRect.yBottom != 0) {
-        clientRect.yTop   -= clientRect.yBottom;
-        clientRect.yBottom = 0;
+        clientRect.yTop   -= clientRect.yBottom;
+        clientRect.yBottom = 0;
     }
     if(clientRect.xLeft != 0) {
-        clientRect.xRight -= clientRect.xLeft;
-        clientRect.xLeft   = 0;
+        clientRect.xRight -= clientRect.xLeft;
+        clientRect.xLeft   = 0;
     }
     if(pScroll) {
-         MapWin32ToOS2Rectl((RECT *)pScroll, (PRECTLOS2)&scrollRect);
-         pScrollRect = &scrollRect;
-
-         //Scroll rectangle relative to client area
+         MapWin32ToOS2Rectl((RECT *)pScroll, (PRECTLOS2)&scrollRect);
+         pScrollRect = &scrollRect;
+
+         //Scroll rectangle relative to client area
          pScrollRect->xLeft   += clientRect.xLeft;
          pScrollRect->xRight  += clientRect.xLeft;
@@ -1333 +1217 @@
 
     if(pClip) {
-         MapWin32ToOS2Rectl((RECT *)pClip, (PRECTLOS2)&clipRect);
-         pClipRect = &clipRect;
-
-         //Clip rectangle relative to client area
+         MapWin32ToOS2Rectl((RECT *)pClip, (PRECTLOS2)&clipRect);
+         pClipRect = &clipRect;
+
+         //Clip rectangle relative to client area
          pClipRect->xLeft     += clientRect.xLeft;
          pClipRect->xRight    += clientRect.xLeft;
@@ -1355 +1239 @@
 //TODO: Implement this one
 //******************************************************************************
-INT WIN32API ScrollWindowEx(HWND hwnd, int dx, int dy, const RECT *pScroll, const RECT *pClip, 
+INT WIN32API ScrollWindowEx(HWND hwnd, int dx, int dy, const RECT *pScroll, const RECT *pClip,
                             HRGN hrgnUpdate, PRECT pRectUpdate, UINT scrollFlag)
 {