Changeset 2718 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Feb 10, 2000, 1:36:11 AM (26 years ago)

Author:

sandervl

Message:

CreateDIBSection enhancement + CreateICA/W bugfix

File:

• trunk/src/gdi32/dibsect.cpp (modified) (5 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.16 2000-02-09 23:34:30 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.17 2000-02-10 00:36:10 sandervl Exp $ */
 
 /*
@@ -8 +8 @@
  *
  * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * NOTE:
+ * This is not a complete solution for CreateDIBSection, but enough for Quake 2!
  *
  */
@@ -21 +24 @@
 #include <vmutex.h>
 #include <winconst.h>
-
+#include <win32wnd.h>
+#include "oslibgpi.h"
+
+//Win32 apis used:
 HWND WIN32API WindowFromDC(HDC hdc);
-HWND Win32ToOS2Handle(HWND hwnd);
-
-BOOL    APIENTRY _GpiEnableYInversion (HPS hps, LONG lHeight);
-
-inline BOOL APIENTRY GpiEnableYInversion (HPS hps, LONG lHeight)
-{
- BOOL yyrc;
- USHORT sel = RestoreOS2FS();
-
-    yyrc = _GpiEnableYInversion(hps, lHeight);
-    SetFS(sel);
-
-    return yyrc;
-}
+BOOL   WINAPI UnmapViewOfFile(LPVOID addr);
+LPVOID WINAPI MapViewOfFile(HANDLE mapping, DWORD access, DWORD offset_high,
+                            DWORD offset_low, DWORD count);
 
 static VMutex dibMutex;
 
-//NOTE:
-//This is not a complete solution for CreateDIBSection, but enough for Quake 2!
-//******************************************************************************
-//******************************************************************************
-DIBSection::DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD handle, int fFlip)
+//******************************************************************************
+//******************************************************************************
+DIBSection::DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD hSection, DWORD dwOffset, DWORD handle, int fFlip)
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL)
 {
@@ -82 +75 @@
    }
 
-   bmpBits    = (char *)malloc(bmpsize*pbmi->biHeight);
+   this->hSection = hSection;
+   if(hSection) {
+        bmpBits = (char *)MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS_W, 0, dwOffset, bmpsize*pbmi->biHeight);
+        if(!bmpBits) {
+                dprintf(("Dibsection: mapViewOfFile %x failed!", hSection));
+                DebugInt3();
+        }
+   }
+   if(!bmpBits) {
+        DosAllocMem((PPVOID)&bmpBits, bmpsize*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
+   }
    memset(bmpBits, 0, bmpsize*pbmi->biHeight);
 
-   pOS2bmp    = (BITMAPINFO2 *)malloc(os2bmpsize);
+   pOS2bmp = (BITMAPINFO2 *)malloc(os2bmpsize);
 
    memset(pOS2bmp, /* set header + palette entries to zero */
@@ -164 +167 @@
 {
    dprintf(("Delete DIBSection %x", handle));
+
+   if(hSection) {
+        UnmapViewOfFile(bmpBits);
+   }
+   else
    if(bmpBits)
-        free(bmpBits);
+        DosFreeMem(bmpBits);
+
    if(pOS2bmp)
         free(pOS2bmp);