[ros-diffs] [fireball] 42199: - Move winternl.h inclusion from wine/server.h to the actual C files. Next step could be killing winternl.h usage. - Slightly experiment with SwitchDesktop, doesn't fix anything yet.

Author: fireball
Date: Sat Jul 25 11:52:04 2009
New Revision: 42199

URL: http://svn.reactos.org/svn/reactos?rev=42199&view=rev
Log:
- Move winternl.h inclusion from wine/server.h to the actual C files. Next step could be
killing winternl.h usage.
- Slightly experiment with SwitchDesktop, doesn't fix anything yet.

Modified:
    branches/arwinss/reactos/dll/win32/user32/caret.c
    branches/arwinss/reactos/dll/win32/user32/menu.c
    branches/arwinss/reactos/dll/win32/user32/message.c
    branches/arwinss/reactos/dll/win32/user32/painting.c
    branches/arwinss/reactos/dll/win32/user32/property.c
    branches/arwinss/reactos/dll/win32/user32/win.c
    branches/arwinss/reactos/dll/win32/user32/winpos.c
    branches/arwinss/reactos/dll/win32/user32/winstation.c

Modified: branches/arwinss/reactos/dll/win32/user32/caret.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -30,6 +30,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "wine/debug.h"
 

Modified: branches/arwinss/reactos/dll/win32/user32/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -54,6 +54,7 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wownt32.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/exception.h"

Modified: branches/arwinss/reactos/dll/win32/user32/message.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -38,6 +38,7 @@
 #include "imm.h"
 #include "ddk/imm.h"
 #include "wine/unicode.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "user_private.h"
 #include "win.h"

Modified: branches/arwinss/reactos/dll/win32/user32/painting.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "win.h"
 #include "user_private.h"

Modified: branches/arwinss/reactos/dll/win32/user32/property.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -29,6 +29,7 @@
 #include "wownt32.h"
 #include "wine/unicode.h"
 #include "wine/winuser16.h"
+#include "winternl.h"
 #include "wine/server.h"
 
 /* size of buffer needed to store an atom string */

Modified: branches/arwinss/reactos/dll/win32/user32/win.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jul 25 11:52:04 2009
@@ -30,6 +30,7 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wownt32.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "win.h"
@@ -3400,9 +3401,9 @@
 {
     HWND hWnd;
 
-    FIXME("SwitchDesktop(hwnd %p) stub!\n", hDesktop);
-
     hWnd = GetDesktopWindow(/*hDesktop*/);
+
+    FIXME("SwitchDesktop(hDesktop %p, desk window %x) stub!\n", hDesktop,
hWnd);
 
     SetWindowPos(hWnd,
                  NULL, 0, 0,
@@ -3411,6 +3412,7 @@
                  SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW);
     UpdateWindow(hWnd);
 
+    RedrawWindow(NULL, NULL, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASENOW |
RDW_ALLCHILDREN);
 
     return TRUE;
 }

Modified: branches/arwinss/reactos/dll/win32/user32/winpos.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/winpos.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/winpos.c [iso-8859-1] Sat Jul 25 11:52:04
2009
@@ -30,6 +30,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winerror.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "controls.h"
 #include "user_private.h"

Modified: branches/arwinss/reactos/dll/win32/user32/winstation.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/winstation.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/winstation.c [iso-8859-1] Sat Jul 25
11:52:04 2009
@@ -28,6 +28,7 @@
 #include "winerror.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winternl.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"