Changeset 10579 for trunk/src

Timestamp:

Apr 13, 2004, 4:17:17 PM (21 years ago)

Author:

sandervl

Message:

updates

Location:

trunk/src

Files:

• gdi32/dibitmap.cpp (modified) (13 diffs)
• libwrap/O32_CreateBitmapFromPMHandle.asm (added)
• libwrap/O32_CreatePaletteFromPMHandle.asm (added)
• libwrap/O32_GetPMHandleFromGDIHandle.asm (added)
• libwrap/_WinSetErrorInfo.asm (added)
• libwrap/makefile (modified) (4 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.43 2004-03-24 16:55:35 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.44 2004-04-13 14:17:17 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
         ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
 
-        if(lpbInit && fdwInit == CBM_INIT) 
+        if(lpbInit && fdwInit == CBM_INIT)
         {
             // upside down
@@ -54 +54 @@
             long lLineByte = DIB_GetDIBWidthBytes(lpbmih->biWidth, lpbmih->biBitCount);
             long lHeight   = lpbmih->biHeight;
-    
+
             newbits = (WORD *)malloc( lLineByte * lHeight );
             if(newbits) {
@@ -95 +95 @@
         memcpy(infoLoc, lpbmi, sizeof(BITMAPINFO));
 
-        if(GetDIBColorTable(hdc, 0, biClrUsed, pColors) == 0) 
+        if(GetDIBColorTable(hdc, 0, biClrUsed, pColors) == 0)
         {
             dprintf(("ERROR: StretchDIBits: GetDIBColorTable failed!!"));
@@ -107 +107 @@
         rc = CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, (PBITMAPINFO)infoLoc,
                             DIB_RGB_COLORS);
-   
+
         return rc;
     }
@@ -165 +165 @@
     ((BITMAPINFOHEADER *)lpbmih)->biBitCount = biBitCount;
 
-    if(rc) { 
+    if(rc) {
         STATS_CreateDIBitmap(rc, hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
         if(bitfields[1] == RGB565_GREEN_MASK) {
@@ -181 +181 @@
 {
     HBITMAP hBitmap;
-    pDCData pHps;  
+    pDCData pHps;
 
     pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -240 +240 @@
     int     iHeight, iWidth;
     BOOL    fCreateDC = FALSE;
-    
+
     dprintf(("GDI32: CreateDIBSection %x %x %x %x %x %d", hdc, pbmi, iUsage, ppvBits, hSection, dwOffset));
 
@@ -406 +406 @@
 {
     int nrlines;
-    pDCData pHps;  
+    pDCData pHps;
     HDC hdcMem;
     DWORD biCompression;
@@ -436 +436 @@
     //If the app wants bitmap data and upside down, then flip image
     if(lpvBits && lpbi->bmiHeader.biHeight < 0 && (lpbi->bmiHeader.biCompression == BI_RGB ||
-       lpbi->bmiHeader.biCompression == BI_BITFIELDS)) 
+       lpbi->bmiHeader.biCompression == BI_BITFIELDS))
     {
         INT rc = -1;
@@ -461 +461 @@
         }
         else DebugInt3();
- 
+
         //restore height
         lpbi->bmiHeader.biHeight = height;
     }
-    else {
-        LONG height = lpbi->bmiHeader.biHeight;
-
-        if(lpbi->bmiHeader.biHeight < 0) {
-            lpbi->bmiHeader.biHeight = -lpbi->bmiHeader.biHeight;
-        }
+    else if (lpbi->bmiHeader.biHeight < 0)
+    {
+        LONG cySaved = lpbi->bmiHeader.biHeight;
+        lpbi->bmiHeader.biHeight = -cySaved;
         nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
-
-        //restore height
-        lpbi->bmiHeader.biHeight = height;
-    }
+        lpbi->bmiHeader.biHeight = cySaved;
+    }
+    else
+        nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
 
     if(lpvBits) {
@@ -528 +526 @@
     //WGSS/Open32 returns 1 when querying the bitmap info; must return nr of scanlines
     //(0 signals failure)
-    if(lpvBits == NULL) {
-       if(nrlines != 0)
-            nrlines = cScanLines;
-       else dprintf(("GetDIBits failed!!"));
-    }
+    #if 0//XP returns 1 just like Open32 does for the query bitmap info header mode.
+    if (lpvBits == NULL)
+    {
+       if (nrlines != 0)
+           nrlines = cScanLines;
+       else
+           dprintf(("GetDIBits failed!!"));
+    }
+    #else
+    if (!nrlines)
+        dprintf(("GetDIBits failed!!"));
+    #endif
     return nrlines;
 }
@@ -621 +626 @@
     //If upside down, reverse scanlines and call SetDIBits again
     if(pBitmapInfo->bmiHeader.biHeight < 0 && (pBitmapInfo->bmiHeader.biCompression == BI_RGB ||
-       pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS)) 
+       pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS))
     {
         // upside down

trunk/src/libwrap/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2003-09-07 03:55:57 bird Exp $
+# $Id: makefile,v 1.3 2004-04-13 14:15:54 sandervl Exp $
 
 #
@@ -1623 +1623 @@
 $(OBJDIR)\__OpenClipbrd.obj \
 $(OBJDIR)\O32_GetStartupInfo.obj \
-$(OBJDIR)\O32_WaitForInputIdle.obj
+$(OBJDIR)\O32_WaitForInputIdle.obj \
+$(OBJDIR)\O32_CreateBitmapFromPMHandle.obj \
+$(OBJDIR)\O32_CreatePaletteFromPMHandle.obj \
+$(OBJDIR)\O32_GetPMHandleFromGDIHandle.obj \
+$(OBJDIR)\_WinSetErrorInfo.obj
 
 
@@ -1634 +1638 @@
 !include $(ODIN32_POST_INC)
 
-
+        
 #
 # The fast way
@@ -3245 +3249 @@
 O32_GetStartupInfo.asm
 O32_WaitForInputIdle.asm
+O32_CreateBitmapFromPMHandle.asm
+O32_CreatePaletteFromPMHandle.asm
+O32_GetPMHandleFromGDIHandle.asm
+_WinSetErrorInfo.asm
 <<KEEP