From 4a7515fc0e5368066cd00eb365b1425f2a2925fe Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Tue, 8 Feb 2000 01:31:16 +0000 Subject: [PATCH] Cleaning up. No changes in executable code. git-svn-id: svn://10.0.0.236/trunk@60027 18797224-902f-48f8-a5cc-f745e15eee43 --- .../modules/plugin/base/src/nsPluginsDirWin.cpp | 14 +------------- mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp index 9db5d09352b..fba8db5c3af 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp @@ -160,12 +160,6 @@ nsPluginsDir::nsPluginsDir(PRUint16 location) char szKey[512] = "Software\\Netscape\\Netscape Navigator"; path[0] = 0; -/* - result = ::RegOpenKeyEx(HKEY_CURRENT_USER, - "Software\\Netscape\\Netscape Navigator\\Main", - 0, KEY_READ, &keyloc); -*/ - result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_READ, &keyloc); if (result == ERROR_SUCCESS) @@ -181,18 +175,12 @@ nsPluginsDir::nsPluginsDir(PRUint16 location) PL_strcat(szKey, "\\Main"); result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_READ, &keyloc); } -/**/ + if (result == ERROR_SUCCESS) { pathlen = sizeof(path); result = ::RegQueryValueEx(keyloc, "Plugins Directory", NULL, &type, (LPBYTE)&path, &pathlen); -/* - if (result == ERROR_SUCCESS) - { - PL_strcat(path, "\\Program\\Plugins"); - } -*/ ::RegCloseKey(keyloc); } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp b/mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp index 9db5d09352b..fba8db5c3af 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginsDirWin.cpp @@ -160,12 +160,6 @@ nsPluginsDir::nsPluginsDir(PRUint16 location) char szKey[512] = "Software\\Netscape\\Netscape Navigator"; path[0] = 0; -/* - result = ::RegOpenKeyEx(HKEY_CURRENT_USER, - "Software\\Netscape\\Netscape Navigator\\Main", - 0, KEY_READ, &keyloc); -*/ - result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_READ, &keyloc); if (result == ERROR_SUCCESS) @@ -181,18 +175,12 @@ nsPluginsDir::nsPluginsDir(PRUint16 location) PL_strcat(szKey, "\\Main"); result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_READ, &keyloc); } -/**/ + if (result == ERROR_SUCCESS) { pathlen = sizeof(path); result = ::RegQueryValueEx(keyloc, "Plugins Directory", NULL, &type, (LPBYTE)&path, &pathlen); -/* - if (result == ERROR_SUCCESS) - { - PL_strcat(path, "\\Program\\Plugins"); - } -*/ ::RegCloseKey(keyloc); }