[ros-diffs] [hpoussin] 33369: Don't depend of UNICODE/_UNICODE

Author: hpoussin
Date: Thu May  8 11:29:50 2008
New Revision: 33369

URL: http://svn.reactos.org/svn/reactos?rev=33369&view=rev
Log:
Don't depend of UNICODE/_UNICODE

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
    trunk/reactos/subsystems/win32/win32k/ntuser/painting.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus...
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu May  8 11:29:50 2008
@@ -1043,7 +1043,7 @@
 NtUserEnumDisplayDevices (
   PUNICODE_STRING lpDevice, /* device name */
   DWORD iDevNum, /* display device */
-  PDISPLAY_DEVICE lpDisplayDevice, /* device information */
+  PDISPLAY_DEVICEW lpDisplayDevice, /* device information */
   DWORD dwFlags ); /* reserved */

/*BOOL

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu May  8 11:29:50 2008
@@ -160,7 +160,7 @@
 NtUserEnumDisplayDevices (
    PUNICODE_STRING lpDevice, /* device name */
    DWORD iDevNum, /* display device */
-   PDISPLAY_DEVICE lpDisplayDevice, /* device information */
+   PDISPLAY_DEVICEW lpDisplayDevice, /* device information */
    DWORD dwFlags ) /* reserved */
 {
    DPRINT1("NtUserEnumDisplayDevices() is UNIMPLEMENTED!\n");

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu May  8 11:29:50 2008
@@ -1565,7 +1565,7 @@
 {
    HFONT hOldFont = NULL, hFont = NULL;
    COLORREF OldTextColor;
-   NONCLIENTMETRICS nclm;
+   NONCLIENTMETRICSW nclm;
    NTSTATUS Status;
    #ifndef NDEBUG
    INT i;