Module: wine Branch: master Commit: 7dd647b633c9cd733128978a069a816ccf09a9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd647b633c9cd733128978a06...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Wed Apr 11 08:39:34 2007 +0200
advapi32/tests: Use skip when OpenSCManagerA is not implemented.
---
dlls/advapi32/tests/registry.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0b6a25a..9d2a544 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -754,8 +754,8 @@ static void test_regconnectregistry( void) LONG retl; HKEY hkey; SC_HANDLE schnd; - DWORD GLE;
+ SetLastError(0xdeadbeef); ret = GetComputerNameA(compName, &len); ok( ret, "GetComputerName failed err = %d\n", GetLastError()); if( !ret) return; @@ -771,16 +771,20 @@ static void test_regconnectregistry( void) ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey);
+ SetLastError(0xdeadbeef); schnd = OpenSCManagerA( compName, NULL, GENERIC_READ); - GLE = GetLastError(); - ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, - "OpenSCManagerA failed err = %d\n", GLE); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("OpenSCManagerA is not implemented\n"); + return; + } + + ok( schnd != NULL, "OpenSCManagerA failed err = %d\n", GetLastError()); CloseServiceHandle( schnd);
+ SetLastError(0xdeadbeef); schnd = OpenSCManagerA( netwName, NULL, GENERIC_READ); - GLE = GetLastError(); - ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, - "OpenSCManagerA failed err = %d\n", GLE); + ok( schnd != NULL, "OpenSCManagerA failed err = %d\n", GetLastError()); CloseServiceHandle( schnd);
}