[ROSAUTOTEST]

[reactos.git] / rostests / rosautotest / precomp.h

diff --git a/rostests/rosautotest/precomp.h b/rostests/rosautotest/precomp.h
index f5e65ad..adb25fb 100644 (file)
--- a/rostests/rosautotest/precomp.h
+++ b/rostests/rosautotest/precomp.h
@@ -1,15 +1,22 @@
+#ifndef _ROSAUTOTEST_H_
+#define _ROSAUTOTEST_H_
+
 /* General includes */
 #include <iostream>
 #include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
+#include <iomanip>
 
 using namespace std;
 
 #define WIN32_NO_STATUS
-#include <windows.h>
-#include <ndk/rtlfuncs.h>
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
+#include <winbase.h>
+#include <winnls.h>
 #include <reason.h>
 #include <shlobj.h>
 #include <wininet.h>
@@ -50,13 +57,8 @@ string EscapeString(const char* Input);
 string EscapeString(const string& Input);
 string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName);
 bool IsNumber(const char* Input);
-void StringOut(const string& String);
+string StringOut(const string& String, bool forcePrint = true);
 string UnicodeToAscii(PCWSTR UnicodeString);
 string UnicodeToAscii(const wstring& UnicodeString);
 
-
-/* Lazy HACK to allow compiling/debugging with MSVC while we lack support
-   for linking against "debugsup_ntdll" in MSVC */
-#ifdef _MSC_VER
-    #define DbgPrint
-#endif
+#endif /* _ROSAUTOTEST_H_ */