December 2012 - Wine-commits

Nikolay Sivov : msxml3: More tests for DISPID_VALUE properties handling.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 83e87a323202b3ee5d91400f8046d66442074f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e87a323202b3ee5d91400f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 20 13:12:03 2012 +0400 msxml3: More tests for DISPID_VALUE properties handling. --- dlls/msxml3/tests/domdoc.c | 138 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/schema.c | 22 +++++++ 2 files changed, 157 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d846db5..23ee499 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9475,6 +9475,10 @@ static void test_mxnamespacemanager(void) hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); if (hr == S_OK) { + IDispatchEx *dispex; + VARIANT arg, ret; + DISPPARAMS dispparams; + ok(prefixes != NULL, "got %p\n", prefixes); EXPECT_REF(nsmgr, 2); EXPECT_REF(mgr2, 2); @@ -9488,6 +9492,25 @@ static void test_mxnamespacemanager(void) IUnknown_Release(unk1); IUnknown_Release(unk2); + + hr = IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); IMXNamespacePrefixes_Release(prefixes); } IVBMXNamespaceManager_Release(mgr2); @@ -10004,7 +10027,7 @@ static void test_dispex(void) ok(did == DISPID_VALUE, "got %d\n", did); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 0; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10018,7 +10041,7 @@ static void test_dispex(void) ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 2; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10032,7 +10055,7 @@ static void test_dispex(void) ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 1; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10090,6 +10113,26 @@ static void test_dispex(void) EXPECT_HR(hr, S_OK); IXMLDOMParseError_QueryInterface(error, &IID_IUnknown, (void**)&unk); test_domobj_dispex(unk); + + hr = IXMLDOMParseError_QueryInterface(error, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); + IUnknown_Release(unk); IXMLDOMParseError_Release(error); @@ -10142,6 +10185,95 @@ static void test_dispex(void) ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + did = -1; + hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(did == DISPID_VALUE, "got %d\n", did); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine { + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +} + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine { + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +} + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); +todo_wine { + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +} IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index c350267..fe6e6b6 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1463,8 +1463,11 @@ static void test_obj_dispex(IUnknown *obj) static void test_dispex(void) { IXMLDOMSchemaCollection *cache; + IDispatchEx *dispex; IUnknown *unk; HRESULT hr; + DISPPARAMS dispparams; + VARIANT arg, ret; cache = create_cache(&IID_IXMLDOMSchemaCollection); if (!cache) return; @@ -1474,6 +1477,25 @@ static void test_dispex(void) test_obj_dispex(unk); IUnknown_Release(unk); + hr = IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); + IXMLDOMSchemaCollection_Release(cache); }

1 0

Nikolay Sivov : shlwapi: Implement IsCharSpaceA().
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 16cc2b87530947415dcff6e545bdd77a232edbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cc2b87530947415dcff6e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 20 08:43:27 2012 +0400 shlwapi: Implement IsCharSpaceA(). --- dlls/shlwapi/ordinal.c | 19 ------------------- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 25 +++++++++++++++++++++++++ include/shlwapi.h | 4 ++++ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 88f415b..19ab3d9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -638,25 +638,6 @@ INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax) } /************************************************************************* - * @ [SHLWAPI.29] - * - * Determine if a Unicode character is a space. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is a space, - * FALSE otherwise. - */ -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - WORD CharType; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); -} - -/************************************************************************* * @ [SHLWAPI.30] * * Determine if a Unicode character is a blank. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 025d48a..bf33e62 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -566,6 +566,7 @@ @ stdcall HashData (ptr long ptr long) @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW +@ stdcall IsCharSpaceA(long) @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 18606ce..1a4ad14 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2824,3 +2824,28 @@ end: HeapFree(GetProcessHeap(), 0, dllname); return hr; } + +BOOL WINAPI IsCharSpaceA(CHAR c) +{ + WORD CharType; + return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &CharType) && (CharType & C1_SPACE); +} + +/************************************************************************* + * @ [SHLWAPI.29] + * + * Determine if a Unicode character is a space. + * + * PARAMS + * wc [I] Character to check. + * + * RETURNS + * TRUE, if wc is a space, + * FALSE otherwise. + */ +BOOL WINAPI IsCharSpaceW(WCHAR wc) +{ + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 067ef7b..a1436fa 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -935,6 +935,10 @@ HRESULT WINAPI StrRetToBufW(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); HRESULT WINAPI StrRetToBSTR(STRRET*,LPCITEMIDLIST,BSTR*); +BOOL WINAPI IsCharSpaceA(CHAR); +BOOL WINAPI IsCharSpaceW(WCHAR); +#define IsCharSpace WINELIB_NAME_AW(IsCharSpace) + #endif /* NO_SHLWAPI_STRFCNS */

1 0

Piotr Caban : msvcrt: Don' t call local_unwind2 when Cookie equals MSVCRT_JMP_MAGIC in longjmp.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 76969a8651f525cb87095a80ba4c220888ef6226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76969a8651f525cb87095a80b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 20 11:13:45 2012 +0100 msvcrt: Don't call local_unwind2 when Cookie equals MSVCRT_JMP_MAGIC in longjmp. --- dlls/msvcrt/except_i386.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7c3265c..8639579 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1014,17 +1014,18 @@ void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) if (jmp->Registration) { - if (!IsBadReadPtr(&jmp->Cookie, sizeof(long)) && - jmp->Cookie == MSVCRT_JMP_MAGIC && jmp->UnwindFunc) + if (IsBadReadPtr(&jmp->Cookie, sizeof(long)) || jmp->Cookie != MSVCRT_JMP_MAGIC) + { + msvcrt_local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, + jmp->TryLevel, (void *)jmp->Ebp); + } + else if(jmp->UnwindFunc) { MSVCRT_unwind_function unwind_func; unwind_func=(MSVCRT_unwind_function)jmp->UnwindFunc; unwind_func(jmp); } - else - msvcrt_local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, - jmp->TryLevel, (void *)jmp->Ebp); } if (!retval)

1 0

Alexandre Julliard : oleaut32: Use a saner calling convention for the marshaller asm thunks.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 2915e47979e31a8911a4f95d2d90264e6d6a0f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2915e47979e31a8911a4f95d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 12:48:27 2012 +0100 oleaut32: Use a saner calling convention for the marshaller asm thunks. --- dlls/oleaut32/tmarshal.c | 70 +++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a6108ad..dd19fa1 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -409,15 +409,15 @@ static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, #include "pshpack1.h" typedef struct _TMAsmProxy { - BYTE popleax; + DWORD lealeax; + BYTE pushleax; BYTE pushlval; DWORD nr; - BYTE pushleax; BYTE lcall; DWORD xcall; BYTE lret; WORD bytestopop; - BYTE nop; + WORD nop; } TMAsmProxy; #include "poppack.h" @@ -1330,10 +1330,10 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT || !elem->u.paramdesc.wParamFlags); } -static DWORD -xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) +static DWORD WINAPI xCall(int method, void **args) { - DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; + TMProxyImpl *tpinfo = args[0]; + DWORD *xargs; const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); @@ -1393,7 +1393,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) if (nrofnames > sizeof(names)/sizeof(names[0])) ERR("Need more names!\n"); - xargs = args; + xargs = (DWORD *)(args + 1); for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; if (relaydeb) { @@ -1460,7 +1460,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) buf.curoff = 0; /* generic deserializer using typelib description */ - xargs = args; + xargs = (DWORD *)(args + 1); status = S_OK; for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; @@ -1719,8 +1719,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) { int j; - /* nrofargs without This */ - int nrofargs; + /* nrofargs including This */ + int nrofargs = 1; ITypeInfo *tinfo2; TMAsmProxy *xasm = proxy->asmstubs + num; HRESULT hres; @@ -1733,7 +1733,6 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) } ITypeInfo_Release(tinfo2); /* some args take more than 4 byte on the stack */ - nrofargs = 0; for (j=0;j<fdesc->cParams;j++) nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo); @@ -1742,25 +1741,21 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) ERR("calling convention is not stdcall????\n"); return E_FAIL; } -/* popl %eax - return ptr - * pushl <nr> +/* leal 4(%esp),%eax * pushl %eax + * pushl <nr> * call xCall - * lret <nr> (+4) - * - * - * arg3 arg2 arg1 <method> <returnptr> + * lret <nr> */ - xasm->popleax = 0x58; + xasm->lealeax = 0x0424448d; + xasm->pushleax = 0x50; xasm->pushlval = 0x68; xasm->nr = num; - xasm->pushleax = 0x50; - xasm->lcall = 0xe8; /* relative jump */ - xasm->xcall = (DWORD)xCall; - xasm->xcall -= (DWORD)&(xasm->lret); + xasm->lcall = 0xe8; + xasm->xcall = (char *)xCall - (char *)&xasm->lret; xasm->lret = 0xc2; - xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ - xasm->nop = 0x90; + xasm->bytestopop = nrofargs * 4; + xasm->nop = 0x9090; proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); @@ -1800,8 +1795,6 @@ PSFacBuf_CreateProxy( proxy = CoTaskMemAlloc(sizeof(TMProxyImpl)); if (!proxy) return E_OUTOFMEMORY; - assert(sizeof(TMAsmProxy) == 16); - proxy->dispatch = NULL; proxy->dispatch_proxy = NULL; proxy->outerunknown = pUnkOuter; @@ -1863,40 +1856,23 @@ PSFacBuf_CreateProxy( proxy->lpvtbl[i] = ProxyIUnknown_Release; break; case 3: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount; break; case 4: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[4] = ProxyIDispatch_GetTypeInfo; break; case 5: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[5] = ProxyIDispatch_GetIDsOfNames; break; case 6: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[6] = ProxyIDispatch_Invoke; break; default: hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; } }

1 0

Alexandre Julliard : oleaut32: Cleanup some relay traces.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 718e2f256ed39f6f7e1598687fd58614551caab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718e2f256ed39f6f7e1598687… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 12:55:37 2012 +0100 oleaut32: Cleanup some relay traces. --- dlls/oleaut32/tmarshal.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index dd19fa1..8b47eed 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1336,7 +1336,7 @@ static DWORD WINAPI xCall(int method, void **args) DWORD *xargs; const FUNCDESC *fdesc; HRESULT hres; - int i, relaydeb = TRACE_ON(olerelay); + int i; marshal_state buf; RPCOLEMESSAGE msg; ULONG status; @@ -1368,7 +1368,7 @@ static DWORD WINAPI xCall(int method, void **args) LeaveCriticalSection(&tpinfo->crit); - if (relaydeb) { + if (TRACE_ON(olerelay)) { TRACE_(olerelay)("->"); if (iname) TRACE_(olerelay)("%s:",relaystr(iname)); @@ -1396,7 +1396,7 @@ static DWORD WINAPI xCall(int method, void **args) xargs = (DWORD *)(args + 1); for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; - if (relaydeb) { + if (TRACE_ON(olerelay)) { if (i) TRACE_(olerelay)(","); if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); @@ -1407,7 +1407,7 @@ static DWORD WINAPI xCall(int method, void **args) if (elem->tdesc.vt != VT_PTR) { xargs+=_argsize(&elem->tdesc, tinfo); - if (relaydeb) TRACE_(olerelay)("[out]"); + TRACE_(olerelay)("[out]"); continue; } else @@ -1419,7 +1419,7 @@ static DWORD WINAPI xCall(int method, void **args) hres = serialize_param( tinfo, is_in_elem(elem), - relaydeb, + TRACE_ON(olerelay), FALSE, &elem->tdesc, xargs, @@ -1432,7 +1432,7 @@ static DWORD WINAPI xCall(int method, void **args) } xargs+=_argsize(&elem->tdesc, tinfo); } - if (relaydeb) TRACE_(olerelay)(")"); + TRACE_(olerelay)(")"); memset(&msg,0,sizeof(msg)); msg.cbBuffer = buf.curoff; @@ -1443,14 +1443,14 @@ static DWORD WINAPI xCall(int method, void **args) goto exit; } memcpy(msg.Buffer,buf.base,buf.curoff); - if (relaydeb) TRACE_(olerelay)("\n"); + TRACE_(olerelay)("\n"); hres = IRpcChannelBuffer_SendReceive(chanbuf,&msg,&status); if (hres) { ERR("RpcChannelBuffer SendReceive failed, %x\n",hres); goto exit; } - if (relaydeb) TRACE_(olerelay)(" status = %08x (",status); + TRACE_(olerelay)(" status = %08x (",status); if (buf.base) buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer); else @@ -1465,20 +1465,19 @@ static DWORD WINAPI xCall(int method, void **args) for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; - if (relaydeb) { - if (i) TRACE_(olerelay)(","); - if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); - } + if (i) TRACE_(olerelay)(","); + if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); + /* No need to marshal other data than FOUT and any VT_PTR */ if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) { xargs += _argsize(&elem->tdesc, tinfo); - if (relaydeb) TRACE_(olerelay)("[in]"); + TRACE_(olerelay)("[in]"); continue; } hres = deserialize_param( tinfo, is_out_elem(elem), - relaydeb, + TRACE_ON(olerelay), FALSE, &(elem->tdesc), xargs, @@ -1495,7 +1494,7 @@ static DWORD WINAPI xCall(int method, void **args) hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD)); if (hres != S_OK) goto exit; - if (relaydeb) TRACE_(olerelay)(") = %08x\n", remoteresult); + TRACE_(olerelay)(") = %08x\n", remoteresult); hres = remoteresult;

