June 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Rename the struct representing an embedded WMF in an EMF.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 078f192c669212e58b3b211712b0f88d61a4b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078f192c669212e58b3b21171… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:47 2016 +0100 gdi32: Rename the struct representing an embedded WMF in an EMF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index c251b4e..cab30e9 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2739,7 +2739,7 @@ done: return emf; } -typedef struct gdi_mf_comment +typedef struct wmf_in_emf_comment { DWORD ident; DWORD iComment; @@ -2747,7 +2747,7 @@ typedef struct gdi_mf_comment DWORD nChecksum; DWORD fFlags; DWORD cbWinMetaFile; -} gdi_mf_comment; +} wmf_in_emf_comment; /****************************************************************** * SetWinMetaFileBits (GDI32.@) @@ -2830,10 +2830,10 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC */ if (mm != MM_TEXT) { - gdi_mf_comment *mfcomment; + wmf_in_emf_comment *mfcomment; UINT mfcomment_size; - mfcomment_size = sizeof (gdi_mf_comment) + cbBuffer; + mfcomment_size = sizeof (*mfcomment) + cbBuffer; mfcomment = HeapAlloc(GetProcessHeap(), 0, mfcomment_size); if (mfcomment) {

1 0

Hugh McMaster : reg: Do not allow duplicate /d or /t switches.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 31efcc634a9d3498d79dcad1f46bbf5f9848b4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=31efcc634a9d3498d79dcad1f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:47:56 2016 +0000 reg: Do not allow duplicate /d or /t switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 10 ++++++++-- programs/reg/tests/reg.c | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 84818da..28133de 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -941,10 +941,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashVAW)) value_all = TRUE; else if (!lstrcmpiW(argvW[i], slashTW)) - type = argvW[++i]; + { + if (type || !(type = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashDW)) { - if (!(data = argvW[++i])) + if (data || !(data = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f7d8b11..2831e03 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -442,6 +442,14 @@ static void test_add(void) RegCloseKey(hkey); + /* Test duplicate switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup1 /t REG_DWORD /d 123 /f /t REG_SZ", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err); }

1 0

Hugh McMaster : reg/tests: Add tests for invalid switches.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 57c39cf2b6a3b72fcebaab92d501ecd2d24e4abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c39cf2b6a3b72fcebaab92d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:48:06 2016 +0000 reg/tests: Add tests for invalid switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2831e03..d34f19d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -450,6 +450,19 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + /* Test invalid switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid2 /ae", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid3 /", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err); }

1 0

Hugh McMaster : reg: Recognise switches beginning with a forward slash or hyphen.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: f426ece3a16cc47f0e1da51d074d4ceb380995c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f426ece3a16cc47f0e1da51d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 8 10:48:18 2016 +0000 reg: Recognise switches beginning with a forward slash or hyphen. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 91 +++++++++++++++++++++++++++--------------------- programs/reg/tests/reg.c | 8 ++--- 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 28133de..7d9c972 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -858,16 +858,11 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op, ret; BOOL show_op_help = FALSE; + static const WCHAR switchVAW[] = {'v','a',0}; + static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; HKEY root; - static const WCHAR slashDW[] = {'/','d',0}; - static const WCHAR slashFW[] = {'/','f',0}; - static const WCHAR slashSW[] = {'/','s',0}; - static const WCHAR slashTW[] = {'/','t',0}; - static const WCHAR slashVW[] = {'/','v',0}; - static const WCHAR slashVAW[] = {'/','v','a',0}; - static const WCHAR slashVEW[] = {'/','v','e',0}; if (argc == 1) { @@ -928,54 +923,72 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (!lstrcmpiW(argvW[i], slashVW)) + if (argvW[i][0] == '/' || argvW[i][0] == '-') { - if (value_name || !(value_name = argvW[++i])) + WCHAR *ptr = &argvW[i][1]; + + if (!lstrcmpiW(ptr, switchVEW)) { - output_message(STRING_INVALID_CMDLINE); - return 1; + value_empty = TRUE; + continue; } - } - else if (!lstrcmpiW(argvW[i], slashVEW)) - value_empty = TRUE; - else if (!lstrcmpiW(argvW[i], slashVAW)) - value_all = TRUE; - else if (!lstrcmpiW(argvW[i], slashTW)) - { - if (type || !(type = argvW[++i])) + else if (!lstrcmpiW(ptr, switchVAW)) { - output_message(STRING_INVALID_CMDLINE); - return 1; + value_all = TRUE; + continue; } - } - else if (!lstrcmpiW(argvW[i], slashDW)) - { - if (data || !(data = argvW[++i])) + else if (ptr[1]) { output_message(STRING_INVALID_CMDLINE); return 1; } - } - else if (!lstrcmpiW(argvW[i], slashSW)) - { - WCHAR *ptr; - if (op == REG_QUERY) + switch(tolowerW(argvW[i][1])) { - recurse = TRUE; - continue; - } + case 'v': + if (value_name || !(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 't': + if (type || !(type = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 'd': + if (data || !(data = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + break; + case 's': + if (op == REG_QUERY) + { + recurse = TRUE; + break; + } - ptr = argvW[++i]; - if (!ptr || strlenW(ptr) != 1) - { + ptr = argvW[++i]; + if (!ptr || strlenW(ptr) != 1) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + break; + case 'f': + force = TRUE; + break; + default: output_message(STRING_INVALID_CMDLINE); return 1; } - separator = ptr[0]; } - else if (!lstrcmpiW(argvW[i], slashFW)) - force = TRUE; } if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d34f19d..7556870 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -452,16 +452,16 @@ static void test_add(void) /* Test invalid switches */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid2 /ae", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid3 /", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "got %d\n", err);

1 0

Stefan Dösinger : ddraw/tests: Add readback tests to test_palette_gdi.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 156a2aa07af6f08ede4ee6c2375bb663955709b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156a2aa07af6f08ede4ee6c23… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:56 2016 +0100 ddraw/tests: Add readback tests to test_palette_gdi. The changed SetDisplayMode / SetCooperativeLevel order is necessary to make this test pass reliably on native. Otherwise my Windows 7 box returns a color of 0x00000000 from GetDC about 25% of the time. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 24 ++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 24 ++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=156a2aa07af6f08ede4ee…

1 0

Stefan Dösinger : ddraw/tests: Test P8 color keying.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: ab34bc6ccada24ca0b6dc2ac2074b9b0ddbb55ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab34bc6ccada24ca0b6dc2ac2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:57 2016 +0100 ddraw/tests: Test P8 color keying. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw2.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw4.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw7.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 164 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab34bc6ccada24ca0b6dc…

1 0

Stefan Dösinger : ddraw/tests: Remove p8_primary_test.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 55b8c75528446441635bae08b09803708f3603d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b8c75528446441635bae08b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 5 22:56:58 2016 +0100 ddraw/tests: Remove p8_primary_test. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/visual.c | 344 ---------------------------------------------- 1 file changed, 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55b8c75528446441635ba…

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.6.3.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 62e253796e592d989e2b8f27630052f7fa64180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e253796e592d989e2b8f276… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 7 14:23:12 2016 -0500 mscoree: Update Wine Mono to 4.6.3. This brings in some build fixes, bugfixes from upstream, and a patch from Paul Gofman for compatibility with 64-bit Managed C++ code. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8cbc221..c29f070 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.2" -#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" +#define MONO_VERSION "4.6.3" +#define MONO_SHA "c1d6d223c99c41a9d4e674e967042f10bfe02b8b" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 033a121..8e158e2 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.2"; + static const char* mono_version = "4.6.3"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Henri Verbeet : ddraw: Avoid accessing free' d memory on an error path in ddraw_surface_create().
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 2afd2f705f9352947527b95fbdd9af95c2a726b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afd2f705f9352947527b95fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 21:18:37 2016 +0200 ddraw: Avoid accessing free'd memory on an error path in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d36afe7..1cbd6c3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5754,10 +5754,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) { WARN("Tried to specify a back buffer count for a non-flippable surface.\n"); + hr = desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP ? DDERR_INVALIDPARAMS : DDERR_INVALIDCAPS; HeapFree(GetProcessHeap(), 0, texture); - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - return DDERR_INVALIDPARAMS; - return DDERR_INVALIDCAPS; + return hr; } }

1 0

Theodore Dubois : shell32/tests: Fix out of memory errors and their underlying cause.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: fbbac88519fc66d32e629ca82af557bfbe9cacce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbac88519fc66d32e629ca82… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Jun 5 09:35:38 2016 -0700 shell32/tests: Fix out of memory errors and their underlying cause. The out of memory errors were happening because getstring_test was using len unitialized when GetString failed. The underlying cause was that deleting the keys would fail because RegDeleteKey does not work if the key has subkeys, and one of the keys has a subkey. The test fails when the keys are still there. The subkey is now deleted before the key that contains it. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 67f7d32..beebbdf 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -113,21 +113,20 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); - if (hr != S_FALSE) { - if (expected_string) { - ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); - } else { - ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); - } - } + if (expected_string) { + ok_(__FILE__, line)(hr == S_FALSE, "GetString returned 0x%x, expected S_FALSE\n", hr); + if (hr != S_FALSE) + return; /* don't try to allocate memory */ - buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, buffer, &len); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%x, expected S_OK\n", hr); - if (expected_string) { ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + } else { + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } } @@ -176,8 +175,9 @@ static void test_IQueryAssociations_GetString(void) getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); - RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); + RegDeleteKeyW(test_progid_key, DefaultIconW); RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr);

1 0