November 2015 - Wine-Commits

Dmitry Timoshkov : oleaut32/tests: Add some tests for IPicture:: SaveAsFile.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: b2de69487814293ce85f01911ce9933d4f7e7699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2de69487814293ce85f01911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 24 17:27:31 2015 +0800 oleaut32/tests: Add some tests for IPicture::SaveAsFile. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 61 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 46dd05f..0903298 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1052,7 +1052,9 @@ static void test_load_save_bmp(void) DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; @@ -1074,6 +1076,27 @@ static void test_load_save_bmp(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 66, "expected 66, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1105,7 +1128,9 @@ static void test_load_save_icon(void) DWORD *mem; IPersistStream *src_stream; IStream *dst_stream; + LARGE_INTEGER offset; HRESULT hr; + LONG size; desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; @@ -1126,6 +1151,27 @@ static void test_load_save_icon(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == 766, "expected 766, got %d\n", size); + mem = GlobalLock(hmem); +todo_wine + ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -1160,6 +1206,7 @@ static void test_load_save_empty_picture(void) IStream *dst_stream, *stream; LARGE_INTEGER offset; HRESULT hr; + LONG size; memset(&pic, 0, sizeof(pic)); desc.cbSizeofstruct = sizeof(desc); @@ -1169,7 +1216,7 @@ static void test_load_save_empty_picture(void) type = -1; hr = IPicture_get_Type(pic, &type); - ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); handle = (OLE_HANDLE)0xdeadbeef; @@ -1181,6 +1228,18 @@ static void test_load_save_empty_picture(void) hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine + ok(size == -1, "expected -1, got %d\n", size); + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); ok(hr == S_OK, "QueryInterface error %#x\n", hr);

1 0

Michael Stefaniuc : maintainers: Add section for the Stable branch.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 0636a700cb481cb00203cb92c8bcefa3461ccb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0636a700cb481cb00203cb92c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 24 13:57:47 2015 +0100 maintainers: Add section for the Stable branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a5ed66e..b00ee7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22,6 +22,7 @@ Descriptions of section entries used here: P: Other knowledgeable person. FullName <address(a)domain> F: Files and directories with wildcard patterns. One pattern per line. Multiple F: lines acceptable. + W: Link to additional information. Maintainers List @@ -257,3 +258,7 @@ P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> F: * F: */ + +Stable Branch +M: Michael Stefaniuc <mstefani(a)winehq.org> +W: http://wiki.winehq.org/StableRules

1 0

Thomas Faber : quartz/tests: Test aggregation with CLSID_FilterGraph.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: e0d8003a9abdcf63242d95b74e5b972a2206636a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d8003a9abdcf63242d95b74… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 13:20:58 2015 +0100 quartz/tests: Test aggregation with CLSID_FilterGraph. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b42aea8..f3af03e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1886,6 +1886,100 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "CoRevokeClassObject failed with %08x\n", hr); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_graph(void) +{ + HRESULT hr; + IUnknown *pgraph; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterGraph, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pgraph); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pgraph != &unk_outer.IUnknown_iface, "pgraph = %p, expected not %p\n", pgraph, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pgraph, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + +todo_wine + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); +todo_wine + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pgraph); +} + START_TEST(filtergraph) { HRESULT hr; @@ -1904,5 +1998,6 @@ START_TEST(filtergraph) test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); + test_aggregate_filter_graph(); CoUninitialize(); }

1 0

Thomas Faber : quartz/tests: Test aggregation with CLSID_FilterMapper2.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: fecb862cfff48429757f859d40d4ad61304265c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecb862cfff48429757f859d4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 13:20:47 2015 +0100 quartz/tests: Test aggregation with CLSID_FilterMapper2. MPC-HC v1.7.10's CFGManager class creates a filter graph object during its constructor, which means it passes in an outer object with a zero reference count. Wine does an AddRef/Release on this object when constructing the filter graph, thus its reference count drops back to 0 and the CFGManager object gets freed prematurely. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index aee2310..fe23a72 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -541,6 +541,98 @@ out: IFilterMapper2_Release(pMapper); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_mapper(void) +{ + HRESULT hr; + IUnknown *pmapper; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterMapper2, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pmapper); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pmapper); +} + START_TEST(filtermapper) { CoInitialize(NULL); @@ -550,6 +642,7 @@ START_TEST(filtermapper) test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); test_parse_filter_data(); + test_aggregate_filter_mapper(); CoUninitialize(); }

1 0

