October 2020 - Wine-Commits

Daniel Lehman : msxml3: Handle namespaces in removeNamedItem.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 38844dc31e6afb7c6a3e824979b2bc1a403d104b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38844dc31e6afb7c6a3e8249… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Sep 22 16:35:38 2020 -0700 msxml3: Handle namespaces in removeNamedItem. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 10 +++++----- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index ecebd39fea..a352621bfb 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1749,8 +1749,43 @@ static HRESULT domelem_remove_qualified_item(xmlNodePtr node, BSTR name, BSTR ur static HRESULT domelem_remove_named_item(xmlNodePtr node, BSTR name, IXMLDOMNode **item) { + xmlChar *nameA, *local, *prefix; + BSTR uriW, localW; + xmlNsPtr ns; + HRESULT hr; + TRACE("(%p)->(%s %p)\n", node, debugstr_w(name), item); - return domelem_remove_qualified_item(node, name, NULL, item); + + nameA = xmlchar_from_wchar(name); + local = xmlSplitQName2(nameA, &prefix); + heap_free(nameA); + + if (!local) + return domelem_remove_qualified_item(node, name, NULL, item); + + ns = xmlSearchNs(node->doc, node, prefix); + + xmlFree(prefix); + + if (!ns) + { + xmlFree(local); + if (item) *item = NULL; + return item ? S_FALSE : E_INVALIDARG; + } + + uriW = bstr_from_xmlChar(ns->href); + localW = bstr_from_xmlChar(local); + xmlFree(local); + + TRACE("removing qualified node %s, uri=%s\n", debugstr_w(localW), debugstr_w(uriW)); + + hr = domelem_remove_qualified_item(node, localW, uriW, item); + + SysFreeString(localW); + SysFreeString(uriW); + + return hr; } static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode **item) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 76e42d5029..304c08acf6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4164,18 +4164,18 @@ static void test_removeNamedItem(void) removed_node = NULL; r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("ns:b"), &removed_node ); - todo_wine EXPECT_HR(r, S_OK); - if (removed_node) IXMLDOMNode_Release( removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); removed_node = NULL; r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("xml:lang"), &removed_node ); - todo_wine EXPECT_HR(r, S_OK); - if (removed_node) IXMLDOMNode_Release( removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); len = -1; r = IXMLDOMNamedNodeMap_get_length( map, &len ); EXPECT_HR(r, S_OK); - todo_wine ok( len == 2, "length %d\n", len ); + ok( len == 2, "length %d\n", len ); IXMLDOMNamedNodeMap_Release( map ); IXMLDOMElement_Release( element );

1 0

Nikolay Sivov : msxml3/tests: Use wide string literals in more tests.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 20e36dcb1b3df78839f9d14f0a4308e7d0e886d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e36dcb1b3df78839f9d14f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:00 2020 +0300 msxml3/tests: Use wide string literals in more tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 +- dlls/msxml3/tests/saxreader.c | 158 +++++++++++++++++------------------------- dlls/msxml3/tests/schema.c | 21 ++---- dlls/msxml3/tests/xmldoc.c | 79 ++++++++------------- dlls/msxml3/tests/xmlview.c | 16 ++--- 5 files changed, 110 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20e36dcb1b3df78839f9…

1 0

Nikolay Sivov : msxml3/tests: Fix tests failures with unreachable network resources.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 44705156b588c679b2fc0a192ff1a07ef6084ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44705156b588c679b2fc0a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:01 2020 +0300 msxml3/tests: Fix tests failures with unreachable network resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5f5137dd16..4a23f1d82a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1295,7 +1295,6 @@ static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID r hr = IXMLHttpRequest_get_responseText(httpreq, &text); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(*text != 0, "got %s\n", wine_dbgstr_w(text)); SysFreeString(text); } @@ -1798,7 +1797,7 @@ static void test_server_xhr(void) V_VT(&body) = VT_EMPTY; hr = IServerXMLHTTPRequest_send(xhr, body); - if (hr == INET_E_RESOURCE_NOT_FOUND) + if (hr == INET_E_RESOURCE_NOT_FOUND || hr == WININET_E_NAME_NOT_RESOLVED) { skip("No connection could be made with test.winehq.org\n"); IServerXMLHTTPRequest_Release(xhr);

1 0

Nikolay Sivov : evr/presenter: Validate mixer's device id.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 93de829b13c6ff93bcdce510e1a90f17f5d88f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93de829b13c6ff93bcdce510… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:40 2020 +0300 evr/presenter: Validate mixer's device id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 55 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04e9a55684..4a7a4021c2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,41 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) +{ + IMFVideoDeviceID *device_id; + unsigned int count; + GUID id = { 0 }; + HRESULT hr; + + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) + { + WARN("Failed to get mixer interface, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(presenter->mixer, &IID_IMFVideoDeviceID, (void **)&device_id))) + { + if (SUCCEEDED(hr = IMFVideoDeviceID_GetDeviceID(device_id, &id))) + { + if (!IsEqualGUID(&id, &IID_IDirect3DDevice9)) + hr = MF_E_INVALIDREQUEST; + } + + IMFVideoDeviceID_Release(device_id); + } + + if (FAILED(hr)) + { + IMFTransform_Release(presenter->mixer); + presenter->mixer = NULL; + } + + return hr; +} + static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { @@ -384,20 +419,16 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClock, (void **)&presenter->clock, &count); - count = 1; - if (SUCCEEDED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) - { - /* FIXME: presumably should validate mixer's device id. */ - } - else - WARN("Failed to get mixer interface, hr %#x.\n", hr); + hr = video_presenter_attach_mixer(presenter, service_lookup); - count = 1; - if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + if (SUCCEEDED(hr)) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + { + WARN("Failed to get renderer event sink, hr %#x.\n", hr); + } } if (SUCCEEDED(hr))

1 0

Zhiyi Zhang : dxgi/tests: Run test_get_containing_output() on d3d12 as well.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 6061c593229534876deb2155e2274f65d394b905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6061c593229534876deb2155… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:23:23 2020 +0800 dxgi/tests: Run test_get_containing_output() on d3d12 as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a34f574236..2a68947c68 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2123,7 +2123,7 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp return NULL; } -static void test_get_containing_output(void) +static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) { unsigned int adapter_idx, output_idx, output_count; DXGI_OUTPUT_DESC output_desc, output_desc2; @@ -2134,7 +2134,6 @@ static void test_get_containing_output(void) IDXGIFactory *factory; IDXGIAdapter *adapter; POINT points[4 * 16]; - IDXGIDevice *device; unsigned int i, j; HMONITOR monitor; HMONITOR primary; @@ -2143,17 +2142,21 @@ static void test_get_containing_output(void) HRESULT hr; BOOL ret; - if (!(device = create_device(0))) + adapter = get_adapter(device, is_d3d12); + if (!adapter) { - skip("Failed to create device.\n"); + skip("Failed to get adapter on Direct3D %d.\n", is_d3d12 ? 12 : 10); return; } - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + output_count = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_count, &output)) != DXGI_ERROR_NOT_FOUND) + { + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); + IDXGIOutput_Release(output); + ++output_count; + } + IDXGIAdapter_Release(adapter); swapchain_desc.BufferDesc.Width = 100; swapchain_desc.BufferDesc.Height = 100; @@ -2165,23 +2168,15 @@ static void test_get_containing_output(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - output_count = 0; - while (IDXGIAdapter_EnumOutputs(adapter, output_count, &output) != DXGI_ERROR_NOT_FOUND) - { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); - IDXGIOutput_Release(output); - ++output_count; - } - IDXGIAdapter_Release(adapter); - - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, 0); @@ -2436,7 +2431,7 @@ static void test_get_containing_output(void) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - ok(!fullscreen, "Expect swapchain not full screen.\n"); + todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2490,10 +2485,8 @@ static void test_get_containing_output(void) done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); } @@ -7011,7 +7004,6 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); - test_get_containing_output(); test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); @@ -7025,6 +7017,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_formats); run_on_d3d10(test_output_ownership); run_on_d3d10(test_cursor_clipping); + run_on_d3d10(test_get_containing_output); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7051,6 +7044,7 @@ START_TEST(dxgi) run_on_d3d12(test_cursor_clipping); run_on_d3d12(test_frame_latency_event); run_on_d3d12(test_colour_space_support); + run_on_d3d12(test_get_containing_output); FreeLibrary(d3d12_module); }

1 0

Martin Storsjo : ntdll: Unwind to the LR register if no unwind info is available.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: df794f342500f1b4bfd988f292302afa890354c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df794f342500f1b4bfd988f2… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:39 2020 +0300 ntdll: Unwind to the LR register if no unwind info is available. Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe..c9f44e92d3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp;

1 0

Rémi Bernon : include: Split objidl.idl to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 6e09636f68c30d0452db3268e366a4c26301f826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e09636f68c30d0452db3268… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:13 2020 +0200 include: Split objidl.idl to objidlbase.idl. Windows SDKs use #include here to import one into the other, so we do the same. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/objidl.idl | 1217 ++---------------------------------------------- include/objidlbase.idl | 1198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1227 insertions(+), 1189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e09636f68c30d0452db…

