November 2019 - Wine-Commits

Andrew Eikum : ntdll: Fix memory region check in NtQueryVirtualMemory.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 318a41030e0c3759878e4ddb471f0c49b9a189de URL: https://source.winehq.org/git/wine.git/?a=commit;h=318a41030e0c3759878e4ddb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 27 11:33:25 2019 -0500 ntdll: Fix memory region check in NtQueryVirtualMemory. Patch by buggy(a)ifel.se. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45218 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 12be24af8cab0e5f78795b164ec8847bafc30852) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index da2dad1b53..90f5773787 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2756,7 +2756,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size; - if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0; + if ((char *)info->BaseAddress + info->RegionSize <= (char *)start) return 0; if (info->BaseAddress >= end) {

1 0

Akihiro Sagawa : usp10: Fix advance width when glyph is missing.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 12fb7e9a75f5f9080936def76c362b207e3a974d URL: https://source.winehq.org/git/wine.git/?a=commit;h=12fb7e9a75f5f9080936def7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 13 23:50:25 2019 +0900 usp10: Fix advance width when glyph is missing. This fixes a regression introduced by 8d018d8d1dadf9d731690567b9c98d5a9eae37db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47327 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ac0c1d41d1773f5029cc73ae9bd4cfb2ef358b80) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/tests/usp10.c | 4 ++-- dlls/usp10/usp10.c | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cfd481937a..0ff88f06c7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2199,11 +2199,11 @@ static void test_ScriptPlace(HDC hdc) { ok(offset[i].du == 0, "[%d] expected 0, got %d\n", i, offset[i].du); ok(offset[i].dv == 0, "[%d] expected 0, got %d\n", i, offset[i].dv); - todo_wine ok(widths[i] > tm.tmAveCharWidth, "[%d] expected greater than %d, got %d\n", + ok(widths[i] > tm.tmAveCharWidth, "[%d] expected greater than %d, got %d\n", i, tm.tmAveCharWidth, widths[i]); total += widths[i]; } - todo_wine ok(total == sz.cx, "expected %d, got %d\n", sz.cx, total); + ok(total == sz.cx, "expected %d, got %d\n", sz.cx, total); } else skip("Associated font is unavailable\n"); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0a269961b7..4e62193669 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3434,9 +3434,27 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr; } else + { + hr = S_OK; glyph = pwGlyphs[i]; + } - if (!get_cache_glyph_widths(psc, glyph, &abc)) + if (hr == S_FALSE) + { + if (!hdc) return E_PENDING; + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) + { + if (!GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc)) return S_FALSE; + } + else + { + INT width; + if (!GetCharWidthW(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; + abc.abcB = width; + abc.abcA = abc.abcC = 0; + } + } + else if (!get_cache_glyph_widths(psc, glyph, &abc)) { if (!hdc) return E_PENDING; if (get_cache_pitch_family(psc) & TMPF_TRUETYPE)

1 0

Gabriel Ivăncescu : user32/listbox: Fix mouse wheel scrolling for multi-column listboxes.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: e049888541b29c06b10992e8c6c3a8c24fc00d0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e049888541b29c06b10992e8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:58 2019 +0300 user32/listbox: Fix mouse wheel scrolling for multi-column listboxes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b95bc8427322d1fdcb79937aa16ef7e31f95f556) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 594c956b94..e5b5059284 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2025,7 +2025,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2039,9 +2039,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min(descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min(descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0;

1 0

Paul Gofman : wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: dc3cb001afca2afff8df517b0168dfad467579aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3cb001afca2afff8df517b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 13 16:56:59 2019 +0300 wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 447c9523f84f8bc973a1080bb29d3b60e6d190f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f3826f8d6..dccc9ad389 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4390,8 +4390,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); if (mask_size > 1)

1 0

Zebediah Figura : widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: dff0bc91cdbf9cb1dd56c0084791342540b37c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff0bc91cdbf9cb1dd56c008… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:06 2019 -0500 widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c4d0bf4e3102c6fcff7acab189f874d6bd45003) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4b956448a8..62638f8caf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2127,6 +2127,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs case TGT_POINTER: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: + case TGT_ARRAY: flags |= FC_ALLOCED_ON_STACK; break; case TGT_IFACE_POINTER:

1 0

Zebediah Figura : widl: Mark unions, user types, and ranges as IsSimpleRef.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: f46d69c9bbcce48556ba62a92a10856b12132b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46d69c9bbcce48556ba62a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 17:49:34 2019 -0500 widl: Mark unions, user types, and ranges as IsSimpleRef. This fixes a regression introduced by 02976b655a5d9ad8ee25dbfb2051acb5b7431381. That patch should only have affected arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0afbcee924d0a9a7461291ea389c5a78d3ed2227) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 62638f8caf..a0de448193 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1059,7 +1059,8 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: - *flags |= MustFree; + *flags |= MustFree | IsSimpleRef; + *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_ARRAY:

1 0

