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

Timestamp:

Feb 5, 2000, 8:45:19 PM (26 years ago)

Author:

cbratschi

Message:

several fixes -> changelog

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.153 2000-02-05 16:24:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.154 2000-02-05 19:45:17 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -124 +124 @@
   userData         = 0;
   contextHelpId    = 0;
+  hotkey           = 0;
 
   pOldFrameProc = NULL;
@@ -236 +237 @@
  char  buffer[256];
  POINT maxSize, maxPos, minTrack, maxTrack;
+ BOOL  xDefault = FALSE,cxDefault = FALSE;
 
 #ifdef DEBUG
@@ -308 +310 @@
   if ((cs->x == CW_USEDEFAULT) || (cs->x == CW_USEDEFAULT16))
   {
-//        PDB *pdb = PROCESS_Current();
-
        /* Never believe Microsoft's documentation... CreateWindowEx doc says
         * that if an overlapped window is created with WS_VISIBLE style bit
@@ -329 +329 @@
 
         /* We have saved cs->y, now we can trash it */
-#if 0
-        if (   !(cs->style & (WS_CHILD | WS_POPUP))
-            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USEPOSITION) )
-        {
-            cs->x = pdb->env_db->startup_info->dwX;
-            cs->y = pdb->env_db->startup_info->dwY;
-        }
-#endif
-            cs->x = 0;
-            cs->y = 0;
-//        }
+        cs->x = 0;
+        cs->y = 0;
+        xDefault = TRUE;
   }
   if ((cs->cx == CW_USEDEFAULT) || (cs->cx == CW_USEDEFAULT16))
   {
-#if 0
-        PDB *pdb = PROCESS_Current();
-        if (   !(cs->style & (WS_CHILD | WS_POPUP))
-            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USESIZE) )
-        {
-            cs->cx = pdb->env_db->startup_info->dwXSize;
-            cs->cy = pdb->env_db->startup_info->dwYSize;
-        }
-        else
-        {
-#endif
-            cs->cx = 600; /* FIXME */
-            cs->cy = 400;
-//        }
+        cs->cx = 600; /* FIXME */
+        cs->cy = 400;
+        cxDefault = TRUE;
   }
 
@@ -459 +440 @@
         vertScrollInfo->MaxVal = 100;
         vertScrollInfo->flags  = ESB_ENABLE_BOTH;
+  }
+
+  if(HIWORD(cs->lpszName))
+  {
+    if (!isUnicode)
+    {
+        wndNameLength = strlen(cs->lpszName);
+        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
+        strcpy(windowNameA,cs->lpszName);
+        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+        lstrcpyAtoW(windowNameW,windowNameA);
+        windowNameA[wndNameLength] = 0;
+        windowNameW[wndNameLength] = 0;
+    }
+    else
+    {
+        wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
+        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
+        lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
+        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+        lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
+        windowNameA[wndNameLength] = 0;
+        windowNameW[wndNameLength] = 0;
+    }
+  }
+
+  //copy pointer of CREATESTRUCT for usage in MsgCreate method
+  tmpcs = cs;
+
+  //Store our window object pointer in thread local memory, so PMWINDOW.CPP can retrieve it
+  THDB *thdb = GetThreadTHDB();
+
+  if(thdb == NULL) {
+        dprintf(("Window creation failed - thdb == NULL")); //this is VERY bad
+        ExitProcess(666);
+        return FALSE;
+  }
+
+  thdb->newWindow = (ULONG)this;
+
+  DWORD dwOSWinStyle;
+
+  OSLibWinConvertStyle(dwStyle,dwExStyle,&dwOSWinStyle);
+  if (((dwStyle & (WS_CAPTION | WS_SYSMENU | 0xC0000000)) == (WS_CAPTION | WS_SYSMENU))) fTaskList = TRUE;
+
+  OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
+                                 dwOSWinStyle,(char *)windowNameA,
+                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
+                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
+                                 &OS2HwndFrame, 0, fTaskList,xDefault | cxDefault,windowClass->getStyle() & CS_SAVEBITS);
+  if(OS2Hwnd == 0) {
+        dprintf(("Window creation failed!!"));
+        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
+        return FALSE;
+  }
+
+  //adjust CW_USEDEFAULT position
+  if (xDefault | cxDefault)
+  {
+    RECT rect;
+
+    OSLibWinQueryWindowRect(OS2HwndFrame,&rect,RELATIVE_TO_SCREEN);
+    if (getParent()) mapWin32Rect(OSLIB_HWND_DESKTOP,getParent()->getOS2FrameWindowHandle(),&rect);
+    if (xDefault)
+    {
+      cs->x = rect.left;
+      cs->y = rect.top;
+    }
+    if (cxDefault)
+    {
+      cs->cx = rect.right-rect.left;
+      cs->cy = rect.bottom-rect.top;
+    }
   }
 
