Paul Vriens : advapi32/tests: Make tests run on win9x/NT4 again.
Alexandre Julliard
julliard at winehq.org
Wed Jan 23 05:25:05 CST 2008
Module: wine
Branch: master
Commit: 44273b00ed3e34f95581dad276648e680c4d7119
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44273b00ed3e34f95581dad276648e680c4d7119
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Wed Jan 23 10:33:48 2008 +0100
advapi32/tests: Make tests run on win9x/NT4 again.
---
dlls/advapi32/tests/service.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index fff5f24..38df62b 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -857,6 +857,8 @@ static void test_queryconfig2(void)
static const CHAR password [] = "";
static const CHAR description [] = "Description";
HMODULE dllhandle = GetModuleHandleA("advapi32.dll");
+ BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID)
+ = (void*)GetProcAddress(dllhandle, "ChangeServiceConfig2A");
BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD)
= (void*)GetProcAddress(dllhandle, "QueryServiceConfig2A");
BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD)
@@ -957,8 +959,14 @@ static void test_queryconfig2(void)
ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed);
+ if(!pChangeServiceConfig2A)
+ {
+ skip("function ChangeServiceConfig2A not present\n");
+ goto cleanup;
+ }
+
pConfig->lpDescription = (LPSTR) description;
- ret = ChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer);
+ ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer);
ok(ret, "ChangeServiceConfig2A failed\n");
if (!ret) {
goto cleanup;
More information about the wine-cvs
mailing list