Changeset 126

Timestamp:

Dec 22, 2001, 12:10:30 PM (24 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk/src/helpers

Files:

• dosh.c (modified) (3 diffs)
• dosh2.c (modified) (1 diff)
• gpih.c (modified) (10 diffs)

trunk/src/helpers/dosh.c

@@ -334 +334 @@
 
     *pcbAllocated = c * cbArrayItem;
-    if (!(*ppv = malloc(*pcbAllocated)))
+    if (!(*ppv = (PBYTE)malloc(*pcbAllocated)))
         return ERROR_NOT_ENOUGH_MEMORY;
 
@@ -1779 +1779 @@
  *
  *@@added V0.9.16 (2001-10-19) [umoeller]
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: fixed error codes
  */
 
@@ -1789 +1790 @@
     APIRET arc = NO_ERROR;
 
-    // run this first, because if the file doesn't
-    // exists, DosOpen only returns ERROR_OPEN_FAILED,
-    // which isn't that meaningful
-    // V0.9.16 (2001-12-08) [umoeller]
-    if (!(arc = doshQueryPathSize(pcszFilename,
-                                  pcbFile)))
-    {
-        ULONG   fsOpenFlags = 0,
-                fsOpenMode =    OPEN_FLAGS_FAIL_ON_ERROR
-                              | OPEN_FLAGS_NO_LOCALITY
-                              | OPEN_FLAGS_NOINHERIT;
-
-        switch (flOpenMode & XOPEN_ACCESS_MASK)
+    ULONG   fsOpenFlags = 0,
+            fsOpenMode =    OPEN_FLAGS_FAIL_ON_ERROR
+                          | OPEN_FLAGS_NO_LOCALITY
+                          | OPEN_FLAGS_NOINHERIT;
+
+    switch (flOpenMode & XOPEN_ACCESS_MASK)
+    {
+        case XOPEN_READ_EXISTING:
+            fsOpenFlags =   OPEN_ACTION_FAIL_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYWRITE
+                          | OPEN_ACCESS_READONLY;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READ_EXISTING"));
+
+            // run this first, because if the file doesn't
+            // exists, DosOpen only returns ERROR_OPEN_FAILED,
+            // which isn't that meaningful
+            // V0.9.16 (2001-12-08) [umoeller]
+            arc = doshQueryPathSize(pcszFilename,
+                                    pcbFile);
+        break;
+
+        case XOPEN_READWRITE_APPEND:
+            fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
+                          | OPEN_ACCESS_READWRITE;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_APPEND"));
+        break;
+
+        case XOPEN_READWRITE_NEW:
+            fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
+                          | OPEN_ACTION_REPLACE_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
+                          | OPEN_ACCESS_READWRITE;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_NEW"));
+        break;
+    }
+
+    if ((!arc) && fsOpenFlags && pcbFile && ppFile)
+    {
+        PXFILE pFile;
+        if (pFile = NEW(XFILE))
         {
-            case XOPEN_READ_EXISTING:
-                fsOpenFlags =   OPEN_ACTION_FAIL_IF_NEW
-                              | OPEN_ACTION_OPEN_IF_EXISTS;
-                fsOpenMode |=   OPEN_SHARE_DENYWRITE
-                              | OPEN_ACCESS_READONLY;
-                // _Pmpf((__FUNCTION__ ": opening XOPEN_READ_EXISTING"));
-            break;
-
-            case XOPEN_READWRITE_APPEND:
-                fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
-                              | OPEN_ACTION_OPEN_IF_EXISTS;
-                fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
-                              | OPEN_ACCESS_READWRITE;
-                // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_APPEND"));
-            break;
-
-            case XOPEN_READWRITE_NEW:
-                fsOpenFlags =   OPEN_ACTION_CREATE_IF_NEW
-                              | OPEN_ACTION_REPLACE_IF_EXISTS;
-                fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
-                              | OPEN_ACCESS_READWRITE;
-                // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_NEW"));
-            break;
-        }
-
-        if ((!arc) && fsOpenFlags && pcbFile && ppFile)
-        {
-            PXFILE pFile;
-            if (pFile = NEW(XFILE))
+            ULONG ulAction;
+
+            ZERO(pFile);
+
+            // copy open flags
+            pFile->flOpenMode = flOpenMode;
+
+            if (!(arc = DosOpen((PSZ)pcszFilename,
+                                &pFile->hf,
+                                &ulAction,
+                                *pcbFile,
+                                FILE_ARCHIVED,
+                                fsOpenFlags,
+                                fsOpenMode,
+                                NULL)))       // EAs
             {
-                ULONG ulAction;
-
-                ZERO(pFile);
-
-                // copy open flags
-                pFile->flOpenMode = flOpenMode;
-
-                if (!(arc = DosOpen((PSZ)pcszFilename,
-                                    &pFile->hf,
-                                    &ulAction,
-                                    *pcbFile,
-                                    FILE_ARCHIVED,
-                                    fsOpenFlags,
-                                    fsOpenMode,
-                                    NULL)))       // EAs
-                {
-                    // alright, got the file:
-
-                    if (    (ulAction == FILE_EXISTED)
-                         && ((flOpenMode & XOPEN_ACCESS_MASK) == XOPEN_READWRITE_APPEND)
-                       )
-                        // get its size and set ptr to end for append
-                        arc = DosSetFilePtr(pFile->hf,
-                                            0,
-                                            FILE_END,
+                // alright, got the file:
+
+                if (    (ulAction == FILE_EXISTED)
+                     && ((flOpenMode & XOPEN_ACCESS_MASK) == XOPEN_READWRITE_APPEND)
+                   )
+                    // get its size and set ptr to end for append
+                    arc = DosSetFilePtr(pFile->hf,
+                                        0,
+                                        FILE_END,
+                                        pcbFile);
+                else
+                    arc = doshQueryFileSize(pFile->hf,
                                             pcbFile);
-                    else
-                        arc = doshQueryFileSize(pFile->hf,
-                                                pcbFile);
-                        // file ptr is at beginning
-
-                    // store file size
-                    pFile->cbInitial
-                    = pFile->cbCurrent
-                    = *pcbFile;
-                }
-
-                if (arc)
-                    doshClose(&pFile);
-                else
-                    *ppFile = pFile;
+                    // file ptr is at beginning
+
+                 if (arc)
+                    _Pmpf((__FUNCTION__ ": DosSetFilePtr/queryfilesize returned %d for %s",
+                                arc, pcszFilename));
+
+                // store file size
+                pFile->cbInitial
+                = pFile->cbCurrent
+                = *pcbFile;
             }
             else
-                arc = ERROR_NOT_ENOUGH_MEMORY;
+                 _Pmpf((__FUNCTION__ ": DosOpen returned %d for %s",
+                             arc, pcszFilename));
+
+            if (arc)
+                doshClose(&pFile);
+            else
+                *ppFile = pFile;
         }
         else
-            arc = ERROR_INVALID_PARAMETER;
-    }
+            arc = ERROR_NOT_ENOUGH_MEMORY;
+    }
+    else
+        arc = ERROR_INVALID_PARAMETER;
 
     return (arc);

trunk/src/helpers/dosh2.c

@@ -552 +552 @@
                         cbRead = sizeof(PEHEADER);
 
-                    if (!(pbHeader = malloc(cbRead)))
+                    if (!(pbHeader = (PBYTE)malloc(cbRead)))
                         arc = ERROR_NOT_ENOUGH_MEMORY;
                     else if (!(arc = doshReadAt(hFile,

trunk/src/helpers/gpih.c

@@ -62 +62 @@
 // array for querying device capabilities (gpihQueryDisplayCaps)
 LONG            DisplayCaps[CAPS_DEVICE_POLYSET_POINTS] = {0};
-BOOL            fCapsQueried = FALSE;
+BOOL            G_fCapsQueried = FALSE;
 
 /*
@@ -171 +171 @@
  *      This function will load all the device capabilities
  *      only once into a global array and re-use them afterwards.
+ *
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: fixed multiple loads
  */
 
 ULONG gpihQueryDisplayCaps(ULONG ulIndex)
 {
-    if (!fCapsQueried)
+    if (!G_fCapsQueried)
     {
         HPS hps = WinGetScreenPS(HWND_DESKTOP);
         HDC hdc = GpiQueryDevice(hps);
         DevQueryCaps(hdc, 0, CAPS_DEVICE_POLYSET_POINTS, &DisplayCaps[0]);
+        G_fCapsQueried = TRUE;      // was missing V0.9.16 (2001-12-18) [umoeller]
     }
 
@@ -1459 +1462 @@
 /*
  *@@ gpihCreateBitmap:
+ *      calls gpihCreateBitmap2 with cPlanes and cBitCount == 0
+ *      for compatibility with exports. Widgets might
+ *      have used this func.
+ *
+ *@@changed V0.9.0 [umoeller]: function prototype changed to cx and cy
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: now using optimized gpihCreateBitmap2
+ */
+
+HBITMAP gpihCreateBitmap(HPS hpsMem,        // in: memory DC
+                         ULONG cx,          // in: width of new bitmap
+                         ULONG cy)          // in: height of new bitmap
+{
+    return (gpihCreateBitmap2(hpsMem,
+                              cx,
+                              cy,
+                              0,
+                              0));            // current screen bit count
+}
+
+/*
+ *@@ gpihCreateBitmap2:
  *      creates a new bitmap for a given memory PS.
  *      This bitmap will have the cPlanes and bitcount
@@ -1472 +1496 @@
  *      Returns the bitmap handle or NULLHANDLE upon errors.
  *
- *@@changed V0.9.0 [umoeller]: function prototype changed to cx and cy
- */
-
-HBITMAP gpihCreateBitmap(HPS hpsMem,        // in: memory DC
-                         ULONG cx,          // in: width of new bitmap
-                         ULONG cy)          // in: height of new bitmap
+ *@@added V0.9.16 (2001-12-18) [umoeller]
+ */
+
+HBITMAP gpihCreateBitmap2(HPS hpsMem,        // in: memory DC
+                          ULONG cx,          // in: width of new bitmap
+                          ULONG cy,          // in: height of new bitmap
+                          ULONG cPlanes,     // in: color planes (usually 1); if 0, current screen is used
+                          ULONG cBitCount)   // in: either 1, 4, or 24; if 0, current screen value
 {
     HBITMAP hbm = NULLHANDLE;
     LONG alData[2];
     BITMAPINFOHEADER2 bih2;
-    PBITMAPINFO2 pbmi = NULL;
+    // PBITMAPINFO2 pbmi = NULL;
 
     // determine the device's plane/bit-count format;
@@ -1493 +1519 @@
         bih2.cx = cx; // (prcl->xRight - prcl->xLeft);       changed V0.9.0
         bih2.cy = cy; // (prcl->yTop - prcl->yBottom);       changed V0.9.0
-        bih2.cPlanes = alData[0];
-        bih2.cBitCount = alData[1];
+        bih2.cPlanes = (cPlanes) ? cPlanes : alData[0];
+        bih2.cBitCount = (cBitCount) ? cBitCount : alData[1];
+            _Pmpf((__FUNCTION__ ": cPlanes %d, cBitCount %d",
+                        bih2.cPlanes, bih2.cBitCount));
         bih2.ulCompression = BCA_UNCOMP;
         bih2.cbImage = (    (   (bih2.cx
@@ -1515 +1543 @@
         bih2.ulIdentifier = 0;              // application-specific data
 
-        // allocate memory for info header
-        if (DosAllocMem((PPVOID)&pbmi,
-                        sizeof(BITMAPINFO2) +
-                            (sizeof(RGB2)
-                                * (1 << bih2.cPlanes)
-                                * (1 << bih2.cBitCount)
-                            ),
-                        PAG_COMMIT | PAG_READ | PAG_WRITE)
-            == NO_ERROR)
-        {
-            pbmi->cbFix = bih2.cbFix;
-            pbmi->cx = bih2.cx;
-            pbmi->cy = bih2.cy;
-            pbmi->cPlanes = bih2.cPlanes;
-            pbmi->cBitCount = bih2.cBitCount;
-            pbmi->ulCompression = BCA_UNCOMP;
-            pbmi->cbImage = ((bih2.cx+31)/32) * bih2.cy;
-            pbmi->cxResolution = 70;
-            pbmi->cyResolution = 70;
-            pbmi->cclrUsed = 2;
-            pbmi->cclrImportant = 0;
-            pbmi->usUnits = BRU_METRIC;
-            pbmi->usReserved = 0;
-            pbmi->usRecording = BRA_BOTTOMUP;
-            pbmi->usRendering = BRH_NOTHALFTONED;
-            pbmi->cSize1 = 0;
-            pbmi->cSize2 = 0;
-            pbmi->ulColorEncoding = BCE_RGB;
-            pbmi->ulIdentifier = 0;
-
-            // create a bit map that is compatible with the display
-            hbm = GpiCreateBitmap(hpsMem,
-                                  &bih2,
-                                  FALSE,
-                                  NULL,
-                                  pbmi);
-
-            // free the memory we allocated previously; GPI has
-            // allocated all the resources it needs itself, so
-            // we can release this
-            DosFreeMem(pbmi);
-        }
+        // create a bit map that is compatible with the display
+        hbm = GpiCreateBitmap(hpsMem,
+                              &bih2,
+                              0,            // do not initialize
+                              NULL,
+                              NULL);
     }
 
@@ -2086 +2078 @@
 /*
  *@@ gpihCreateXBitmap:
+ *      calls gpihCreateXBitmap2 with cPlanes and cBitCount == 0
+ *      for compatibility with exports. Widgets might
+ *      have used this func.
+ *
+ *@@added V0.9.12 (2001-05-20) [umoeller]
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: now using optimized gpihCreateXBitmap2
+ */
+
+PXBITMAP gpihCreateXBitmap(HAB hab,         // in: anchor block
+                           LONG cx,         // in: bitmap width
+                           LONG cy)         // in: bitmap height
+{
+    return (gpihCreateXBitmap2(hab,
+                               cx,
+                               cy,
+                               0,
+                               0));
+}
+
+/*
+ *@@ gpihCreateXBitmap:
  *      creates an XBitmap, which is returned in an
  *      _XBITMAP structure.
@@ -2124 +2137 @@
  *      to more than 100 lines.
  *
- *@@added V0.9.12 (2001-05-20) [umoeller]
- */
-
-PXBITMAP gpihCreateXBitmap(HAB hab,         // in: anchor block
-                           LONG cx,         // in: bitmap width
-                           LONG cy)         // in: bitmap height
+ *@@added V0.9.16 (2001-12-18) [umoeller]
+ */
+
+PXBITMAP gpihCreateXBitmap2(HAB hab,         // in: anchor block
+                            LONG cx,         // in: bitmap width
+                            LONG cy,         // in: bitmap height
+                            ULONG cPlanes,     // in: color planes (usually 1); if 0, current screen is used
+                            ULONG cBitCount)   // in: either 1, 4, or 24; if 0, current screen value
 {
     BOOL fOK = FALSE;
@@ -2145 +2160 @@
                             &pbmp->hpsMem))
         {
-            gpihSwitchToRGB(pbmp->hpsMem);
-            if (pbmp->hbm = gpihCreateBitmap(pbmp->hpsMem,
-                                             cx,
-                                             cy))
+            if (cBitCount != 1)
+                // not monochrome bitmap:
+                gpihSwitchToRGB(pbmp->hpsMem);
+
+            if (pbmp->hbm = gpihCreateBitmap2(pbmp->hpsMem,
+                                              cx,
+                                              cy,
+                                              cPlanes,
+                                              cBitCount))
             {
                 if (GpiSetBitmap(pbmp->hpsMem,
@@ -2162 +2182 @@
 
     return (pbmp);
+}
+
+/*
+ *@@ gpihDetachBitmap:
+ *      "detaches" the bitmap from the given XBITMAP.
+ *      This will deselect the bitmap from the internal
+ *      memory PS so it can be used with many OS/2 APIs
+ *      that require that the bitmap not be selected
+ *      into any memory PS.
+ *
+ *      Note that it then becomes the responsibility
+ *      of the caller to explicitly call GpiDeleteBitmap
+ *      because it will not be deleted by gpihDestroyXBitmap.
+ *
+ *@@added V0.9.16 (2001-12-18) [umoeller]
+ */
+
+HBITMAP gpihDetachBitmap(PXBITMAP pbmp)
+{
+    HBITMAP hbm = pbmp->hbm;
+    pbmp->hbm = NULLHANDLE;
+    GpiSetBitmap(pbmp->hpsMem, NULLHANDLE);
+
+    return (hbm);
 }