January 2016 - Wine-commits

Piotr Caban : oleaut32/tests: Add tests for safearray unmarshaling into passed variant.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 6183f4fc7d4c38477960337c290a30b79ecbf1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6183f4fc7d4c38477960337c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:50:55 2016 +0100 oleaut32/tests: Add tests for safearray unmarshaling into passed variant. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 88a0731..24b382c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -769,7 +769,7 @@ static void test_marshal_VARIANT(void) BSTR b; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; - LPSAFEARRAY lpsa; + LPSAFEARRAY lpsa, lpsa2, lpsa_copy; DECIMAL dec, dec2; HeapUnknown *heap_unknown; DWORD expected; @@ -1336,6 +1336,64 @@ static void test_marshal_VARIANT(void) } VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + /*** ARRAY BYREF ***/ + VariantInit(&v); + V_VT(&v) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v) = &lpsa; + lpsa->fFeatures |= FADF_STATIC; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + expected = 152; + ok(stubMsg.BufferLength == expected || stubMsg.BufferLength == expected + 16, /* win64 */ + "size %u instead of %u\n", stubMsg.BufferLength, expected); + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + wirev = (DWORD*)buffer; + + wirev = check_variant_header(wirev, &v, expected); + ok(*wirev == 4, "wv[5] %08x\n", *wirev); + wirev++; + ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is lpsa. winxp: this is (char*)lpsa + 1 */ + wirev++; + check_safearray(wirev, lpsa); + lpsa_copy = lpsa2 = SafeArrayCreate(VT_I8, 1, &sab); + /* set FADF_STATIC feature to make sure lpsa2->pvData pointer changes if new data buffer is allocated */ + lpsa2->fFeatures |= FADF_STATIC; + mem = lpsa2->pvData; + V_VT(&v2) = VT_UI4 | VT_ARRAY | VT_BYREF; + V_ARRAYREF(&v2) = &lpsa2; + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + todo_wine ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); + todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); + if(lpsa2 != lpsa_copy) + { + lpsa_copy->fFeatures &= ~FADF_STATIC; + SafeArrayDestroy(lpsa_copy); + } + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); + SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array lbounds differ\n"); + SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); + SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); + ok(bound == bound2, "array ubounds differ\n"); + if (pSafeArrayGetVartype) + { + pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + } + lpsa2->fFeatures &= ~FADF_STATIC; + hr = SafeArrayDestroy(*V_ARRAYREF(&v2)); + ok(hr == S_OK, "got 0x%08x\n", hr); + HeapFree(GetProcessHeap(), 0, oldbuffer); + lpsa->fFeatures &= ~FADF_STATIC; hr = SafeArrayDestroy(lpsa); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Piotr Caban : oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 3815eca2683766403aa80648b48d9c19894a2e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3815eca2683766403aa80648b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:12 2016 +0100 oleaut32: Set safearray pointer to NULL in LPSAFEARRAY_UserFree. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 1 + dlls/oleaut32/usrmarshal.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 24b382c..d4d7d53 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -277,6 +277,7 @@ static void test_marshal_LPSAFEARRAY(void) ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + ok(!lpsa2, "lpsa2 was not set to 0 by LPSAFEARRAY_UserFree\n"); HeapFree(GetProcessHeap(), 0, buffer); lpsa->cLocks = 0; hr = SafeArrayDestroy(lpsa); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 303ec69..d66d42a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1091,6 +1091,7 @@ void WINAPI LPSAFEARRAY_UserFree(ULONG *pFlags, LPSAFEARRAY *ppsa) TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *ppsa); SafeArrayDestroy(*ppsa); + *ppsa = NULL; }

1 0

