Commit 9adbd8ab authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

urlmon: Get rid of gecko_installer_workaround in tests.

parent 655e0a0c
...@@ -2821,40 +2821,8 @@ static void test_StdURLMoniker(void) ...@@ -2821,40 +2821,8 @@ static void test_StdURLMoniker(void)
IMoniker_Release(mon); IMoniker_Release(mon);
} }
static void gecko_installer_workaround(BOOL disable)
{
HKEY hkey;
DWORD res;
static BOOL has_url = FALSE;
static char url[2048];
if(!disable && !has_url)
return;
res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey);
if(res != ERROR_SUCCESS)
return;
if(disable) {
DWORD type, size = sizeof(url);
res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size);
if(res == ERROR_SUCCESS && type == REG_SZ)
has_url = TRUE;
RegDeleteValue(hkey, "GeckoUrl");
}else {
RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1);
}
RegCloseKey(hkey);
}
START_TEST(url) START_TEST(url)
{ {
gecko_installer_workaround(TRUE);
complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event = CreateEvent(NULL, FALSE, FALSE, NULL);
complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL);
thread_id = GetCurrentThreadId(); thread_id = GetCurrentThreadId();
...@@ -2994,6 +2962,4 @@ START_TEST(url) ...@@ -2994,6 +2962,4 @@ START_TEST(url)
CloseHandle(complete_event); CloseHandle(complete_event);
CloseHandle(complete_event2); CloseHandle(complete_event2);
CoUninitialize(); CoUninitialize();
gecko_installer_workaround(FALSE);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment