diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:36:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:36:22 +0000 |
| commit | 93693830f692ec74ffabf46e8f08f58990bfe1e7 (patch) | |
| tree | 593218d002708ed755bf2866b9912716c0342f2d /shell | |
| parent | c0cf924d57690fffe87f858e7ced639d3bbcbe1e (diff) | |
INTEGRATION: CWS desktintgr02 (1.2.8); FILE MERGED
2004/08/06 03:22:41 deuce 1.2.8.3: Issue number: i21110
Submitted by: Gorden Lin {Gorden.Lin@Sun.com}
Reviewed by: Tino Rachui {Tino.Rachui@Sun.com}
2004/08/05 08:45:30 deuce 1.2.8.2: Issue number: i21110
Submitted by: Gorden Lin {Gorden.Lin@Sun.com}
Reviewed by: Tino Rachui {Tino.Rachui@Sun.com}
2004/07/29 09:14:09 deuce 1.2.8.1: Issue number: 21110
Submitted by: Gorden Lin {gorden.lin@sun.com}
Reviewed by: Tino Rachui {tino.rachui@sun.com}
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/util/registry.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index da984ca42e23..e1ce5524099d 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-04-07 11:17:53 $ + * last change: $Author: hr $ $Date: 2004-09-08 14:36:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,6 +117,9 @@ bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) KEY_READ | DELETE, &hKey); + if ( rc == ERROR_FILE_NOT_FOUND ) + return true; + if (ERROR_SUCCESS == rc) { char* SubKey; @@ -188,7 +191,7 @@ std::string ClsidToString(const CLSID& clsid) { // Get CLSID LPOLESTR wszCLSID = NULL; - HRESULT hr = StringFromCLSID(clsid, &wszCLSID); + StringFromCLSID(clsid, &wszCLSID); char buff[39]; // Covert from wide characters to non-wide. @@ -204,7 +207,7 @@ std::string ClsidToString(const CLSID& clsid) // //--------------------------------------- -bool QueryRegistryKey(HKEY RootKey, const char* KeyName, char szProductType[], DWORD dwBufLen) +bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { HKEY hKey; @@ -218,7 +221,7 @@ bool QueryRegistryKey(HKEY RootKey, const char* KeyName, char szProductType[], D if (ERROR_SUCCESS == rc) { rc = RegQueryValueExA( - hKey, NULL, NULL, NULL, (LPBYTE)szProductType,&dwBufLen); + hKey, ValueName, NULL, NULL, (LPBYTE)pszData,&dwBufLen); RegCloseKey(hKey); } |