February 2020 - Wine-Commits

Alexandre Julliard : unicode: Expand surrogates in decomposition tables.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 0576fa43c414f866e1e91dae89bd2b096d7bf2a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0576fa43c414f866e1e91dae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 14:36:21 2020 +0100 unicode: Expand surrogates in decomposition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 96 ++--- libs/port/decompose.c | 914 ++++++++++++++++++++++---------------------- tools/make_unicode | 15 +- 3 files changed, 518 insertions(+), 507 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0576fa43c414f866e1e9…

1 0

Jacek Caban : guiddef.h: Remove GUID_NULL declaration.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: c041605b0074e6b12e5ea1df0cc645e772a220a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c041605b0074e6b12e5ea1df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 15:21:11 2020 +0100 guiddef.h: Remove GUID_NULL declaration. It's declared in cguid.h with proper extern "C". Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 1 + dlls/rpcrt4/ndr_contexthandle.c | 1 + dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 1 + include/guiddef.h | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 0fcaf757b2..4637d62f8b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -30,6 +30,7 @@ #undef CLSID_DOMDocument #include "msxml2did.h" #include "dispex.h" +#include "cguid.h" #include "wine/test.h" diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 848d924e97..36deb41d81 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -22,6 +22,7 @@ #include "ndr_misc.h" #include "rpc_assoc.h" #include "rpcndr.h" +#include "cguid.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f8a4e93efc..0840341b7d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -37,6 +37,7 @@ #include "winioctl.h" #include "rpc.h" #include "rpcdce.h" +#include "cguid.h" #include "setupapi_private.h" diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..b887bd8977 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -31,6 +31,7 @@ #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" +#include "cguid.h" #include "wine/heap.h" #include "wine/test.h" diff --git a/include/guiddef.h b/include/guiddef.h index ba39dd87b4..cc26e8b3a5 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -167,6 +167,4 @@ inline bool operator!=(const GUID& guidOne, const GUID& guidOther) } #endif -extern const IID GUID_NULL; - #endif /* _GUIDDEF_H_ */

1 0