Piotr Caban : oleaut32: Pass safearray from VARIANT_UserUnmarshal to LPSAFEARRAY_UserUnmarshal so it can be reused.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 37e2acb205957bd7120274a73abba9323994aa21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e2acb205957bd7120274a73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:23 2016 +0100 oleaut32: Pass safearray from VARIANT_UserUnmarshal to LPSAFEARRAY_UserUnmarshal so it can be reused. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 8 ++------ dlls/oleaut32/usrmarshal.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4d7d53..e5fb58c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1370,13 +1370,9 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - todo_wine ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); + ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); - if(lpsa2 != lpsa_copy) - { - lpsa_copy->fFeatures &= ~FADF_STATIC; - SafeArrayDestroy(lpsa_copy); - } + if(mem != lpsa2->pvData) CoTaskMemFree(mem); ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index d66d42a..02f5f34 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -520,10 +520,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe { VariantClear(pvar); V_BYREF(pvar) = CoTaskMemAlloc(mem_size); + memset(V_BYREF(pvar), 0, mem_size); } else if (!V_BYREF(pvar)) + { V_BYREF(pvar) = CoTaskMemAlloc(mem_size); - memcpy(V_BYREF(pvar), Pos, type_size); + memset(V_BYREF(pvar), 0, mem_size); + } + + if(!(header->vt & VT_ARRAY)) + memcpy(V_BYREF(pvar), Pos, type_size); if((header->vt & VT_TYPEMASK) != VT_VARIANT) Pos += type_size; else @@ -532,7 +538,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe else { VariantClear(pvar); - if((header->vt & VT_TYPEMASK) == VT_DECIMAL) + if(header->vt & VT_ARRAY) + V_ARRAY(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else memcpy(&pvar->n1.n2.n3, Pos, type_size); @@ -963,6 +971,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B if (!ptr) { + SafeArrayDestroy(*ppsa); *ppsa = NULL; TRACE("NULL safe array unmarshaled\n"); @@ -1001,11 +1010,13 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B if(vt) { + SafeArrayDestroy(*ppsa); *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); } else { + SafeArrayDestroy(*ppsa); if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa))) RpcRaiseException(E_OUTOFMEMORY); memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims);

1 0

Piotr Caban : oleaut32: Reuse safearray passed to LPSAFEARRAY_UserUnmarshal if possible.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: c1974090c6d592535ea893d28d35b672d51e77ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1974090c6d592535ea893d28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:32 2016 +0100 oleaut32: Reuse safearray passed to LPSAFEARRAY_UserUnmarshal if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 3 +-- dlls/oleaut32/usrmarshal.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index e5fb58c..d04a366 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1371,8 +1371,7 @@ static void test_marshal_VARIANT(void) ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(lpsa2 == lpsa_copy, "safearray should be reused\n"); - todo_wine ok(mem == lpsa2->pvData, "safearray data should be reused\n"); - if(mem != lpsa2->pvData) CoTaskMemFree(mem); + ok(mem == lpsa2->pvData, "safearray data should be reused\n"); ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 02f5f34..726dd96 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1008,7 +1008,26 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B wiresab = (SAFEARRAYBOUND *)Buffer; Buffer += sizeof(wiresab[0]) * wiresa->cDims; - if(vt) + if(*ppsa && (*ppsa)->cDims==wiresa->cDims) + { + if(((*ppsa)->fFeatures & ~FADF_AUTOSETFLAGS) != (wiresa->fFeatures & ~FADF_AUTOSETFLAGS)) + RpcRaiseException(DISP_E_BADCALLEE); + + if(SAFEARRAY_GetCellCount(*ppsa)*(*ppsa)->cbElements != cell_count*elem_mem_size(wiresa, sftype)) + { + if((*ppsa)->fFeatures & (FADF_AUTO|FADF_STATIC|FADF_EMBEDDED|FADF_FIXEDSIZE)) + RpcRaiseException(DISP_E_BADCALLEE); + + hr = SafeArrayDestroyData(*ppsa); + if(FAILED(hr)) + RpcRaiseException(hr); + } + memcpy((*ppsa)->rgsabound, wiresab, sizeof(*wiresab)*wiresa->cDims); + + if((*ppsa)->fFeatures & FADF_HAVEVARTYPE) + ((DWORD*)(*ppsa))[-1] = vt; + } + else if(vt) { SafeArrayDestroy(*ppsa); *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); @@ -1028,11 +1047,10 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->fFeatures |= (wiresa->fFeatures & ~(FADF_AUTOSETFLAGS)); /* FIXME: there should be a limit on how large wiresa->cbElements can be */ (*ppsa)->cbElements = elem_mem_size(wiresa, sftype); - (*ppsa)->cLocks = 0; /* SafeArrayCreateEx allocates the data for us, but * SafeArrayAllocDescriptor doesn't */ - if(!vt) + if(!(*ppsa)->pvData) { hr = SafeArrayAllocData(*ppsa); if (FAILED(hr))

1 0

Piotr Caban : oleaut32: Don' t overwrite pointers in VARIANT_UserUnmarshal so we may free or reuse them.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: ba498e6002728df149730f7089c0c81e661639d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba498e6002728df149730f708… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:44 2016 +0100 oleaut32: Don't overwrite pointers in VARIANT_UserUnmarshal so we may free or reuse them. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 726dd96..955b709 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -349,10 +349,6 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char * ptr = *(DWORD*)Buffer; Buffer += sizeof(DWORD); - /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal() - would try to release. This has been done already with a VariantClear(). */ - *ppunk = NULL; - if(!ptr) return Buffer; @@ -528,8 +524,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe memset(V_BYREF(pvar), 0, mem_size); } - if(!(header->vt & VT_ARRAY)) + if(!(header->vt & VT_ARRAY) + && (header->vt & VT_TYPEMASK) != VT_BSTR + && (header->vt & VT_TYPEMASK) != VT_VARIANT + && (header->vt & VT_TYPEMASK) != VT_UNKNOWN + && (header->vt & VT_TYPEMASK) != VT_DISPATCH + && (header->vt & VT_TYPEMASK) != VT_RECORD) memcpy(V_BYREF(pvar), Pos, type_size); + if((header->vt & VT_TYPEMASK) != VT_VARIANT) Pos += type_size; else @@ -540,6 +542,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe VariantClear(pvar); if(header->vt & VT_ARRAY) V_ARRAY(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_BSTR) + V_BSTR(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_UNKNOWN) + V_UNKNOWN(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_DISPATCH) + V_DISPATCH(pvar) = NULL; + else if((header->vt & VT_TYPEMASK) == VT_RECORD) + V_RECORD(pvar) = NULL; else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else @@ -564,11 +574,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe switch (header->vt) { case VT_BSTR: - V_BSTR(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar)); break; case VT_BSTR | VT_BYREF: - *V_BSTRREF(pvar) = NULL; Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar)); break; case VT_VARIANT | VT_BYREF:

