Changeset 42149 in vbox

Timestamp:

Jul 13, 2012 3:22:03 PM (12 years ago)

Author:

vboxsync

Message:

Drop the TCHAR charade and make it build against current sdk. :-)

Location:

trunk/src/VBox/Additions/common/VBoxService/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstUserInfo.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk

@@ -28 +28 @@
 #
 tstUserInfo_TEMPLATE    = VBOXGUESTR3EXE
-tstUserInfo_DEFS.win    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
 tstUserInfo_SOURCES     = \
         tstUserInfo.cpp

trunk/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp

@@ -21 +21 @@
 *******************************************************************************/
 #ifdef RT_OS_WINDOWS
-# include <windows.h>
-# include <tchar.h>
+# include <Windows.h>
 # include <stdio.h>
 # include <Shlobj.h>
@@ -50 +49 @@
     }
 #ifdef RT_OS_WINDOWS
-    TCHAR szPath[MAX_PATH];
-    HRESULT hRes = SHGetFolderPath(0, CSIDL_APPDATA, 0, 0, szPath);
+    WCHAR   wszPath[MAX_PATH];
+    HRESULT hRes = SHGetFolderPathW(0, CSIDL_APPDATA, 0, 0, wszPath);
 
     if (SUCCEEDED(hRes))
     {
-        RTPrintf("SHGetFolderPathW (CSIDL_APPDATA) = %ls\n", szPath);
-        hRes = SHGetFolderPath(0, CSIDL_PERSONAL, 0, 0, szPath);
+        RTPrintf("SHGetFolderPathW (CSIDL_APPDATA) = %ls\n", wszPath);
+        hRes = SHGetFolderPathW(0, CSIDL_PERSONAL, 0, 0, wszPath);
         if (SUCCEEDED(hRes))
         {
-            RTPrintf("SHGetFolderPathW (CSIDL_PERSONAL) = %ls\n", szPath);
+            RTPrintf("SHGetFolderPathW (CSIDL_PERSONAL) = %ls\n", wszPath);
         }
         else
@@ -74 +73 @@
     RTPrintf("APPDATA = %s\n", getenv("APPDATA"));
 #endif
-    return RT_SUCCESS(rc) ? 0 : 1;
+    return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }