Changeset 4140 for trunk/src

Timestamp:

Sep 1, 2000, 3:36:15 AM (25 years ago)

Author:

phaller

Message:

.

Location:

trunk/src

Files:

• gdi32/dibitmap.cpp (modified) (2 diffs)
• user32/pmwindow.cpp (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.8 2000-08-18 18:14:56 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.9 2000-09-01 01:36:14 phaller Exp $ */
 
 /*
@@ -29 +29 @@
   HBITMAP rc;
 
-    //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
-
-    iHeight = lpbmih->biHeight;
-    if(lpbmih->biHeight < 0)
-    {
-        dprintf(("GDI32: CreateDIBitmap negative height! (%d,%d)", lpbmih->biWidth, lpbmih->biHeight));
-        ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
-    }
-
-    rc = O32_CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
-
-    dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x", hdc, fdwInit, lpbInit, fuUsage, rc));
-
-    ((BITMAPINFOHEADER *)lpbmih)->biHeight = iHeight;
-
-    return rc;
+  //TEMPORARY HACK TO PREVENT CRASH IN OPEN32 (WSeB GA)
+
+  iHeight = lpbmih->biHeight;
+  if(lpbmih->biHeight < 0)
+  {
+    dprintf(("GDI32: CreateDIBitmap negative height! (%d,%d)", lpbmih->biWidth, lpbmih->biHeight));
+    ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
+  }
+
+  // 2000/09/01 PH Netscape 4.7
+  // If color depth of lpbhmi is 16 bit and lpbmi is 8 bit,
+  // Open32 will crash since it won't allocate any palette color memory,
+  // however wants to copy it later on ...
+  int biBitCount = lpbmih->biBitCount;
+  
+  if (lpbmih->biBitCount != lpbmi->bmiHeader.biBitCount)
+  {
+    dprintf(("GDI32: CreateDIBitmap: color depths of bitmaps differ! (%d,%d\n",
+             lpbmih->biBitCount,
+             lpbmi->bmiHeader.biBitCount));
+             
+    ((BITMAPINFOHEADER *)lpbmih)->biBitCount = lpbmi->bmiHeader.biBitCount;
+  }
+
+  rc = O32_CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage);
+
+  dprintf(("GDI32: CreateDIBitmap %x %x %x %x returned %x", hdc, fdwInit, lpbInit, fuUsage, rc));
+
+  ((BITMAPINFOHEADER *)lpbmih)->biHeight   = iHeight;
+  ((BITMAPINFOHEADER *)lpbmih)->biBitCount = biBitCount;
+
+  return rc;
 }
 //******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.101 2000-08-30 13:55:28 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.102 2000-09-01 01:36:15 phaller Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -783 +783 @@
                 return (MRESULT)rc;
         } 
-        if(usSetFocus) 
-        {
-          Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndLoseFocus);
-          if(!(fsFocusChange & FC_NOLOSEACTIVE)) {
-                if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) {
-                        if(winfocus) {
-                                WinSendMsg(winfocus->GetTopParent()->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-                        }
-                        else    WinSendMsg(hwndLoseFocus, WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-                }
-          }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL) {
-                return (MRESULT)rc;
-          } 
-          if(!(fsFocusChange & FC_NOSETACTIVE)) 
-          {
-                Win32BaseWindow *topparent = win32wnd->GetTopParent();
-                if(!winfocus || (winfocus->GetTopParent() != topparent)) 
-                {
-                        if(!(fsFocusChange & FC_NOBRINGTOTOP)) 
-                        {
-                                if(topparent) {
-                                        //put window at the top of z order
-                                        WinSetWindowPos(topparent->getOS2WindowHandle(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
-                                }
-                        }
-                        WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-                }
-          }
-        }
-        else 
-        {
-          Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndGainFocus);
-          if(!(fsFocusChange & FC_NOLOSEACTIVE)) {
-                if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) {
-                        WinSendMsg(win32wnd->GetTopParent()->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-                }
-          }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL) {
-                return (MRESULT)rc;
-          } 
-          if(!(fsFocusChange & FC_NOSETACTIVE)) {
-                if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) {
-                        if(winfocus) {
-                                WinSendMsg(winfocus->GetTopParent()->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-                        }
-                        else    WinSendMsg(hwndGainFocus, WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-                }
-          }
-        }
+      
+      
+      if(usSetFocus)
+      {
+        Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndLoseFocus);
+        if(!(fsFocusChange & FC_NOLOSEACTIVE))
+        {
+          if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) 
+          {
+            if(winfocus)
+              WinSendMsg(winfocus->GetTopParent()->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
+            else        
+              WinSendMsg(hwndLoseFocus, WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
+          }
+        }
+        //SvL: Check if window is still valid
+        win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+        if(win32wnd == NULL)
+          return (MRESULT)rc;
+
+        if(!(fsFocusChange & FC_NOSETACTIVE))
+        {
+          Win32BaseWindow *topparent = win32wnd->GetTopParent();
+          if(!winfocus || (winfocus->GetTopParent() != topparent))
+          {
+            if(!(fsFocusChange & FC_NOBRINGTOTOP))
+            {
+              if(topparent) {
+                //put window at the top of z order
+                WinSetWindowPos(topparent->getOS2WindowHandle(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
+              }
+            }
+
+            // PH 2000/09/01 Netscape 4.7
+            // check if topparent is valid
+            if (topparent)
+              WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
+          }
+        }
+      }
+      else /* no usSetFocus */
+      {
+        Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndGainFocus);
+        if(!(fsFocusChange & FC_NOLOSEACTIVE)) 
+        {
+          Win32BaseWindow *topparent = win32wnd->GetTopParent();
+          
+          if(!winfocus || (winfocus->GetTopParent() != topparent))
+          {
+            // PH 2000/09/01 Netscape 4.7
+            // check if topparent is valid
+            if (topparent)
+              WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
+          }
+        }
+        //SvL: Check if window is still valid
+        win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+        if(win32wnd == NULL)
+          return (MRESULT)rc;
+
+        if(!(fsFocusChange & FC_NOSETACTIVE)) 
+        {
+          if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) 
+          {
+            if(winfocus)
+            {
+              // PH 2000/09/01 Netscape 4.7
+              // check if topparent is valid
+              Win32BaseWindow *topparent = winfocus->GetTopParent();
+              if (topparent)
+                WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
+            }
+            else        
+              WinSendMsg(hwndGainFocus, WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
+          }
+        }
+      }
+      
+      
         //TODO: Don't send WM_SETSELECTION to child window if frame already has selection
         if(!(fsFocusChange & FC_NOSETSELECTION)) {