Daniel Lehman : msvcrt/tests: Add some wcstombs_s_l tests.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 05e335c103dce905a12e35777fe3a8763cf1b84c URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e335c103dce905a12e3577… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 3 11:15:54 2020 -0800 msvcrt/tests: Add some wcstombs_s_l tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8f97d8959e..32e264908a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -76,6 +76,7 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); +static int (__cdecl *p_wcstombs_s_l)(size_t*,char*,size_t,const wchar_t*,size_t,_locale_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); static int (__cdecl *p_mbsrtowcs_s)(size_t*,wchar_t*,size_t,const char**,size_t,mbstate_t*); @@ -2277,6 +2278,76 @@ static void test_mbstowcs(void) setlocale(LC_ALL, "C"); } +static void test__wcstombs_s_l(void) +{ + struct test { + const wchar_t *wstr; + size_t wlen; + const char *str; + size_t len; + size_t ret; + int err; + const char *locale; + BOOL todo_ret; + BOOL todo_err; + } tests[] = { + /* wstr str ret err locale */ + { L"", 0, NULL, 0, 1, 0, NULL }, + { L"\xfffd", 1, NULL, 0, 2, 0, NULL }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, NULL, TRUE }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, NULL, TRUE }, + { L"text", _TRUNCATE, "text", 5, 5, 0, NULL }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, NULL, FALSE, TRUE }, + { L"text", 5, "", 3, 0, ERANGE, NULL, TRUE }, + + { L"", 0, NULL, 0, 1, 0, "English_United States.1252", TRUE, TRUE }, + { L"\xfffd", 1, NULL, 0, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"text", _TRUNCATE, "text", 5, 5, 0, "English_United States.1252" }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, "English_United States.1252", FALSE, TRUE }, + { L"text", 5, "", 3, 0, ERANGE, "English_United States.1252", TRUE }, + }; + _locale_t locale; + char out[6]; + size_t ret; + int err; + int i; + + if(!p__create_locale) { + win_skip("_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if(tests[i].locale) + { + locale = p__create_locale(LC_ALL, tests[i].locale); + ok(locale != NULL, "_create_locale failed for %s\n", tests[i].locale); + } + else + locale = NULL; + + ret = ~0; + memset(out, 0xcc, sizeof(out)); + err = p_wcstombs_s_l(&ret, tests[i].str ? out : NULL, tests[i].len, + tests[i].wstr, tests[i].wlen, locale); + todo_wine_if(tests[i].todo_ret) + ok(ret == tests[i].ret, "%d: expected ret %d, got %d for '%s' in locale %s\n", i, tests[i].ret, ret, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + todo_wine_if(tests[i].todo_err) + ok(err == tests[i].err, "%d: expected err %d, got %d for '%s' in locale %s\n", i, tests[i].err, err, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + if(tests[i].str) + ok(!memcmp(out, tests[i].str, strlen(tests[i].str)+1), + "%d: expected out %s, got %s for '%s' in locale %s\n", i, tests[i].str, out, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + + p__free_locale(locale); + } +} + static void test_gcvt(void) { char buf[1024], *res; @@ -4196,6 +4267,7 @@ START_TEST(string) p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); + p_wcstombs_s_l = (void *)GetProcAddress(hMsvcrt, "_wcstombs_s_l"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); @@ -4272,6 +4344,7 @@ START_TEST(string) test__strtoi64(); test__strtod(); test_mbstowcs(); + test__wcstombs_s_l(); test_gcvt(); test__itoa_s(); test__strlwr_s();

1 0

Nikolay Sivov : dwrite: Return static axis values for weight/width/italic properties.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 282678cc70aff6512446c7c0e352c5b13e4d4a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=282678cc70aff6512446c7c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 4 13:15:09 2020 +0300 dwrite: Return static axis values for weight/width/italic properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 ++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc0af3c79e..353282bbd4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -80,6 +80,8 @@ struct dwrite_font_data FONTSIGNATURE fontsig; UINT32 flags; /* enum font_flags */ struct dwrite_font_propvec propvec; + /* Static axis for weight/width/italic. */ + DWRITE_FONT_AXIS_VALUE axis[3]; DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; @@ -2061,8 +2063,9 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr TRACE("%p, %p.\n", iface, reference); - return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)font->family->collection->factory, - font->data->file, font->data->face_index, font->data->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference(font->family->collection->factory, font->data->file, + font->data->face_index, font->data->simulations, font->data->axis, ARRAY_SIZE(font->data->axis), + (IDWriteFontFaceReference1 **)reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) @@ -3857,6 +3860,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_font_data **ret) { + static const float width_axis_values[] = + { + 0.0f, /* DWRITE_FONT_STRETCH_UNDEFINED */ + 50.0f, /* DWRITE_FONT_STRETCH_ULTRA_CONDENSED */ + 62.5f, /* DWRITE_FONT_STRETCH_EXTRA_CONDENSED */ + 75.0f, /* DWRITE_FONT_STRETCH_CONDENSED */ + 87.5f, /* DWRITE_FONT_STRETCH_SEMI_CONDENSED */ + 100.0f, /* DWRITE_FONT_STRETCH_NORMAL */ + 112.5f, /* DWRITE_FONT_STRETCH_SEMI_EXPANDED */ + 125.0f, /* DWRITE_FONT_STRETCH_EXPANDED */ + 150.0f, /* DWRITE_FONT_STRETCH_EXTRA_EXPANDED */ + 200.0f, /* DWRITE_FONT_STRETCH_ULTRA_EXPANDED */ + }; + struct file_stream_desc stream_desc; struct dwrite_font_props props; struct dwrite_font_data *data; @@ -3910,6 +3927,13 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); + data->axis[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + data->axis[0].value = props.weight; + data->axis[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + data->axis[1].value = width_axis_values[props.stretch]; + data->axis[2].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + data->axis[2].value = data->style == DWRITE_FONT_STYLE_ITALIC ? 1.0f : 0.0f; + *ret = data; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60c9b9c742..d21326f7c9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7929,7 +7929,6 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - todo_wine ok(axis_count > 0, "Unexpected axis value count.\n"); IDWriteFontFaceReference1_Release(ref2); }

1 0

Zebediah Figura : quartz/filtergraph: Implement IFilterGraph2::ReconnectEx().
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 570e0a0d3b516035469c7fb2efec27c6fa133b89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=570e0a0d3b516035469c7fb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:48 2020 -0600 quartz/filtergraph: Implement IFilterGraph2::ReconnectEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 54 ++++++++++++++++++----------------------- dlls/quartz/tests/filtergraph.c | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cd4e7f40e0..60bea5542f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -872,33 +872,13 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi return hr; } -static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) +static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *pin) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - IPin *pConnectedTo = NULL; - HRESULT hr; - PIN_DIRECTION pindir; - - IPin_QueryDirection(ppin, &pindir); - hr = IPin_ConnectedTo(ppin, &pConnectedTo); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + TRACE("graph %p, pin %p.\n", graph, pin); - if (FAILED(hr)) { - TRACE("Querying connected to failed: %x\n", hr); - return hr; - } - IPin_Disconnect(ppin); - IPin_Disconnect(pConnectedTo); - if (pindir == PINDIR_INPUT) - hr = IPin_Connect(pConnectedTo, ppin, NULL); - else - hr = IPin_Connect(ppin, pConnectedTo, NULL); - IPin_Release(pConnectedTo); - if (FAILED(hr)) - WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("-> %08x\n", hr); - return hr; + return IFilterGraph2_ReconnectEx(iface, pin, NULL); } static HRESULT WINAPI FilterGraph2_Disconnect(IFilterGraph2 *iface, IPin *ppin) @@ -1830,15 +1810,29 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac return S_OK; } -static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *ppin, - const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *pin, const AM_MEDIA_TYPE *mt) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + PIN_DIRECTION dir; + HRESULT hr; + IPin *peer; - TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt); - strmbase_dump_media_type(pmt); + TRACE("graph %p, pin %p, mt %p.\n", graph, pin, mt); - return S_OK; + if (FAILED(hr = IPin_ConnectedTo(pin, &peer))) + return hr; + + IPin_QueryDirection(pin, &dir); + IFilterGraph2_Disconnect(iface, peer); + IFilterGraph2_Disconnect(iface, pin); + + if (dir == PINDIR_INPUT) + hr = IFilterGraph2_ConnectDirect(iface, peer, pin, mt); + else + hr = IFilterGraph2_ConnectDirect(iface, pin, peer, mt); + + IPin_Release(peer); + return hr; } static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *pPinOut, DWORD dwFlags, diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2483c502f4..b36605f396 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2910,6 +2910,31 @@ todo_wine hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, NULL); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &sink_pin.IPin_iface, NULL); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Both pins are disconnected when a filter is removed. */ hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : unicode: Store recursive decompositions directly in the tables.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: a646e4e6f2a0bde517e71b40c936806652421626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a646e4e6f2a0bde517e71b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:14:28 2020 +0100 unicode: Store recursive decompositions directly in the tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1112 ++++++------ libs/port/decompose.c | 3894 ++++++++++++++++++++++++++----------------- tools/make_unicode | 113 +- 3 files changed, 2992 insertions(+), 2127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a646e4e6f2a0bde517e7…