1 0

Alexandre Julliard : gdi32: Compute the extents of the whole string at once in ExtTextOut.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 0da8c0d92ec095d806ffdd525cf03979283d5af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da8c0d92ec095d806ffdd525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 14:32:58 2012 +0100 gdi32: Compute the extents of the whole string at once in ExtTextOut. --- dlls/gdi32/font.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3f79dff..51a6c23 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2232,46 +2232,49 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) { UINT i; - SIZE tmpsz; POINT total = {0, 0}, desired[2]; deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*deltas)); - for(i = 0; i < count; i++) + if (lpDx) { - if(lpDx) + if (flags & ETO_PDY) { - if(flags & ETO_PDY) + for (i = 0; i < count; i++) { deltas[i].x = lpDx[i * 2] + char_extra; deltas[i].y = -lpDx[i * 2 + 1]; } - else + } + else + { + for (i = 0; i < count; i++) { deltas[i].x = lpDx[i] + char_extra; deltas[i].y = 0; } - } + } + else + { + INT *dx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*dx) ); + + if (flags & ETO_GLYPH_INDEX) + GetTextExtentExPointI( hdc, glyphs, count, -1, NULL, dx, &sz ); else - { - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs + i, 1, &tmpsz); - else - GetTextExtentPointW(hdc, reordered_str + i, 1, &tmpsz); + GetTextExtentExPointW( hdc, reordered_str, count, -1, NULL, dx, &sz ); - deltas[i].x = tmpsz.cx; - deltas[i].y = 0; - } - - if (!(flags & ETO_GLYPH_INDEX) && (dc->breakExtra || breakRem) && reordered_str[i] == tm.tmBreakChar) + deltas[0].x = dx[0]; + deltas[0].y = 0; + for (i = 1; i < count; i++) { - deltas[i].x = deltas[i].x + dc->breakExtra; - if (breakRem > 0) - { - breakRem--; - deltas[i].x++; - } + deltas[i].x = dx[i] - dx[i - 1]; + deltas[i].y = 0; } + HeapFree( GetProcessHeap(), 0, dx ); + } + + for(i = 0; i < count; i++) + { total.x += deltas[i].x; total.y += deltas[i].y;

1 0

Alexandre Julliard : gdi32: Avoid duplicate computation of text extents in ExtTextOut.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 57f84bc7bb108c7ef3e0d533db7141c7ce18e297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f84bc7bb108c7ef3e0d533d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:08:23 2012 +0100 gdi32: Avoid duplicate computation of text extents in ExtTextOut. --- dlls/gdi32/font.c | 43 +++++++++---------------------------------- 1 files changed, 9 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 51a6c23..fe32167 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2097,7 +2097,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, INT char_extra; SIZE sz; RECT rc; - BOOL done_extents = FALSE; POINT *deltas = NULL, width = {0, 0}; DWORD type; DC * dc = get_dc_ptr( hdc ); @@ -2125,9 +2124,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, return ret; } - if (!lprect) - flags &= ~ETO_CLIPPED; - if (flags & ETO_RTLREADING) align |= TA_RTLREADING; if (layout & LAYOUT_RTL) { @@ -2189,32 +2185,15 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, sinEsc = 0; } - if(flags & (ETO_CLIPPED | ETO_OPAQUE)) + if (lprect) { - if(!lprect) - { - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs, count, &sz); - else - GetTextExtentPointW(hdc, reordered_str, count, &sz); - - done_extents = TRUE; - rc.left = x; - rc.top = y; - rc.right = x + sz.cx; - rc.bottom = y + sz.cy; - } - else - { - rc = *lprect; - } - + rc = *lprect; LPtoDP(hdc, (POINT*)&rc, 2); order_rect( &rc ); + if (flags & ETO_OPAQUE) + physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); } - - if (lprect && (flags & ETO_OPAQUE)) - physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); + else flags &= ~ETO_CLIPPED; if(count == 0) { @@ -2306,14 +2285,10 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { POINT desired[2]; - if(!done_extents) - { - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs, count, &sz); - else - GetTextExtentPointW(hdc, reordered_str, count, &sz); - done_extents = TRUE; - } + if(flags & ETO_GLYPH_INDEX) + GetTextExtentPointI(hdc, glyphs, count, &sz); + else + GetTextExtentPointW(hdc, reordered_str, count, &sz); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0;

1 0

Dmitry Timoshkov : wineps.drv: Keep track of all supported device resolutions.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: d5f27e194a70047f4040ebbb374ef163860d10ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f27e194a70047f4040ebbb3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 19 12:43:46 2012 +0800 wineps.drv: Keep track of all supported device resolutions. --- dlls/wineps.drv/driver.c | 22 +++++++++++++++------- dlls/wineps.drv/ppd.c | 21 +++++++++++++++++++++ dlls/wineps.drv/psdrv.h | 8 ++++++++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 70ee2b0..18be8e0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -638,14 +638,22 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP case DC_ENUMRESOLUTIONS: { - LONG *lp = (LONG*)lpszOutput; + RESOLUTION *res; + LONG *lp = (LONG *)lpszOutput; + int i = 0; - if(lpszOutput != NULL) { - lp[0] = pi->ppd->DefaultResolution; - lp[1] = pi->ppd->DefaultResolution; - } - ret = 1; - break; + LIST_FOR_EACH_ENTRY(res, &pi->ppd->Resolutions, RESOLUTION, entry) + { + i++; + if (lpszOutput != NULL) + { + lp[0] = res->resx; + lp[1] = res->resy; + lp += 2; + } + } + ret = i; + break; } /* Windows returns 9999 too */ diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 1cba1b8..9d529b4 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -659,6 +659,7 @@ PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) ppd->ColorDevice = CD_NotSpecified; + list_init( &ppd->Resolutions ); list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); @@ -713,6 +714,26 @@ PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } + else if(!strcmp("*Resolution", tuple.key)) + { + SIZE sz; + if (parse_resolution(tuple.option, &sz)) + { + RESOLUTION *res; + + TRACE("Resolution %dx%d, invocation %s\n", sz.cx, sz.cy, tuple.value); + + res = HeapAlloc( GetProcessHeap(), 0, sizeof(*res) ); + res->resx = sz.cx; + res->resy = sz.cy; + res->InvocationString = tuple.value; + tuple.value = NULL; + list_add_tail( &ppd->Resolutions, &res->entry ); + } + else + WARN("failed to parse Resolution %s\n", debugstr_a(tuple.option)); + } + else if(!strcmp("*Font", tuple.key)) { FONTNAME *fn = HeapAlloc( PSDRV_Heap, 0, sizeof(*fn) ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 428f7ba..12ce526 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -183,6 +183,13 @@ typedef struct WORD WinDuplex; /* eg DMDUP_SIMPLEX */ } DUPLEX; +typedef struct +{ + struct list entry; + int resx, resy; + char *InvocationString; +} RESOLUTION; + /* Many Mac OS X based ppd files don't include a *ColorDevice line, so we use a tristate here rather than a boolean. Code that cares is expected to treat these as if they were colour. */ @@ -196,6 +203,7 @@ typedef struct { char *NickName; int LanguageLevel; COLORDEVICE ColorDevice; + struct list Resolutions; int DefaultResolution; signed int LandscapeOrientation; char *JCLBegin;

1 0

Dmitry Timoshkov : wineps.drv: Ignore requested resolutions not supported by device.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: d170f05ece150db8ae298e504753ec25b9d77350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d170f05ece150db8ae298e504… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 20 16:24:06 2012 +0800 wineps.drv: Ignore requested resolutions not supported by device. --- dlls/wineps.drv/init.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 98768a4..2085a47 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -151,20 +151,43 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { PAGESIZE *page; - INT width = 0, height = 0; + RESOLUTION *res; + INT width = 0, height = 0, resx = 0, resy = 0; - if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) + if (physDev->Devmode->dmPublic.dmFields & (DM_PRINTQUALITY | DM_YRESOLUTION | DM_LOGPIXELS)) { - physDev->logPixelsX = physDev->Devmode->dmPublic.u1.s1.dmPrintQuality; - physDev->logPixelsY = physDev->logPixelsX; + if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) + resx = resy = physDev->Devmode->dmPublic.u1.s1.dmPrintQuality; + + if (physDev->Devmode->dmPublic.dmFields & DM_YRESOLUTION) + resy = physDev->Devmode->dmPublic.dmYResolution; + + if (physDev->Devmode->dmPublic.dmFields & DM_LOGPIXELS) + resx = resy = physDev->Devmode->dmPublic.dmLogPixels; + + LIST_FOR_EACH_ENTRY(res, &physDev->pi->ppd->Resolutions, RESOLUTION, entry) + { + if (res->resx == resx && res->resy == resy) + { + physDev->logPixelsX = resx; + physDev->logPixelsY = resy; + break; + } + } + + if (&res->entry == &physDev->pi->ppd->Resolutions) + { + WARN("Requested resolution %dx%d is not supported by device\n", resx, resy); + physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; + physDev->logPixelsY = physDev->logPixelsX; + } } else { + WARN("Using default device resolution %d\n", physDev->pi->ppd->DefaultResolution); physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; physDev->logPixelsY = physDev->logPixelsX; } - if (physDev->Devmode->dmPublic.dmFields & DM_YRESOLUTION) - physDev->logPixelsY = physDev->Devmode->dmPublic.dmYResolution; if(physDev->Devmode->dmPublic.dmFields & DM_PAPERSIZE) { LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) {

1 0

Dmitry Timoshkov : wineps.drv: Slightly simplify a PPD parser code snippet.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: eb272cbd31380a115f9665e7bd2a2aaab5a3b000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb272cbd31380a115f9665e7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 20 16:24:35 2012 +0800 wineps.drv: Slightly simplify a PPD parser code snippet. --- dlls/wineps.drv/ppd.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 9d529b4..db1e580 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -385,17 +385,11 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple) ; endkey = cp; - if(*cp == ':') { /* <key>: */ + while (isspace(*cp)) cp++; + if (*cp == ':') /* <key>: */ gotoption = FALSE; - } else { - while(isspace(*cp)) - cp++; - if(*cp == ':') { /* <key> : */ - gotoption = FALSE; - } else { /* <key> <option> */ - opt = cp; - } - } + else /* <key> <option> */ + opt = cp; tuple->key = HeapAlloc( PSDRV_Heap, 0, endkey - line + 1 ); if(!tuple->key) return FALSE; @@ -434,7 +428,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple) } /* cp should point to a ':', so we increment past it */ - cp++; + cp++; while(isspace(*cp)) cp++;

1 0