[Pkg-owncloud-commits] [owncloud-client] 188/211: Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:44 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 149b16aefd179a00f89924036fa6d6f7ee396683
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Oct 23 21:00:31 2014 +0200

    Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx
    
    RegDeleteKeyEx does not exist on Windows XP 32 bit
    
    Fixes: #2165
---
 .../OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
index b81bc34..d997f3a 100644
--- a/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
+++ b/shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
@@ -62,7 +62,7 @@ HRESULT OCOverlayRegistrationHandler::RemoveRegistryEntries(PCWSTR friendlyName)
 	}
 
 	HKEY syncExOverlayKey = NULL;
-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(shellOverlayKey, friendlyName, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(shellOverlayKey, friendlyName));
 	if (!SUCCEEDED(hResult)) {
 		return hResult;
 	}
@@ -137,12 +137,12 @@ HRESULT OCOverlayRegistrationHandler::UnregisterCOMObject(const CLSID& clsid)
 		return hResult;
 	}
 
-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(clsidKey, REGISTRY_IN_PROCESS, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(clsidKey, REGISTRY_IN_PROCESS));
 	if(!SUCCEEDED(hResult)) {
 		return hResult;
 	}
 
-	hResult = HRESULT_FROM_WIN32(RegDeleteKeyEx(hKey, stringCLSID, DELETE, 0));
+	hResult = HRESULT_FROM_WIN32(RegDeleteKey(hKey, stringCLSID));
 	if(!SUCCEEDED(hResult)) {
 		return hResult;
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list