@@ -480 +534 @@
         if (cs->cx <= 0) cs->cx = 1;
         if (cs->cy <= 0) cs->cy = 1;
-  }
-
-  if(((dwStyle & 0xC0000000) == WS_OVERLAPPED) && ((dwStyle & WS_CAPTION) == WS_CAPTION) && owner == NULL
-     && dwStyle & WS_SYSMENU)
-  {
-        fTaskList = TRUE;
-  }
-
-  DWORD dwOSWinStyle;
-
-  OSLibWinConvertStyle(dwStyle, &dwExStyle, &dwOSWinStyle);
-
-  if(HIWORD(cs->lpszName))
-  {
-    if (!isUnicode)
-    {
-        wndNameLength = strlen(cs->lpszName);
-        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-        strcpy(windowNameA,cs->lpszName);
-        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-        lstrcpyAtoW(windowNameW,windowNameA);
-        windowNameA[wndNameLength] = 0;
-        windowNameW[wndNameLength] = 0;
-    }
-    else
-    {
-        wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
-        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-        lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
-        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-        lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
-        windowNameA[wndNameLength] = 0;
-        windowNameW[wndNameLength] = 0;
-    }
-  }
-
-  //copy pointer of CREATESTRUCT for usage in MsgCreate method
-  tmpcs = cs;
-
-  //Store our window object pointer in thread local memory, so PMWINDOW.CPP can retrieve it
-  THDB *thdb = GetThreadTHDB();
-
-  if(thdb == NULL) {
-        dprintf(("Window creation failed - thdb == NULL")); //this is VERY bad
-        ExitProcess(666);
-        return FALSE;
-  }
-
-  thdb->newWindow = (ULONG)this;
-
-  OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 dwOSWinStyle,(char *)windowNameA,
-                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
-                                 &OS2HwndFrame, 0, fTaskList,windowClass->getStyle() & CS_SAVEBITS);
-  if(OS2Hwnd == 0) {
-        dprintf(("Window creation failed!!"));
-        SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
-        return FALSE;
   }
 
@@ -1599 +1594 @@
     }
 
+    case WM_SETHOTKEY:
+        hotkey = wParam;
+        return 1; //CB: always successful
+
+    case WM_GETHOTKEY:
+        return hotkey;
+
+    case WM_CONTEXTMENU:
+        if ((dwStyle & WS_CHILD) && getParent())
+          getParent()->SendInternalMessageA(WM_CONTEXTMENU,wParam,lParam);
+        return 0;
+
     case WM_SHOWWINDOW:
         if (!lParam) return 0; /* sent from ShowWindow */
@@ -1616 +1623 @@
 
     case WM_QUERYDROPOBJECT:
-        if (dwExStyle & WS_EX_ACCEPTFILES) return 1;
-        return 0;
+        return (dwExStyle & WS_EX_ACCEPTFILES) ? 1:0;
 
     case WM_QUERYDRAGICON:
@@ -1639 +1645 @@
 
     case WM_NOTIFYFORMAT:
-        if (IsWindowUnicode()) return NFR_UNICODE;
-        else return NFR_ANSI;
+        return IsWindowUnicode() ? NFR_UNICODE:NFR_ANSI;
 
     case WM_SETICON: