December 2012 - Wine-Commits

Alexandre Julliard : oleaut32: Cleanup some relay traces.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

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 Dec. 20, 2012

Dec. 20, 2012

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

Detlef Riekenberg : api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: cdec918b2600cc27296b1b0170ed5994868e513d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdec918b2600cc27296b1b017… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:01 2012 +0100 api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll. --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in | 3 + .../api-ms-win-downlevel-ole32-l1-1-0.spec | 48 ++++++++++++++++++++ tools/make_specfiles | 4 ++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a3453fa..3c5dccd 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index 6642d38..4c2c45f 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in new file mode 100644 index 0000000..813b82d --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-ole32-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec new file mode 100644 index 0000000..a0eabe9 --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec @@ -0,0 +1,48 @@ +@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler +@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stub CoGetApartmentType +@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject +@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stub CoGetStdMarshalEx +@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject +@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy +@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter +@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject +@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stdcall CoUninitialize() ole32.CoUninitialize +@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles +@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream +@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID diff --git a/tools/make_specfiles b/tools/make_specfiles index 11157ad..b24280e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", ], [ + "ole32", + "api-ms-win-downlevel-ole32-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Frédéric Delanoy : xmllite: Avoid dead initialization (clang).
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 2952db640397f417115a54439e51df1d84e4098e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952db640397f417115a54439… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 20 00:29:19 2012 +0100 xmllite: Avoid dead initialization (clang). --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5c027ef..9e32216 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -449,7 +449,7 @@ static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) { encoded_buffer *buffer = &readerinput->buffer->encoded; - int len = buffer->written; + int len; if (cp == CP_UTF8) len = readerinput_get_utf8_convlen(readerinput);

1 0

Austin English : winedbg: stack_backtrace should not return a value.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: bc4e1efce30c5c5661ccd314d81824fc8c74fc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4e1efce30c5c5661ccd314d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:05:28 2012 -0600 winedbg: stack_backtrace should not return a value. --- programs/winedbg/stack.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 74dcc40..f49480a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -447,7 +447,11 @@ void stack_backtrace(DWORD tid) /* backtrace every thread in every process except the debugger itself, * invoking via "bt all" */ - if (tid == -1) return backtrace_all(); + if (tid == -1) + { + backtrace_all(); + return; + } if (!dbg_curr_process) {

1 0

Austin English : widl: add_interface_typeinfo should not return a value.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: ecfb6539f6126ee753e9880fadd0d4031552e9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfb6539f6126ee753e9880fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:03:10 2012 -0600 widl: add_interface_typeinfo should not return a value. --- tools/widl/write_msft.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 416f81d..918923b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2026,8 +2026,10 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) return; } - if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) - return add_dispinterface_typeinfo(typelib, interface); + if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) { + add_dispinterface_typeinfo(typelib, interface); + return; + } /* midl adds the parent interface first, unless the parent itself has no parent (i.e. it stops before IUnknown). */

1 0

Alistair Leslie-Hughes : oleaut32: Don' t output an error when the typelib cannot be found.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: f20427361c77e08ee852b0d304b5e2fef696491e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20427361c77e08ee852b0d30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 14:05:09 2012 +1100 oleaut32: Don't output an error when the typelib cannot be found. --- dlls/oleaut32/typelib.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa9b050..722b0c4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2544,9 +2544,10 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } - - hr = E_FAIL; } + + TRACE("No TYPELIB resource found\n"); + hr = E_FAIL; } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); @@ -2949,8 +2950,6 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } - else - ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; @@ -2966,8 +2965,15 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath list_add_head(&tlb_cache, &impl->entry); LeaveCriticalSection(&cache_section); ret = S_OK; - } else - ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + } + else + { + if(ret != E_FAIL) + ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + + ret = TYPE_E_CANTLOADLIBRARY; + } + return ret; }

1 0

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

Dec. 20, 2012

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

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: e431d89ed2811496e3917523cda6c13083c3afb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e431d89ed2811496e3917523c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 19 20:34:03 2012 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/file.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3d29b28..0166fff 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3296,7 +3296,8 @@ static void test_GetFileInformationByHandleEx(void) /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "GetFileInformationByHandleEx: GetTempFileNameA failed, got error %u.\n", GetLastError()); - ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " + ret2 = GetFileAttributesA(tempFileName); + ok(ret2 != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " "GetFileAttributesA failed to find the temp file, got error %u.\n", GetLastError()); directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -3359,7 +3360,8 @@ static void test_OpenFileById(void) /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); - ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, + ret2 = GetFileAttributesA(tempFileName); + ok(ret2 != INVALID_FILE_ATTRIBUTES, "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)/sizeof(tempFileNameW[0]));

1 0

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

Dec. 20, 2012

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