Nikolay Sivov : crypt32: Fix key name null termination (Coverity).
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 53a065ae0a2f0381f71f21f7d3897ff3f33eb295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a065ae0a2f0381f71f21f7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 15:29:06 2015 +0300 crypt32: Fix key name null termination (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 7b52731..3fa5a97 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -769,7 +769,7 @@ struct KeynameKeeper { WCHAR buf[10]; /* big enough for L"GivenName" */ LPWSTR keyName; /* usually = buf, but may be allocated */ - DWORD keyLen; + DWORD keyLen; /* full available buffer size in WCHARs */ }; static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper) @@ -795,17 +795,13 @@ static void CRYPT_KeynameKeeperFromTokenW(struct KeynameKeeper *keeper, { DWORD len = key->end - key->start; - if (len > keeper->keyLen) + if (len >= keeper->keyLen) { - if (keeper->keyName == keeper->buf) - keeper->keyName = CryptMemAlloc(len * sizeof(WCHAR)); - else - keeper->keyName = CryptMemRealloc(keeper->keyName, - len * sizeof(WCHAR)); - keeper->keyLen = len; + CRYPT_FreeKeynameKeeper( keeper ); + keeper->keyLen = len + 1; + keeper->keyName = CryptMemAlloc(keeper->keyLen * sizeof(WCHAR)); } - memcpy(keeper->keyName, key->start, (key->end - key->start) * - sizeof(WCHAR)); + memcpy(keeper->keyName, key->start, len * sizeof(WCHAR)); keeper->keyName[len] = '\0'; TRACE("Keyname is %s\n", debugstr_w(keeper->keyName)); }

1 0

Nikolay Sivov : user32: Don't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() (Coverity).
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 19d29f3ca58f4f574747ff7e6aadb20160b4bebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d29f3ca58f4f574747ff7e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:31:21 2015 +0300 user32: Don't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dde_misc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d66d2e0..175d9e3 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -2468,7 +2468,10 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) } if (ret != 0) + { + ci.cb = lpConvInfo->cb; memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); + } return ret; }

1 0

Alexandre Julliard : explorer: Treat unrecognized options as a file to open.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 9db3444e4070025162a87cce49ca7fe9ef44ce56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db3444e4070025162a87cce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 17:36:53 2015 +0900 explorer: Treat unrecognized options as a file to open. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 4f82ded..c178017 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -683,12 +683,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; - LPWSTR p, p2; + LPWSTR p = commandline; - p2 = commandline; - p = strchrW(commandline,'/'); - while(p) + while (*p) { + while (isspaceW(*p)) p++; if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) { parameters->explorer_mode = FALSE; @@ -717,15 +716,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += sizeof(arg_desktop)/sizeof(WCHAR); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } - else p++; - - p2 = p; - p = strchrW(p,'/'); - } - if (p2 && *p2) - { - /* left over command line is generally the path to be opened */ - copy_path_string(parameters->root,p2); + else + { + /* left over command line is generally the path to be opened */ + copy_path_string(parameters->root,p); + break; + } } }

1 0

Svante Signell : winepulse.drv: Avoid PATH_MAX in Windows code.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 9d5173f77ddb95b7ed192015302786f82516c540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5173f77ddb95b7ed1920153… Author: Svante Signell <svante.signell(a)gmail.com> Date: Mon Nov 23 16:59:39 2015 +0100 winepulse.drv: Avoid PATH_MAX in Windows code. Signed-off-by: Svante Signell <svante.signell(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 215a53e..24972ab 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -442,7 +442,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { static HRESULT pulse_connect(void) { int len; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; if (!pulse_thread) @@ -521,7 +521,7 @@ static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol static HRESULT pulse_test_connect(void) { int len, ret; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; pa_operation *o;

1 0

Piotr Caban : msxml3/tests: Run IXMLDOMNode:: get_text whitespace tests on other msxml versions.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 1f2c20cff30b56e2ca373eb79a9b1396870214c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2c20cff30b56e2ca373eb79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 08:38:17 2015 +0100 msxml3/tests: Run IXMLDOMNode::get_text whitespace tests on other msxml versions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 279 ++++++++++++++++++++++++++------------------- 1 file changed, 161 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2c20cff30b56e2ca373…

1 0

Michael Müller : msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386.
by Alexandre Julliard Nov. 24, 2015

Nov. 24, 2015

Module: wine Branch: master Commit: 27b5c93609ee3dad24d4fa7aeaaf1d4ba2d2ae4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b5c93609ee3dad24d4fa7ae… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 24 05:17:12 2015 +0100 msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/string.c | 6 ++++-- dlls/msvcp90/tests/string.c | 25 +++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e098c3d..2d0f4f8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -94,7 +94,7 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); @@ -123,7 +123,7 @@ typedef struct basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 21c2c4f..9f0d7fe 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -973,10 +973,11 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_ptr_ptr(basic_string_ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) { TRACE("%p\n", this); basic_string_char_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ @@ -2785,10 +2786,11 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_ptr_ptr(basic_strin /* ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4) -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) { TRACE("%p\n", this); basic_string_wchar_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index f1aa92a..5f8fcd2 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -63,7 +63,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_ static basic_string_char* (__thiscall *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_ctor_cstr)(basic_string_char*, const char*); -static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); +static void* (__thiscall *p_basic_string_char_dtor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_erase)(basic_string_char*, size_t, size_t); static basic_string_char* (__thiscall *p_basic_string_char_assign_cstr_len)(basic_string_char*, const char*, size_t); static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); @@ -85,7 +85,7 @@ static size_t *p_basic_string_char_npos; static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr)(basic_string_wchar*, const wchar_t*); -static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); +static void* (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_erase)(basic_string_wchar*, size_t, size_t); static basic_string_wchar* (__thiscall *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); @@ -767,6 +767,26 @@ static void test_basic_string_char_find_last_not_of(void) { } } +static void test_basic_string_dtor(void) { +#ifdef __i386__ + static const wchar_t qwerty[] = { 'q','w','e','r','t','y',0 }; + basic_string_wchar str1; + basic_string_char str2; + void *ret; + + /* FEAR 1 installer expects that string destructors set EAX to + * zero on return (see bug 37358). */ + + call_func2(p_basic_string_wchar_ctor_cstr, &str1, qwerty); + ret = call_func1(p_basic_string_wchar_dtor, &str1); + ok(ret == NULL, "expected NULL, got %p\n", ret); + + call_func2(p_basic_string_char_ctor_cstr, &str2, "qwerty"); + ret = call_func1(p_basic_string_char_dtor, &str2); + ok(ret == NULL, "expected NULL, got %p\n", ret); +#endif +} + START_TEST(string) { if(!init()) @@ -783,6 +803,7 @@ START_TEST(string) test_basic_string_wchar(); test_basic_string_wchar_swap(); test_basic_string_char_find_last_not_of(); + test_basic_string_dtor(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0