Changeset 21808 for branches/gcc-kmk/src/user32/pmwindow.cpp

Timestamp:

Nov 14, 2011, 11:03:47 PM (14 years ago)

Author:

dmik

Message:

Port USER32.DLL (continued).

File:

• branches/gcc-kmk/src/user32/pmwindow.cpp (modified) (4 diffs)

branches/gcc-kmk/src/user32/pmwindow.cpp

@@ -32 +32 @@
 #include <wprocess.h>
 #include <dbglog.h>
-#include <win32wbase.h>
-#include <win32wfake.h>
-#include <win32dlg.h>
+#include "win32wbase.h"
+#include "win32wfake.h"
+#include "win32dlg.h"
 #include "win32wdesktop.h"
 #include "pmwindow.h"
@@ -257 +257 @@
     HDC   hdc;              /* Device-context handle                */
     /* context data structure */
-    DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
+    DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
                         NULL, NULL, NULL};
 
@@ -328 +328 @@
         HMODULE hModDisplay;
         HDC   hdc;              /* Device-context handle                */
-        DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
+        DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
                             NULL, NULL, NULL};
 
@@ -2526 +2526 @@
 PVOID PMWinSubclassFakeWindow(HWND hwndOS2)
 {
-    return WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
+    return (PVOID)WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
 }
 //******************************************************************************