[APPHELP_APITEST] Fix build, addendum to commit a8755711b

modules/rostests/apitests/apphelp/apphelp_apitest.h

@@ -21,9 +21,9 @@ void silence_debug_output(void);        // Silence output if the environment var
 #define test_create_ne      (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_ne_imp
 
 /* register.cpp */
-BOOL IsUserAdmin();
+BOOL IsUserAdmin(VOID);
 
-static DWORD g_WinVersion;
+extern DWORD g_WinVersion;
 
 #define WINVER_ANY     0
 #define WINVER_WINXP   0x0501

modules/rostests/apitests/apphelp/data.c

@@ -792,7 +792,7 @@ void test_create_db_imp(const WCHAR* name, int win10)
     }
 }
 
-static DWORD g_WinVersion;
+DWORD g_WinVersion;
 DWORD get_host_winver(void)
 {
     if (!g_WinVersion)

modules/rostests/apitests/apphelp/register.cpp

@@ -13,8 +13,6 @@
 #include <strsafe.h>
 #include "wine/test.h"
 
-#include "apphelp_apitest.h"
-
 static const unsigned char rawDB[] =
 {
     /* Header: Major,           Minor,                      'sdbf' */
@@ -79,7 +77,8 @@ BOOL (WINAPI *pSdbRegisterDatabaseEx)(LPCWSTR pszDatabasePath, DWORD dwDatabaseT
 BOOL (WINAPI *pSdbUnregisterDatabase)(REFGUID pguidDB);
 
 
-BOOL IsUserAdmin()
+extern "C"
+BOOL IsUserAdmin(VOID)
 {
     BOOL Result;
     SID_IDENTIFIER_AUTHORITY NtAuthority = { SECURITY_NT_AUTHORITY };