[GDIHV]

Don't define UNICODE in source.

svn path=/trunk/; revision=69827

diff --git a/rosapps/applications/devutils/gdihv/CMakeLists.txt b/rosapps/applications/devutils/gdihv/CMakeLists.txt
index 1ede06a..44ae228 100644 (file)
--- a/rosapps/applications/devutils/gdihv/CMakeLists.txt
+++ b/rosapps/applications/devutils/gdihv/CMakeLists.txt
@@ -7,6 +7,6 @@ list(APPEND SOURCE
        proclist.c)
 
 add_executable(gdihv ${SOURCE})
-set_module_type(gdihv win32cui)
+set_module_type(gdihv win32cui UNICODE)
 add_importlibs(gdihv user32 comctl32 psapi msvcrt kernel32)
 add_cd_file(TARGET gdihv DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/devutils/gdihv/gdihv.c b/rosapps/applications/devutils/gdihv/gdihv.c
index 23b2f65..2a2b815 100644 (file)
--- a/rosapps/applications/devutils/gdihv/gdihv.c
+++ b/rosapps/applications/devutils/gdihv/gdihv.c
@@ -34,9 +34,9 @@ MyGdiQueryTable()
        return pPeb->GdiSharedHandleTable;\r
 }\r
 \r
-int WINAPI WinMain (HINSTANCE hThisInstance,\r
+int WINAPI _tWinMain (HINSTANCE hThisInstance,\r
                     HINSTANCE hPrevInstance,\r
-                    LPSTR lpszArgument,\r
+                    LPTSTR lpszArgument,\r
                     int nStyle)\r
 \r
 {\r

diff --git a/rosapps/applications/devutils/gdihv/gdihv.h b/rosapps/applications/devutils/gdihv/gdihv.h
index fda1677..3a84158 100644 (file)
--- a/rosapps/applications/devutils/gdihv/gdihv.h
+++ b/rosapps/applications/devutils/gdihv/gdihv.h
@@ -1,8 +1,7 @@
 #ifndef _GDIHV_H\r
 #define _GDIHV_H\r
 \r
-#define UNICODE\r
-\r
+#include <tchar.h>\r
 #define WIN32_NO_STATUS\r
 #include <windows.h>\r
 #include <commctrl.h>\r