March 2019 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Fix Collection::Validate() errors for new Items.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: tools Branch: master Commit: 1785caeaa68d0a2e69b780c6810255a649309ab6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1785caeaa68d0a2e69b780c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:02:37 2019 +0100 testbot: Fix Collection::Validate() errors for new Items. New Items don't have a full key yet so it cannot be put in the error message. Instead indicate the error happened on a new object and give its partial key. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index c110c98..1fe1481 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -495,11 +495,16 @@ sub Validate($) { if ($Item->GetIsNew() || $Item->GetIsModified()) { - (my $ErrProperty, my $ErrMessage) = $Item->Validate(); - if (defined($ErrMessage)) + my ($ErrProperty, $ErrMessage) = $Item->Validate(); + if (defined $ErrMessage) { - return ($Item->GetKey(), $ErrProperty, "$ErrMessage for " . - $self->GetItemName() . " " . $Item->GetFullKey()); + my $Key = $Item->GetKey(); + my $FullKey = $Item->GetFullKey(); + if (defined $FullKey) + { + return ($Key, $ErrProperty, "$ErrMessage for ". $self->GetItemName() ." $FullKey"); + } + return ($Key, $ErrProperty, "$ErrMessage for new ". $self->GetItemName() ." $Key"); } if ($Item->GetIsNew()) {

1 0

Francois Gouget : testbot/WineSendLog: We are testing more than Windows now.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: tools Branch: master Commit: a1a36aa2d605d1dbcbafabc2e862f935f14ec5b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a1a36aa2d605d1dbcbafabc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:02:27 2019 +0100 testbot/WineSendLog: We are testing more than Windows now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1d13454..28644fb 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -342,7 +342,7 @@ EOF Hi, -While running your changed tests on Windows, I think I found new failures. +While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

1 0

Jacek Caban : mshtml: Bind events directly to document node for documents with no window associated.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: b574cd98bd91f4d2e52247b5d77da3bb1644b34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b574cd98bd91f4d2e52247b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:11 2019 +0100 mshtml: Bind events directly to document node for documents with no window associated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4fc557d..0ba0bb9 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -384,18 +385,29 @@ static void init_listener(nsEventListener *This, nsDocumentEventListener *listen This->This = listener; } +static nsIDOMEventTarget *get_default_document_target(HTMLDocumentNode *doc) +{ + nsIDOMEventTarget *target; + nsISupports *target_iface; + nsresult nsres; + + target_iface = doc->window ? (nsISupports*)doc->basedoc.window->nswindow : (nsISupports*)doc->nsdoc; + nsres = nsISupports_QueryInterface(target_iface, &IID_nsIDOMEventTarget, (void**)&target); + return NS_SUCCEEDED(nsres) ? target : NULL; +} + void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR type) { nsIDOMEventTarget *target; nsresult nsres; - if(nsnode) + if(nsnode) { nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMEventTarget, (void**)&target); - else - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); - return; + assert(nsres == NS_OK); + }else { + target = get_default_document_target(doc); + if(!target) + return; } init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, @@ -409,14 +421,9 @@ static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventL nsAString type_str; nsresult nsres; - if(!doc->basedoc.window) - return; - - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, @@ -455,7 +462,6 @@ void init_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener; nsIDOMEventTarget *target; - nsresult nsres; listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) @@ -474,11 +480,9 @@ void init_nsevents(HTMLDocumentNode *doc) doc->nsevent_listener = listener; - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE);

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2:: createHTMLDocument implementation.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 7e0e55f76f31018554ada8aa71a472ab830d959a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0e55f76f31018554ada8aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:22 2019 +0100 mshtml: Add IHTMLDOMImplementation2::createHTMLDocument implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 26 +++++++++++-------- dlls/mshtml/htmlwindow.c | 6 ++++- dlls/mshtml/mshtml_private.h | 6 +++-- dlls/mshtml/nsiface.idl | 16 +++++++++++- dlls/mshtml/omnavigator.c | 62 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 ++++++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e0e55f76f31018554ad…

1 0

Stefan Dösinger : ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: e809a500d73c07c0012e80e185e95a5255a82e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e809a500d73c07c0012e80e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 13 22:04:23 2019 +0330 ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper(). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b788bd..b8cc2d2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4408,39 +4408,25 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetClipper - * - * Returns the IDirectDrawClipper interface of the clipper assigned to this - * surface - * - * Params: - * Clipper: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Clipper is NULL - * DDERR_NOCLIPPERATTACHED if there's no clipper attached - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper) +static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **clipper) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, clipper); - if (!Clipper) + if (!clipper) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (!surface->clipper) { wined3d_mutex_unlock(); + *clipper = NULL; return DDERR_NOCLIPPERATTACHED; } - *Clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*Clipper); + *clipper = &surface->clipper->IDirectDrawClipper_iface; + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK;

1 0

