Changeset 21916 for trunk/src/user32/window.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/user32/window.cpp (modified) (22 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/user32/window.cpp

@@ -29 +29 @@
 #include <string.h>
 #include <stdio.h>
-#include <win32wbase.h>
-#include <win32wmdiclient.h>
-#include <win32wdesktop.h>
+#include "win32wbase.h"
+#include "win32wmdiclient.h"
+#include "win32wdesktop.h"
 #include "win32dlg.h"
-#include <oslibwin.h>
-#include <oslibgdi.h>
+#include "oslibwin.h"
+#include "oslibgdi.h"
 #include "user32.h"
 #include "winicon.h"
 #include "pmwindow.h"
 #include "oslibmsg.h"
-#include <win\winpos.h>
-#include <win\win.h>
+#include <win/winpos.h>
+#include <win/win.h>
 #include <heapstring.h>
 #include <winuser32.h>
@@ -52 +52 @@
 ODINDEBUGCHANNEL(USER32-WINDOW)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 //******************************************************************************
@@ -117 +120 @@
     else dprintf(("CreateWindowExA: window %s class %d parent %x (%d,%d) (%d,%d), %x %x menu=%x", windowName, className, parent, x, y, width, height, style, exStyle, menu));
 
-    if(!strcmpi(className, MDICLIENTCLASSNAMEA)) {
+    if(!stricmp(className, MDICLIENTCLASSNAMEA)) {
         window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, FALSE);
     }
     else
-    if(!strcmpi((char *) className, DIALOG_CLASS_NAMEA))
+    if(!stricmp((char *) className, DIALOG_CLASS_NAMEA))
     {
       DLG_TEMPLATE dlgTemplate = {0};
@@ -155 +158 @@
     }
     HWND hwnd = window->getWindowHandle();
-  
+
     // set myself as last active popup / window
     window->setLastActive( hwnd );
-  
+
     RELEASE_WNDOBJ(window);
     return hwnd;
@@ -262 +265 @@
     }
     HWND hwnd = window->getWindowHandle();
-  
+
     // set myself as last active popup / window
     window->setLastActive( hwnd );
-  
+
     RELEASE_WNDOBJ(window);
     return hwnd;
@@ -300 +303 @@
     }
     hwndActive = window->SetActiveWindow();
-  
+
     // check last active popup window
     if (hwndActive)
@@ -308 +311 @@
       dprintf(("support for last active popup incorrectly implemented"));
     }
-  
+
     RELEASE_WNDOBJ(window);
     return hwndActive;
@@ -561 +564 @@
     if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look )
     {
-        dprintf(("ShowWindow: Initiating OS/2 PM restore"));          
+        dprintf(("ShowWindow: Initiating OS/2 PM restore"));
         ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle());
     }
-    else   
+    else
         ret = window->ShowWindow(nCmdShow);
     RELEASE_WNDOBJ(window);
@@ -720 +723 @@
     ret = TRUE;
 
-    if(dwStyle & WS_CHILD) 
+    if(dwStyle & WS_CHILD)
     {
         //check visibility of parents
@@ -762 +765 @@
         //else no child -> no parent (GetParent returns owner otherwise!)
     }
-    else 
-    if (type == GA_ROOT) 
+    else
+    if (type == GA_ROOT)
     {
          hwndAncestor = window->GetTopParent();
     }
     else
-    if (type == GA_ROOTOWNER) 
-    {
-         if(hwnd != GetDesktopWindow()) 
+    if (type == GA_ROOTOWNER)
+    {
+         if(hwnd != GetDesktopWindow())
          {
              hwndAncestor = hwnd;
@@ -804 +807 @@
  TEB *teb;
 
-    dprintf(("SetFocus %x", hwnd));    
+    dprintf(("SetFocus %x", hwnd));
     teb = GetThreadTEB();
     if(teb == NULL) {
@@ -929 +932 @@
     lpThreadInfo->hwndActive  = GetActiveWindow();
     if(lpThreadInfo->hwndActive) {
-        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 
+        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL))
         {//this thread doesn't own the active window (TODO: correct??)
             lpThreadInfo->hwndActive = 0;
@@ -980 +983 @@
          windowDesktop->addRef();
          window = windowDesktop;
-    }     
+    }
     else window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-      
+
     if(!window) {
         dprintf(("GetWindowRect, window %x not found", hwnd));
@@ -1104 +1107 @@
  *      InternalGetWindowText    (USER32.326)
  */
-int WIN32API InternalGetWindowText(HWND hwnd, 
+int WIN32API InternalGetWindowText(HWND hwnd,
                                    LPWSTR lpString,
                                    INT    nMaxCount )
@@ -1274 +1277 @@
         windowDesktop->addRef();
         wndfrom = windowDesktop;
-    } 
+    }
     else {
         wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom);
@@ -1288 +1291 @@
         windowDesktop->addRef();
         wndto = windowDesktop;
-    } 
+    }
     else {
         wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo);
@@ -1887 +1890 @@
         {
 //            WND *wndPtr = WIN_FindWndPtr(hwndChild);
-            
+
 //            WINPOS_ShowIconTitle( wndPtr, FALSE );
-               
+
             SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
                             y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
@@ -2003 +2006 @@
 
   owner = Win32BaseWindow::GetWindowFromHandle(hWnd);
-  if(!owner) 
+  if(!owner)
   {
     dprintf(("GetLastActivePopup, window %x not found", hWnd));
@@ -2013 +2016 @@
   if (!IsWindow( hwndRetVal ))
     hwndRetVal = owner->getWindowHandle();
-  
+
   RELEASE_WNDOBJ(owner);
-  
+
   return hwndRetVal;
 }
@@ -2036 +2039 @@
     }
     RELEASE_WNDOBJ(window);
-    
+
     return dwThreadId;
 }
@@ -2220 +2223 @@
 }
 //******************************************************************************
-//The GetWindowModuleFileName function retrieves the full path and file name of 
+//The GetWindowModuleFileName function retrieves the full path and file name of
 //the module associated with the specified window handle.
 //******************************************************************************
@@ -2262 +2265 @@
   return (FALSE);
 }
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk