Changeset 1194 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 8, 1999, 8:39:35 PM (26 years ago)

Author:

sandervl

Message:

Property fixes, set last error when window creation fails

File:

• trunk/src/user32/win32wbase.cpp (modified) (9 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.30 1999-10-08 16:13:08 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.31 1999-10-08 18:39:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -306 +306 @@
         {
             dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return FALSE;
         }
@@ -320 +321 @@
             {
                 dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
+                SetLastError(ERROR_INVALID_WINDOW_HANDLE);
                 return FALSE;
             }
@@ -450 +452 @@
   if(OS2Hwnd == 0) {
         dprintf(("Window creation failed!!"));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
         return FALSE;
   }
@@ -455 +458 @@
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
         dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2Hwnd));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
         return FALSE;
   }
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
         dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
         return FALSE;
   }
@@ -464 +469 @@
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
         dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
         return FALSE;
   }
@@ -470 +476 @@
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
             dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2HwndFrame));
+            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
             return FALSE;
     }
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
             dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
+            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
             return FALSE;
     }
@@ -479 +487 @@
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
             dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
+            SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
             return FALSE;
     }
@@ -576 +585 @@
         }
   }
+  dprintf(("Window creation FAILED (NCCREATE cancelled creation)"));
   fCreated = FALSE;
   OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
   OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
   DestroyWindow();
+  SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
   return FALSE;
 }