Zebediah Figura : quartz/tests: Clean up CommitDecommitTest().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 8c60e374439666ea13fe561935e551eee3f8a2c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c60e374439666ea13fe5619… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:01 2019 -0600 quartz/tests: Clean up CommitDecommitTest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83dc66730e6468428a9ecf03c9880afe2dc74ed8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/tests/memallocator.c | 113 ++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 1086ed5ec6..ee6a409d01 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -1,5 +1,5 @@ /* - * Unit tests for Direct Show functions + * Memory allocator unit tests * * Copyright (C) 2005 Christian Costa * @@ -19,72 +19,73 @@ */ #define COBJMACROS - -#include "wine/test.h" -#include "uuids.h" #include "dshow.h" -#include "control.h" +#include "wine/test.h" -static void CommitDecommitTest(void) +static IMemAllocator *create_allocator(void) { - IMemAllocator* pMemAllocator; + IMemAllocator *allocator = NULL; + HRESULT hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return allocator; +} + +static void test_commit(void) +{ + ALLOCATOR_PROPERTIES req_props = {2, 65536, 1, 0}, ret_props; + IMemAllocator *allocator = create_allocator(); + IMediaSample *sample, *sample2; HRESULT hr; + BYTE *data; + + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Extant samples remain valid even after Decommit() is called. */ + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(data, 0xcc, 65536); + + hr = IMemAllocator_GetBuffer(allocator, &sample2, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAllocator); - ok(hr==S_OK, "Unable to create memory allocator %x\n", hr); - - if (hr == S_OK) - { - ALLOCATOR_PROPERTIES RequestedProps; - ALLOCATOR_PROPERTIES ActualProps; - - IMediaSample *sample = NULL, *sample2 = NULL; - - RequestedProps.cBuffers = 2; - RequestedProps.cbBuffer = 65536; - RequestedProps.cbAlign = 1; - RequestedProps.cbPrefix = 0; - - hr = IMemAllocator_SetProperties(pMemAllocator, &RequestedProps, &ActualProps); - ok(hr==S_OK, "SetProperties returned: %x\n", hr); - - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - - hr = IMemAllocator_GetBuffer(pMemAllocator, &sample, NULL, NULL, 0); - ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Decommit returned: %x\n", hr); - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Cecommit returned: %x\n", hr); - - /* Decommit and recommit while holding a sample */ - if (sample) - { - hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %x\n", hr); - - hr = IMemAllocator_GetBuffer(pMemAllocator, &sample2, NULL, NULL, 0); - ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - IMediaSample_Release(sample); - if (sample2) - IMediaSample_Release(sample2); - - hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Cecommit returned: %x\n", hr); - } - IMemAllocator_Release(pMemAllocator); - } + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); } START_TEST(memallocator) { CoInitialize(NULL); - CommitDecommitTest(); + test_commit(); CoUninitialize(); }

1 0

Tim Schumacher : services: Allow reading binary registry values as DWORDs.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: e948441070af720c73df5136a194acd3c889c1e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e948441070af720c73df5136… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun May 12 23:12:41 2019 +0200 services: Allow reading binary registry values as DWORDs. Some programs/services actually save those values as a registry value of the type REG_BINARY. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b139bbb5cb1da4c443e8163c2a14adc8ba93a29) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/services/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/utils.c b/programs/services/utils.c index aead38aeaa..48f5dbf706 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -150,7 +150,7 @@ DWORD load_reg_dword(HKEY hKey, LPCWSTR szValue, DWORD *output) return ERROR_SUCCESS; goto failed; } - if (type != REG_DWORD || size != sizeof(DWORD)) + if ((type != REG_DWORD && type != REG_BINARY) || size != sizeof(DWORD)) { err = ERROR_INVALID_DATATYPE; goto failed;

1 0

Dmitry Timoshkov : urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 7978df132a8c9d89b793aa00369a888a54513db6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7978df132a8c9d89b793aa00… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:31:56 2019 +0200 urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97529298a1d73eb4268dfca40595a020f17ea7ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 156 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 128 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7978df132a8c9d89b793…

1 0

Dmitry Timoshkov : urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 146f2f6087bf03e36a6c36af29c205268760a60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=146f2f6087bf03e36a6c36af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:32:12 2019 +0200 urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it. This patch fixes a regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47190 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43c1992821b5e1bc9ff51e6b327f29cb7613cf49) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/bindprot.c | 23 +++++++++++++++-------- dlls/urlmon/tests/protocol.c | 3 --- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 42d3d21925..e9c97e8a9d 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -509,15 +509,19 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, &IID_IUnknown, (void**)&protocol_unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(SUCCEEDED(hres)) + This->protocol_unk = protocol_unk; + else + IUnknown_Release(protocol_unk); + } + else if(hres == CLASS_E_NOAGGREGATION) + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + IClassFactory_Release(cf); if(FAILED(hres)) return hres; - - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); - if(FAILED(hres)) { - IUnknown_Release(protocol_unk); - return hres; - } } StringFromCLSID(&clsid, &clsid_str); @@ -703,8 +707,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(This->protocol) { IInternetProtocol_Terminate(This->protocol, 0); - IInternetProtocol_Release(This->protocol); - This->protocol = NULL; + + if (This->protocol_unk) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } } set_binding_sink(This, NULL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f161251d32..85ef7d05c2 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3875,9 +3875,7 @@ static void test_CreateBinding(void) trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); -todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); - if (hres != S_OK) goto fail; trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol); @@ -4025,7 +4023,6 @@ todo_wine_if (no_aggregation) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); -fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session);

1 0