January 2016 - Wine-commits

Francois Gouget : shell32/tests: Show that verbs and classes override ShellExecute()' s normal handling of executables.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 3079179753005b320b3124d417cb12d8b2d6bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3079179753005b320b3124d41… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 15:41:19 2016 +0100 shell32/tests: Show that verbs and classes override ShellExecute()'s normal handling of executables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a063488..4b721ef 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2196,6 +2196,20 @@ static void test_exes(void) sprintf(filename, "\"%s\" shlexec \"%s\" Exec", argv0, child_file); rc = shell_execute(NULL, filename, NULL, NULL); okShell(rc == SE_ERR_FNF, "returned %lu\n", rc); + + /* A verb, even if invalid, overrides the normal handling of executables */ + todo_wait rc = shell_execute_ex(SEE_MASK_FLAG_NO_UI, + "notaverb", argv0, NULL, NULL, NULL); + todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %lu\n", rc); + + /* A class overrides the normal handling of executables too */ + /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ + rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, + NULL, argv0, NULL, NULL, ".shlexec"); + todo_wine okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + todo_wine okChildPath("argvA4", argv0); } typedef struct

1 0

Francois Gouget : shell32/tests: Fix a couple of okChildPath()/ okChildString() mixups.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 78ada2e1548b2789b036694f383c5ebc617d7716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ada2e1548b2789b036694f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 15:41:58 2016 +0100 shell32/tests: Fix a couple of okChildPath()/okChildString() mixups. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4b721ef..7844722 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1568,7 +1568,7 @@ static void test_argify(void) rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); okChildInt("argcA", 4); - okChildString("argvA3", fileA); + okChildPath("argvA3", fileA); } static void test_filename(void) @@ -2083,7 +2083,7 @@ static void test_lnks(void) okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); - okChildString("argvA4", filename); + okChildPath("argvA4", filename); if (dllver.dwMajorVersion>=6) {

1 0

Piotr Caban : oleaut32: Update cdguid on data reallocation in WMSFT_compile_custdata.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 17af4fe59255a52beff026d39631fa35378b645e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17af4fe59255a52beff026d39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 27 13:04:19 2016 +0100 oleaut32: Update cdguid on data reallocation in WMSFT_compile_custdata. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2a24b79..af477d5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9280,7 +9280,7 @@ static DWORD WMSFT_compile_custdata(struct list *custdata_list, WMSFT_TLBFile *f { WMSFT_SegContents *cdguids_seg = &file->cdguids_seg; DWORD ret = cdguids_seg->len, offs; - MSFT_CDGuid *cdguid = cdguids_seg->data; + MSFT_CDGuid *cdguid; TLBCustData *cd; if(list_empty(custdata_list)) @@ -9289,8 +9289,10 @@ static DWORD WMSFT_compile_custdata(struct list *custdata_list, WMSFT_TLBFile *f cdguids_seg->len += sizeof(MSFT_CDGuid) * list_count(custdata_list); if(!cdguids_seg->data){ cdguid = cdguids_seg->data = heap_alloc(cdguids_seg->len); - }else + }else { cdguids_seg->data = heap_realloc(cdguids_seg->data, cdguids_seg->len); + cdguid = (MSFT_CDGuid*)((char*)cdguids_seg->data + ret); + } offs = ret + sizeof(MSFT_CDGuid); LIST_FOR_EACH_ENTRY(cd, custdata_list, TLBCustData, entry){

1 0

Piotr Caban : oleaut32: Add ICreateTypeLib2::SetCustData implementation.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: aa56d735df2799a381ba236357c68d77b33a006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa56d735df2799a381ba23635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 27 13:04:29 2016 +0100 oleaut32: Add ICreateTypeLib2::SetCustData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index af477d5..517e515 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9984,7 +9984,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) else file.header.NameOffset = -1; - file.header.CustomDataOffset = -1; /* TODO SetCustData not impl yet */ + file.header.CustomDataOffset = WMSFT_compile_custdata(&This->custdata_list, &file); if(This->guid) file.header.posguid = This->guid->offset; @@ -10134,8 +10134,16 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface, REFGUID guid, VARIANT *varVal) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s %p - stub\n", This, debugstr_guid(guid), varVal); - return E_NOTIMPL; + TLBGuid *tlbguid; + + TRACE("%p %s %p\n", This, debugstr_guid(guid), varVal); + + if (!guid || !varVal) + return E_INVALIDARG; + + tlbguid = TLB_append_guid(&This->guid_list, guid, -1); + + return TLB_set_custdata(&This->custdata_list, tlbguid, varVal); } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface,

1 0

Piotr Caban : oleaut32: Add ICreateTypeLib2::SetCustData tests.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: c2090c88450ef9c2dd316f7b828299bad6553805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2090c88450ef9c2dd316f7b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 27 13:04:36 2016 +0100 oleaut32: Add ICreateTypeLib2::SetCustData tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ee8568c..8338719 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1667,6 +1667,7 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; + static const GUID tlcustguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x69}}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; static const GUID bogusguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x71}}; static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; @@ -1678,6 +1679,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo *createti; ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; + ITypeLib2 *tl2; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; @@ -1796,6 +1798,23 @@ static void test_CreateTypeLib(SYSKIND sys) { SysFreeString(name); SysFreeString(helpfile); + V_VT(&cust_data) = VT_I4; + V_I4(&cust_data) = 1; + hres = ICreateTypeLib2_SetCustData(createtl, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeLib_QueryInterface(tl, &IID_ITypeLib2, (void**)&tl2); + ok(hres == S_OK, "no ITypeLib2 interface (%x)\n", hres); + + V_VT(&cust_data) = VT_EMPTY; + V_I4(&cust_data) = 0; + hres = ITypeLib2_GetCustData(tl2, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + ok(V_VT(&cust_data) == VT_I4, "V_VT(&cust_data) = %d\n", V_VT(&cust_data)); + ok(V_I4(&cust_data) == 1, "V_I4(&cust_data) = %d\n", V_I4(&cust_data)); + + ITypeLib2_Release(tl2); + /* invalid parameters */ hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -2860,6 +2879,16 @@ static void test_CreateTypeLib(SYSKIND sys) { SysFreeString(name); SysFreeString(helpfile); + hres = ITypeLib_QueryInterface(tl, &IID_ITypeLib2, (void**)&tl2); + ok(hres == S_OK, "no ITypeLib2 interface (%x)\n", hres); + V_VT(&cust_data) = VT_EMPTY; + V_I4(&cust_data) = 0; + hres = ITypeLib2_GetCustData(tl2, &tlcustguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + ok(V_VT(&cust_data) == VT_I4, "V_VT(&cust_data) = %d\n", V_VT(&cust_data)); + ok(V_I4(&cust_data) == 1, "V_I4(&cust_data) = %d\n", V_I4(&cust_data)); + ITypeLib2_Release(tl2); + hres = ITypeLib_GetTypeInfo(tl, 0, &ti); ok(hres == S_OK, "got %08x\n", hres);

1 0

Francois Gouget : advapi32/tests: Trace the SIDs if they are not as expected.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 7371c44336b46ecc7eeafbc8368790bb60a18bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371c44336b46ecc7eeafbc83… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 20:21:31 2016 +0100 advapi32/tests: Trace the SIDs if they are not as expected. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 77 ++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7371c44336b46ecc7eeaf…

1 0

Alexandre Julliard : wine.inf: Fix the wordpad.exe path in associations.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 41cb62acd902dd81c75b22edb1645edddea14a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cb62acd902dd81c75b22edb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 21:23:02 2016 +0900 wine.inf: Fix the wordpad.exe path in associations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7178140..5d33d17 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -218,13 +218,13 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,rtffile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,rtffile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" -HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,wrifile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" +HKCR,wrifile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"

1 0

Alexandre Julliard : server: Fix initialization of mailslot objects that don't have a name.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: b47bd4555c0d1a37dbd48897e37c67ee0f2ad05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47bd4555c0d1a37dbd48897e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 22:33:12 2016 +0900 server: Fix initialization of mailslot objects that don't have a name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mailslot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/mailslot.c b/server/mailslot.c index 0d93f42..b135fb2 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -403,7 +403,11 @@ static struct mailslot *create_mailslot( struct directory *root, struct mailslot *mailslot; int fds[2]; - if (!name || !name->len) return alloc_object( &mailslot_ops ); + if (!name || !name->len) + { + mailslot = alloc_object( &mailslot_ops ); + goto init; + } if (!(obj = find_object_dir( root, name, attr, &new_name ))) { @@ -435,6 +439,7 @@ static struct mailslot *create_mailslot( struct directory *root, mailslot = create_object( dev->mailslots, &mailslot_ops, &new_name, NULL ); release_object( dev ); +init: if (!mailslot) return NULL; mailslot->fd = NULL;

1 0

Alexandre Julliard : ntdll: Add tests for kernel object names in the various open functions.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 8b2ba27c860da63c503f5d7dee08e2c9c01efd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2ba27c860da63c503f5d7de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 21:24:12 2016 +0900 ntdll: Add tests for kernel object names in the various open functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/sync.c | 11 +- dlls/ntdll/tests/om.c | 449 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/virtual.c | 2 +- 5 files changed, 435 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b2ba27c860da63c503f5…

1 0

Nikolay Sivov : d2d1: Use drawing effect for underlines.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: ec1957c359d7bd96aa996d9689587d974b59e06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1957c359d7bd96aa996d968… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 23:34:00 2016 +0300 d2d1: Use drawing effect for underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7cfbdfa..8353c09 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1679,6 +1679,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; float min_thickness; + ID2D1Brush *brush; D2D1_RECT_F rect; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", @@ -1692,7 +1693,12 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend rect.right = baseline_origin_x + underline->width; rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); - ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, context->brush); + brush = d2d_draw_get_text_brush(context, effect); + + ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush); + + ID2D1Brush_Release(brush); + return S_OK; }

1 0