Brendan Shanks : wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS.
Alexandre Julliard
julliard at winehq.org
Tue Mar 23 15:07:43 CDT 2021
Module: wine
Branch: oldstable
Commit: 6a62c7999a4392f97cb8995e32164e2ed9154df2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a62c7999a4392f97cb8995e32164e2ed9154df2
Author: Brendan Shanks <bshanks at codeweavers.com>
Date: Tue Nov 24 15:16:40 2020 -0800
wine.inf: Add UrlAssociations for FTP/HTTP/HTTPS.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit ba8638e1a4e2a31d0e62762ab29b5a0b3d63856e)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/shell32/tests/assoc.c | 2 +-
loader/wine.inf.in | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c
index 5e93750229d..65334e4a739 100644
--- a/dlls/shell32/tests/assoc.c
+++ b/dlls/shell32/tests/assoc.c
@@ -288,7 +288,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);
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index bcccd3a9ca0..1ea0a5fb014 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -764,6 +764,11 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B1
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840"
+; URL Associations
+HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoice,"ProgId",,"ftp"
+HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
+HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
+
[Nls]
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"c_037.nls"
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"424",,"c_424.nls"
More information about the wine-cvs
mailing list