From: Alistair Leslie-Hughes Subject: shell32: Add Association Registry entries Message-Id: Date: Sun, 12 Apr 2015 13:16:46 +1000 Hi, Changelog: shell32: Add Association Registry entries Best Regards Alistair Leslie-Hughes From dd52e3d2f7e441f537b6904bf2993078862f4b12 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 11 Apr 2015 20:37:18 +1000 Subject: [PATCH 7/7] Add Association Registry entries --- dlls/shell32/shell32.rgs | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/assoc.c | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rgs b/dlls/shell32/shell32.rgs index 79bf4b7..4ac56c9 100644 --- a/dlls/shell32/shell32.rgs +++ b/dlls/shell32/shell32.rgs @@ -49,3 +49,47 @@ HKLM } } } + +HKCU +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove Shell + { + NoRemove Associations + { + NoRemove UrlAssociations + { + ftp + { + UserChoice + { + val 'Progid' = s 'IE.FTP' + } + } + http + { + UserChoice + { + val 'Progid' = s 'IE.HTTP' + } + } + https + { + UserChoice + { + val 'Progid' = s 'IE.HTTPS' + } + } + } + } + } + } + } + } +} + diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 8aa2535..f4656d3 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -210,7 +210,7 @@ static void test_IApplicationAssociationRegistration_QueryCurrentDefault(IApplic ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); - todo_wine ok(hr == S_OK, "got 0x%x\n", hr); + ok(hr == S_OK, "got 0x%x\n", hr); trace("%s\n", wine_dbgstr_w(assocprog)); CoTaskMemFree(assocprog); -- 2.1.4