commit 9d519093f617b1856a6c33f5e99642567e291340
author Saulius Krasuckas <saulius.krasuckas@ieee.org> Fri Nov 04 11:15:59 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Nov 04 11:15:59 2005 +0000
tree de221edce7dcb22ec99e72f7eb4cee0ae4b9ed7d
parent 85b3f37d318b109ae1b2f284031f60e67b1399da

- RegConnectRegistryA fails on Win9x when Remote Registry Service is
  not installed (WinReg.DLL is missing).
- Test "\\" prefixed computer names too.

dlls/advapi32/tests/registry.c

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 90e64d6..738de73 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -601,22 +601,39 @@
 static void test_regconnectregistry( void)
 {
     CHAR compName[MAX_COMPUTERNAME_LENGTH + 1];
+    CHAR netwName[MAX_COMPUTERNAME_LENGTH + 3]; /* 2 chars for double backslash */
     DWORD len = sizeof(compName) ;
     BOOL ret;
     LONG retl;
     HKEY hkey;
     SC_HANDLE schnd;
+    DWORD GLE;
 
     ret = GetComputerNameA(compName, &len);
     ok( ret, "GetComputerName failed err = %ld\n", GetLastError());
     if( !ret) return;
 
+    lstrcpyA(netwName, "\\\\");
+    lstrcpynA(netwName+2, compName, MAX_COMPUTERNAME_LENGTH + 1);
+
     retl = RegConnectRegistryA( compName, HKEY_LOCAL_MACHINE, &hkey);
-    ok( !retl, "RegConnectRegistryA failed err = %ld\n", retl);
+    ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %ld\n", retl);
+    if( !retl) RegCloseKey( hkey);
+
+    retl = RegConnectRegistryA( netwName, HKEY_LOCAL_MACHINE, &hkey);
+    ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %ld\n", retl);
     if( !retl) RegCloseKey( hkey);
 
     schnd = OpenSCManagerA( compName, NULL, GENERIC_READ); 
-    ok( schnd != NULL, "OpenSCManagerA failed err = %ld\n", GetLastError());
+    GLE = GetLastError();
+    ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, 
+        "OpenSCManagerA failed err = %ld\n", GLE);
+    CloseServiceHandle( schnd);
+
+    schnd = OpenSCManagerA( netwName, NULL, GENERIC_READ); 
+    GLE = GetLastError();
+    ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, 
+        "OpenSCManagerA failed err = %ld\n", GLE);
     CloseServiceHandle( schnd);
 
 }