Changeset 2718 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

CreateDIBSection enhancement + CreateICA/W bugfix

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (3 diffs)
• dibsect.cpp (modified) (5 diffs)
• dibsect.h (modified) (3 diffs)
• gdi32.cpp (modified) (3 diffs)
• oslibgpi.h (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.2 2000-02-02 23:45:06 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.3 2000-02-10 00:36:10 sandervl Exp $ */
 
 /*
@@ -85 +85 @@
 
   dprintf(("GDI32: CreateDIBSection %x %x %x %x %d", hdc, iUsage, ppvBits, hSection, dwOffset));
-  if(hSection)
-  {
-    dprintf(("GDI32: CreateDIBSection, hSection != NULL, not supported!"));
-    return NULL;
-  }
 
   //SvL: 13-9-98: StarCraft uses bitmap with negative height
@@ -111 +106 @@
   {
     char PalSize;
-    DIBSection *dsect = new DIBSection((BITMAPINFOHEADER_W *)&pbmi->bmiHeader, (char *)&pbmi->bmiColors, iUsage, (DWORD)res, fFlip);
+    DIBSection *dsect;
+
+    dsect = new DIBSection((BITMAPINFOHEADER_W *)&pbmi->bmiHeader, (char *)&pbmi->bmiColors, iUsage, hSection, dwOffset, (DWORD)res, fFlip);
 
     if(dsect != NULL)

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);

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.11 2000-02-02 23:45:06 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.12 2000-02-10 00:36:10 sandervl Exp $ */
 
 /*
@@ -63 +63 @@
 {
 public:
-              DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD handle, int fFlip);
+              DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD hSection, DWORD dwOffset, DWORD handle, int fFlip);
              ~DIBSection();
 
@@ -96 +96 @@
 private:
           DWORD handle, iUsage;
+          DWORD hSection;
           HWND  hwndParent;
           HDC   hdc;

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.38 2000-02-02 23:45:06 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.39 2000-02-10 00:36:10 sandervl Exp $ */
 
 /*
@@ -479 +479 @@
 //******************************************************************************
 //******************************************************************************
-HDC WIN32API CreateICA( LPCSTR arg1, LPCSTR arg2, LPCSTR arg3, const DEVMODEA * arg4)
-{
+HDC WIN32API CreateICA(LPCSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszOutput, 
+                       const DEVMODEA *lpdvmInit)
+{
+ static char *szDisplay = "DISPLAY";
+
     dprintf(("GDI32: CreateICA"));
-    return O32_CreateIC(arg1, arg2, arg3, arg4);
+    //SvL: Open32 tests for "DISPLAY"
+    if(lpszDriver && !strcmp(lpszDriver, "display")) {
+        lpszDriver = szDisplay;
+    }
+    return O32_CreateIC(lpszDriver, lpszDevice, lpszOutput, lpdvmInit);
 }
 //******************************************************************************
@@ -540 +547 @@
       devmode.dmReserved2        = arg4->dmReserved2;
 
-      rc = O32_CreateIC(astring1,astring2,astring3,&devmode);
+      rc = CreateICA(astring1,astring2,astring3,&devmode);
     }
     else
-      rc = O32_CreateIC(astring1,astring2,astring3, NULL);
+      rc = CreateICA(astring1,astring2,astring3, NULL);
 
     FreeAsciiString(astring1);

trunk/src/gdi32/oslibgpi.h

@@ -1 @@
-/* $Id: oslibgpi.h,v 1.3 2000-01-20 21:39:36 sandervl Exp $ */
+/* $Id: oslibgpi.h,v 1.4 2000-02-10 00:36:11 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 
   return yyrc;
+}
+
+BOOL APIENTRYOS2 _GpiEnableYInversion(ULONG hps, LONG lHeight);
+
+inline BOOL GpiEnableYInversion(ULONG hps, LONG lHeight)
+{
+ BOOL yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = _GpiEnableYInversion(hps, lHeight);
+    SetFS(sel);
+
+    return yyrc;
 }