[janderwald] 57719: - Fix build - Partly revert 57718

Author: janderwald
Date: Sat Nov 17 16:01:29 2012
New Revision: 57719

URL: http://svn.reactos.org/svn/reactos?rev=57719&view=rev
Log:
- Fix build
- Partly revert 57718

Modified:
    trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt
    trunk/reactos/base/applications/cmdutils/doskey/doskey.c
    trunk/reactos/base/system/diskpart/CMakeLists.txt
    trunk/reactos/base/system/diskpart/diskpart.c

Modified: trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Sat Nov 17
16:01:29 2012
@@ -3,6 +3,6 @@
 
 add_executable(doskey doskey.c doskey.rc)
 
-set_module_type(doskey win32cui)
+set_module_type(doskey win32cui UNICODE)
 add_importlibs(doskey user32 msvcrt kernel32)
 add_cd_file(TARGET doskey DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Sat Nov 17
16:01:29 2012
@@ -72,19 +72,19 @@
         temp = *nameend;
         *nameend = L'\0';
         /* Don't allow spaces in the name, since such a macro would be unusable */
-        if (!wcschr(name, L' ') && AddConsoleAlias(name, text,
pszExeName))
+        if (!wcschr(name, L' ') && AddConsoleAliasW(name, text,
pszExeName))
             return 0;
         *nameend = temp;
     }
 
-    LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
+    LoadStringW(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
     wprintf(szStringBuf, definition);
     return 1;
 }
 
 static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent)
 {
-    DWORD Length = GetConsoleAliasesLength(pszExeName);
+    DWORD Length = GetConsoleAliasesLengthW(pszExeName);
     PBYTE AliasBuf;
     WCHAR *Alias;
     WCHAR *AliasEnd;
@@ -96,7 +96,7 @@
     Alias = (WCHAR *)AliasBuf;
     AliasEnd = (WCHAR *)&AliasBuf[Length];
 
-    if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName))
+    if (GetConsoleAliasesW(Alias, Length * sizeof(BYTE), pszExeName))
         for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1)
             wprintf(L"%s%s\n", Indent, Alias);
 
@@ -117,7 +117,7 @@
     ExeName = (WCHAR *)ExeNameBuf;
     ExeNameEnd = (WCHAR *)&ExeNameBuf[Length];
 
-    if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE)))
+    if (GetConsoleAliasExesW(ExeName, Length * sizeof(BYTE)))
     {
         for (; ExeName < ExeNameEnd; ExeName += wcslen(ExeName) + 1)
         {
@@ -199,7 +199,7 @@
 
     /* Get the full command line using GetCommandLine(). We can't just use argv,
      * because then a parameter like "gotoroot=cd \" wouldn't be passed
completely. */
-    pArgEnd = GetCommandLine();
+    pArgEnd = GetCommandLineW();
 	hKernel32 = LoadLibraryW(L"kernel32.dll");
 
 	/* Get function pointers */
@@ -222,7 +222,7 @@
 
         if (!wcscmp(pArgStart, L"/?"))
         {
-            LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
+            LoadStringW(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
             wprintf(szStringBuf);
             break;
         }

Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake…
==============================================================================
--- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sat Nov 17 16:01:29
2012
@@ -41,7 +41,7 @@
 	uniqueid.c
 	diskpart.rc)
 
-set_module_type(diskpart win32cui)
+set_module_type(diskpart win32cui UNICODE)
 add_importlibs(diskpart user32 msvcrt kernel32)
 if(MSVC)
 add_importlibs(diskpart ntdll)

Modified: trunk/reactos/base/system/diskpart/diskpart.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp…
==============================================================================
--- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Sat Nov 17 16:01:29 2012
@@ -31,7 +31,7 @@
     DWORD comp_size = MAX_STRING_SIZE;
 
     /* Get the name of the computer for us and change the value of comp_name */
-    GetComputerName(szComputerName, &comp_size);
+    GetComputerNameW(szComputerName, &comp_size);
 
     /* TODO: Remove this section of code when program becomes stable enough for
production use. */
     wprintf(L"\n*WARNING*: This program is incomplete and may not work
properly.\n");