1 0

Zebediah Figura : quartz/tests: Add tests for IFilterGraph::Reconnect().
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 7a0b6a95f63d2355a9cf33d3d433c99165c45385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a0b6a95f63d2355a9cf33d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:47 2020 -0600 quartz/tests: Add tests for IFilterGraph::Reconnect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9..2483c502f4 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 6446ddeab883306d51fc19b7d22eaf8f579a332d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6446ddeab883306d51fc19b7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 3 23:25:02 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3435f87d7a..112cad586b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-13 10:36+0200\n" +"PO-Revision-Date: 2020-02-03 23:24+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3712,17 +3712,15 @@ msgstr "Tikėtasi „@“" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompiliavimo klaida" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript vykdymo klaida" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Nežinoma klaida" +msgstr "Nežinoma vykdymo klaida" #: jscript.rc:54 msgid "Number expected" @@ -3770,7 +3768,7 @@ msgstr "Sintaksės klaida reguliariajame reiškinyje" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Išimtinė situacija sugeneruota ir neapdorota" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters"

1 0

Zebediah Figura : quartz/tests: Add some tests for file source pin connection.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: f31815f760153a8785b6f1a3bde6160dec77e5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31815f760153a8785b6f1a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:50 2020 -0600 quartz/tests: Add some tests for file source pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 306 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 305 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f31815f760153a8785b6…

1 0

Puetz Kevin A : atlbase.h: Fix some declarations on win64.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 3043ab3e62772ddef8e4e27674bf4178e0ee50c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3043ab3e62772ddef8e4e276… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 3 22:06:49 2020 +0100 atlbase.h: Fix some declarations on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 2 +- dlls/atl/tests/module.c | 25 ++++++++++++++----------- include/atlbase.h | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 8829987c6a..358986d7a4 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -213,7 +213,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), + TRACE("Trying entry %i (%s %lx %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 192b23ef1e..6250f9b2cb 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -113,9 +113,9 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } -static DWORD cb_val; +static DWORD_PTR cb_val; -static void WINAPI term_callback(DWORD dw) +static void WINAPI term_callback(DWORD_PTR dw) { cb_val = dw; } @@ -123,33 +123,36 @@ static void WINAPI term_callback(DWORD dw) static void test_term(void) { _ATL_MODULEW test; + ULONG_PTR ex; HRESULT hres; + ex = (ULONG_PTR)-37; + test.cbSize = sizeof(_ATL_MODULEW); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); - hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + hres = AtlModuleAddTermFunc(&test, term_callback, ex); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == ex, "wrong callback value (0x%lx).\n", cb_val); test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%lx).\n", cb_val); } START_TEST(module) diff --git a/include/atlbase.h b/include/atlbase.h index b8c4f65651..ebf1674805 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -37,12 +37,12 @@ #endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); -typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); -typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); +typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD_PTR dw); +typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD_PTR dw); typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); -typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef void (WINAPI _ATL_TERMFUNC)(DWORD_PTR dw); typedef CRITICAL_SECTION CComCriticalSection; @@ -234,7 +234,7 @@ typedef _ATL_MODULEW _ATL_WIN_MODULE; typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; - DWORD dw; + DWORD_PTR dw; _ATL_CREATORARGFUNC* pFunc; } _ATL_INTMAP_ENTRY;

1 0