Changeset 1296 for trunk/src

Timestamp:

Oct 14, 1999, 7:21:14 PM (26 years ago)

Author:

phaller

Message:

Fix: RegConnectRegistry slightly improved.

File:

• trunk/src/advapi32/registry.cpp (modified) (7 diffs)

trunk/src/advapi32/registry.cpp

@@ -1 @@
-/* $Id: registry.cpp,v 1.3 1999-09-02 19:39:08 phaller Exp $ */
+/* $Id: registry.cpp,v 1.4 1999-10-14 17:21:14 phaller Exp $ */
 
 /*
@@ -17 +17 @@
  * Includes                                                                  *
  *****************************************************************************/
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
 
 #include <os2win.h>
@@ -28 +32 @@
 #include <winreg.h>
 
-ODINDEBUGCHANNEL(ADVAPI32)
+
+ODINDEBUGCHANNEL(ADVAPI32-REGISTRY)
 
 
@@ -749 +754 @@
                                    PLONG, arg4)
 {
+  dprintf(("ADVAPI32:Registry key=%s\n",
+           arg2));
   return _O32_RegQueryValue(ConvertKey(arg1),
                            arg2,
@@ -811 +818 @@
                                     LPDWORD,arg6)
 {
+  dprintf(("ADVAPI32:Registry key=%s\n",
+           arg2));
   return _O32_RegQueryValueEx(ConvertKey(arg1),
                              arg2,
@@ -1029 +1038 @@
                                        PHKEY, phkResult)
 {
-  dprintf(("ADVAPI32: RegConnectRegistryA not implemented yet."));
-
-  if (lpszComputerName == NULL) /* local registry ? */
+  char szLocalName[256];
+  DWORD dwNameLength = sizeof(szLocalName)-2;
+
+  szLocalName[0] = '\\';
+  szLocalName[1] = '\\';
+  GetComputerNameA(szLocalName+2, &dwNameLength);
+
+  dprintf(("ADVAPI32: RegConnectRegistryA(%s,local %s) not implemented yet.\n",
+           lpszComputerName,
+           szLocalName));
+
+  /* local registry ? */
+  if ( (                    lpszComputerName  == NULL) ||
+       (strcmp(szLocalName, lpszComputerName) == 0   ) )
   {
     /* @@@PH experimental !!! */
@@ -1039 +1059 @@
   }
 
-  // @@@PH 1999/06/09 always fake this API
-  *phkResult = hKey;
-  return (NO_ERROR);
+  return (ERROR_ACCESS_DENIED);
 }