[APPHELP][APPHELP_APITEST] Update db apitests to succeed from 2k3 to 10, paving the...

[reactos.git] / rostests / apitests / apphelp / apphelp.c

diff --git a/rostests/apitests/apphelp/apphelp.c b/rostests/apitests/apphelp/apphelp.c
index 4b8158f..d17afdc 100644 (file)
--- a/rostests/apitests/apphelp/apphelp.c
+++ b/rostests/apitests/apphelp/apphelp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012 Detlef Riekenberg
  * Copyright 2013 Mislav Blažević
- * Copyright 2016 Mark Jansen
+ * Copyright 2015,2016 Mark Jansen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,26 +36,7 @@
 
 #include "wine/test.h"
 
-/* data.c */
-void test_create_exe_imp(const char* name, int skip_rsrc_exports);
-void test_create_file_imp(const char* name, const char* contents, size_t len);
-void test_create_ne_imp(const char* name, int skip_names);
-DWORD get_host_winver(void);
-
-#define test_create_exe     (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_exe_imp
-#define test_create_file    (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_file_imp
-#define test_create_ne      (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_ne_imp
-
-
-static DWORD g_WinVersion;
-
-#define WINVER_ANY     0
-#define WINVER_WINXP   0x0501
-#define WINVER_2003    0x0502
-#define WINVER_VISTA   0x0600
-#define WINVER_WIN7    0x0601
-#define WINVER_WIN8    0x0602
-#define WINVER_WIN10   0x1000
+#include "apphelp_apitest.h"
 
 
 typedef WORD TAG;
@@ -131,7 +112,6 @@ static BOOL (WINAPI *pSdbFreeFileAttributes)(PATTRINFO);
 DEFINE_GUID(GUID_DATABASE_MSI,0xd8ff6d16,0x6a3a,0x468a,0x8b,0x44,0x01,0x71,0x4d,0xdc,0x49,0xea);
 DEFINE_GUID(GUID_DATABASE_SHIM,0x11111111,0x1111,0x1111,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11);
 DEFINE_GUID(GUID_DATABASE_DRIVERS,0xf9ab2228,0x3312,0x4a73,0xb6,0xf9,0x93,0x6d,0x70,0xe1,0x12,0xef);
-DEFINE_GUID(GUID_DATABASE_TEST,0x6E989AB7,0x864D,0x4575,0x87,0x34,0x90,0x36,0x4A,0xC6,0x4F,0xBD);
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 DEFINE_GUID(test_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c);
@@ -849,6 +829,8 @@ START_TEST(apphelp)
 {
     g_WinVersion = get_host_winver();
     trace("Detected version: 0x%x\n", g_WinVersion);
+    silence_debug_output();
+
     //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4");
     //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp");
     hdll = LoadLibraryA("apphelp.dll");