Józef Kucia : d3d12: Do not pass VkPhysicalDevice to vkd3d if we failed to find matching device.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 1d405c62adeba0d183c4998eb61a103a2b6dcbe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d405c62adeba0d183c4998e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 14:48:17 2019 +0100 d3d12: Do not pass VkPhysicalDevice to vkd3d if we failed to find matching device. Vkd3d has got a better heuristic for selecting the device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 9eef3ad..2c6472a 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -267,10 +267,7 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst } if (!vk_physical_device) - { FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); - vk_physical_device = vk_physical_devices[0]; - } done: heap_free(vk_physical_devices); @@ -284,7 +281,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; struct wine_dxgi_adapter_info adapter_info; - VkPhysicalDevice vk_physical_device; const struct vulkan_funcs *vk_funcs; struct vkd3d_instance *instance; IWineDXGIAdapter *wine_adapter; @@ -344,15 +340,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe goto done; } - if (!(vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info))) - goto done_instance; - device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.instance_create_info = NULL; - device_create_info.vk_physical_device = vk_physical_device; + device_create_info.vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info); device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); device_create_info.parent = (IUnknown *)wine_adapter; @@ -360,7 +353,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe hr = vkd3d_create_device(&device_create_info, iid, device); -done_instance: vkd3d_instance_decref(instance); done:

1 0

Jacek Caban : mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 1d04b6044631fc43ba94d9ac70728da671669eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d04b6044631fc43ba94d9ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:53:59 2019 +0100 mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index aec12fc..ee504f9 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1573,9 +1573,9 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) } if(This->doc && &This->doc->node != This) { - HTMLDocument *doc = &This->doc->basedoc; + HTMLDocumentNode *doc = This->doc; This->doc = NULL; - htmldoc_release(doc); + htmldoc_release(&doc->basedoc); }else { This->doc = NULL; }

1 0

Rob Hughes : ws2_32: Handle EISCONN from sendmsg.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: b9591e21cfbe62a0c523524f0214f05d783239a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9591e21cfbe62a0c523524f… Author: Rob Hughes <rbhughes(a)gmail.com> Date: Tue Mar 12 16:14:19 2019 +0000 ws2_32: Handle EISCONN from sendmsg. When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rbhughes(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338..a56e284 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,12 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) + { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; }

1 0

Józef Kucia : dxgi/tests: Use void pointer for get_refcount() parameter.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: cbb9f8539a72afd20e297f52b231ef6d202dda23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbb9f8539a72afd20e297f52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 14:48:16 2019 +0100 dxgi/tests: Use void pointer for get_refcount() parameter. Signed-off-by: Józef Kucia <jkucia(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 | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 23d6a29..91d218f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -106,10 +106,11 @@ static void run_queued_tests(void) heap_free(threads); } -static ULONG get_refcount(IUnknown *iface) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) @@ -1418,10 +1419,10 @@ static void test_create_swapchain(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - expected_refcount = get_refcount((IUnknown *)adapter); - refcount = get_refcount((IUnknown *)factory); + expected_refcount = get_refcount(adapter); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); creation_desc.OutputWindow = NULL; @@ -1441,11 +1442,11 @@ static void test_create_swapchain(void) hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetDesc(swapchain, NULL); @@ -1492,7 +1493,7 @@ static void test_create_swapchain(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) @@ -3210,23 +3211,23 @@ static void test_private_data(void) ok(!ptr, "Got unexpected pointer %p.\n", ptr); ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount--; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, @@ -3235,7 +3236,7 @@ static void test_private_data(void) size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -3252,7 +3253,7 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); @@ -3267,7 +3268,7 @@ static void test_private_data(void) hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; @@ -4263,13 +4264,13 @@ static void test_output_desc(void) hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2); ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); IDXGIAdapter_Release(adapter2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); for (j = 0; ; ++j) @@ -4285,15 +4286,15 @@ static void test_output_desc(void) hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2); ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); ok(output != output2, "Expected to get new instance of IDXGIOutput, %p == %p.\n", output, output2); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); IDXGIOutput_Release(output2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); hr = IDXGIOutput_GetDesc(output, &desc); @@ -4310,12 +4311,12 @@ static void test_output_desc(void) wine_dbgstr_rect(&monitor_info.rcMonitor)); IDXGIOutput_Release(output); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); } IDXGIAdapter_Release(adapter); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 1, "Get unexpected refcount %u.\n", refcount); }

1 0

Józef Kucia : wined3d: Store BGRA vertex capabilities in struct wined3d_d3d_info.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 8d49fe48030854db62c5edf2e59a8ff70f98162b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d49fe48030854db62c5edf2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 14:48:15 2019 +0100 wined3d: Store BGRA vertex capabilities in struct wined3d_d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context.c | 8 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5bcb39f..686f4f0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3741,6 +3741,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, || gl_info->supported[ARB_TEXTURE_RECTANGLE]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 267238d..6d270a7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3516,8 +3516,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; @@ -3613,8 +3612,7 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf stream_info->elements[idx].divisor = 0; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) + if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1u << idx; } @@ -3633,7 +3631,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st unsigned int i; WORD map; - wined3d_stream_info_from_declaration(stream_info, state, gl_info, d3d_info); + wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; context->buffer_fence_count = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79a5b68..1328543 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3422,7 +3422,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; - wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->gl_info, &device->adapter->d3d_info); + wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info); state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0edb8c..e70010e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -206,6 +206,7 @@ struct wined3d_d3d_info unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; + unsigned int vertex_bgra : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -1511,8 +1512,7 @@ struct wined3d_stream_info }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; struct wined3d_direct_dispatch_parameters {

1 0