1 0

Daniel Lehman : tzres: Add North Korea Time Zone.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: a486680a2b008d18da1a321b3ed2a921312bce69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a486680a2b008d18da1a321b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 4 16:22:37 2020 -0700 tzres: Add North Korea Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 14 +++++ po/ar.po | 142 ++++++++++++++++++++++++++++----------------------- po/ast.po | 142 ++++++++++++++++++++++++++++----------------------- po/bg.po | 138 ++++++++++++++++++++++++++----------------------- po/ca.po | 142 ++++++++++++++++++++++++++++----------------------- po/cs.po | 142 ++++++++++++++++++++++++++++----------------------- po/da.po | 142 ++++++++++++++++++++++++++++----------------------- po/de.po | 142 ++++++++++++++++++++++++++++----------------------- po/el.po | 138 ++++++++++++++++++++++++++----------------------- po/en.po | 138 ++++++++++++++++++++++++++----------------------- po/en_US.po | 138 ++++++++++++++++++++++++++----------------------- po/eo.po | 142 ++++++++++++++++++++++++++++----------------------- po/es.po | 142 ++++++++++++++++++++++++++++----------------------- po/fa.po | 140 +++++++++++++++++++++++++++----------------------- po/fi.po | 142 ++++++++++++++++++++++++++++----------------------- po/fr.po | 142 ++++++++++++++++++++++++++++----------------------- po/he.po | 142 ++++++++++++++++++++++++++++----------------------- po/hi.po | 138 ++++++++++++++++++++++++++----------------------- po/hr.po | 142 ++++++++++++++++++++++++++++----------------------- po/hu.po | 142 ++++++++++++++++++++++++++++----------------------- po/it.po | 142 ++++++++++++++++++++++++++++----------------------- po/ja.po | 142 ++++++++++++++++++++++++++++----------------------- po/ko.po | 142 ++++++++++++++++++++++++++++----------------------- po/lt.po | 142 ++++++++++++++++++++++++++++----------------------- po/ml.po | 138 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 142 ++++++++++++++++++++++++++++----------------------- po/nl.po | 142 ++++++++++++++++++++++++++++----------------------- po/or.po | 138 ++++++++++++++++++++++++++----------------------- po/pa.po | 138 ++++++++++++++++++++++++++----------------------- po/pl.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 142 ++++++++++++++++++++++++++++----------------------- po/rm.po | 138 ++++++++++++++++++++++++++----------------------- po/ro.po | 142 ++++++++++++++++++++++++++++----------------------- po/ru.po | 138 ++++++++++++++++++++++++++----------------------- po/si.po | 142 ++++++++++++++++++++++++++++----------------------- po/sk.po | 142 ++++++++++++++++++++++++++++----------------------- po/sl.po | 142 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 141 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 141 +++++++++++++++++++++++++++----------------------- po/sv.po | 142 ++++++++++++++++++++++++++++----------------------- po/ta.po | 138 ++++++++++++++++++++++++++----------------------- po/te.po | 138 ++++++++++++++++++++++++++----------------------- po/th.po | 140 +++++++++++++++++++++++++++----------------------- po/tr.po | 142 ++++++++++++++++++++++++++++----------------------- po/uk.po | 138 ++++++++++++++++++++++++++----------------------- po/wa.po | 140 +++++++++++++++++++++++++++----------------------- po/wine.pot | 138 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 142 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 142 ++++++++++++++++++++++++++++----------------------- 51 files changed, 3725 insertions(+), 3185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a486680a2b008d18da1a…

1 0

Matteo Bruni : winex11: Add DriverDate registry property to display adapters.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: bd27af974a21085cd0dc78b37b715bbcc3cfab69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd27af974a21085cd0dc78b3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 1 11:01:11 2020 +0200 winex11: Add DriverDate registry property to display adapters. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 47e4733dba..cf55a5c1fb 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -107,6 +108,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -403,14 +405,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR bufferW[1024]; + FILETIME filetime; HKEY hkey = NULL; GUID guid; LUID luid; INT written; DWORD size; BOOL ret = FALSE; - FILETIME filetime; TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); @@ -468,6 +471,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Rémi Bernon : include: Add IAgileObject to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: cdf013b9b984e4d161b7a3ae27adde366969eee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf013b9b984e4d161b7a3ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:14 2020 +0200 include: Add IAgileObject to objidlbase.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidlbase.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 7f649dd005..6449be8417 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -83,6 +83,15 @@ interface IMarshal : IUnknown [in] DWORD dwReserved); } +[ + local, + object, + uuid(94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90) +] +interface IAgileObject : IUnknown +{ +} + [ local, object,

1 0