1 0

Piotr Caban : oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 1063623dfb23af70334aa688a5ae6aabdff0f48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1063623dfb23af70334aa688a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 13 09:51:57 2016 +0100 oleaut32/tests: Show that VARIANT_UserUnmarshal may reuse passed in BSTR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d04a366..b9478d1 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -767,7 +767,7 @@ static void test_marshal_VARIANT(void) double d; void *mem; DWORD *wirev; - BSTR b; + BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t',0}; SAFEARRAYBOUND sab; LPSAFEARRAY lpsa, lpsa2, lpsa_copy; @@ -1237,15 +1237,21 @@ static void test_marshal_VARIANT(void) ok(*wirev, "wv[6] %08x\n", *wirev); /* win2k: this is b. winxp: this is (char*)b + 1 */ wirev++; check_bstr(wirev, b); + b2 = SysAllocString(str); + b2[0] = 0; + V_VT(&v2) = VT_BSTR | VT_BYREF; + V_BSTRREF(&v2) = &b2; + mem = b2; VariantInit(&v2); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(mem == b2, "BSTR should be reused\n"); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - VARIANT_UserFree(&umcb.Flags, &v2); + SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b);

1 0

Alexandre Julliard : explorer: Support a quoted /desktop option.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 91a394a616e5d44db5100d24768ed037a6ae93be URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a394a616e5d44db5100d247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 19:41:49 2016 +0900 explorer: Support a quoted /desktop option. Workaround for Worms Armageddon which uses an invalid but previously supported syntax. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c178017..8bfb826 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -682,6 +682,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_root[] = {'/','r','o','o','t',','}; static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; + static const WCHAR arg_desktop_quotes[] = {'"','/','d','e','s','k','t','o','p'}; LPWSTR p = commandline; @@ -716,6 +717,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 */ } + /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ + else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + { + p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ + } else { /* left over command line is generally the path to be opened */

1 0

Bernhard Übelacker : msvcp110/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: adfe3f1deed2a1186e65ec3723b16ac0e8663447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfe3f1deed2a1186e65ec372… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:11 2016 +0100 msvcp110/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index f688c8d..58db584 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -155,9 +155,45 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x20, 0x20}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(msvcp110) { if(!init()) return; test_tr2_sys__Last_write_time(); + test_vbtable_size_exports(); FreeLibrary(msvcp); }

1 0

Bernhard Übelacker : msvcp100/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 243b234149c0ddb5db60dbf1d56279b708e68807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243b234149c0ddb5db60dbf1d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:29 2016 +0100 msvcp100/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 7775888..4740951 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -195,6 +195,41 @@ static void test__Container_base12(void) ok(p2.head == (void*)0xdeadbeef, "p2.head = %p, expected 0xdeadbeef\n", p2.head); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x18, 0x18}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(misc) { if(!init()) @@ -202,5 +237,7 @@ START_TEST(misc) test__Container_base12(); + test_vbtable_size_exports(); + FreeLibrary(msvcp); }

1 0

Bernhard Übelacker : msvcp90/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: c612ef43661cb50fa958cc67f79ead519f145bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c612ef43661cb50fa958cc67f… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:56 2016 +0100 msvcp90/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/misc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d4e1f5a..34d6090 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -991,6 +991,65 @@ static void test_complex(void) ok(almost_eq(c2.imag, 0.00035447), "c2.imag = %g\n", c2.imag); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x5c, 0xa8}, "??_8?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(misc) { if(!init()) @@ -1008,6 +1067,7 @@ START_TEST(misc) test_allocator_char(); test_Ctraits_math_functions(); test_complex(); + test_vbtable_size_exports(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0