September 2016 - Wine-commits

Alexandre Julliard : winex11: Move common code out of the export functions and simplify their usage.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: fd41ddec0afbefe8298ee9a66572a3099350bb8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd41ddec0afbefe8298ee9a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:50:21 2016 +0900 winex11: Move common code out of the export functions and simplify their usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 520 +++++++++++++------------------------------ 1 file changed, 160 insertions(+), 360 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd41ddec0afbefe8298ee…

1 0

Alexandre Julliard : winex11: Add a debug helper to trace atom names.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 49a65a3bd7d05b1102a34c51009fed9d1cd2a46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a65a3bd7d05b1102a34c510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 23:07:04 2016 +0900 winex11: Add a debug helper to trace atom names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 66 +++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index aedcd69..ae49f4b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -296,6 +296,18 @@ static const char *debugstr_format( UINT id ) } } +static const char *debugstr_xatom( Atom atom ) +{ + const char *ret; + char *name; + + if (!atom) return "(None)"; + name = XGetAtomName( thread_display(), atom ); + ret = debugstr_a( name ); + XFree( name ); + return ret; +} + /************************************************************************** * X11DRV_InitClipboard */ @@ -1967,8 +1979,8 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ while (lpFormat) { - TRACE( "atom #%d property(%ld) -> format %s\n", - i, lpFormat->atom, debugstr_format(lpFormat->id) ); + TRACE( "property %s -> format %s\n", + debugstr_xatom( lpFormat->atom ), debugstr_format( lpFormat->id )); X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } @@ -2010,8 +2022,8 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p ERR("Failed to register %s property. Type will not be cached.\n", names[i]); continue; } - TRACE( "atom #%d property(%ld) -> format %s\n", - i, lpFormat->atom, debugstr_format(lpFormat->id) ); + TRACE( "property %s -> format %s\n", + debugstr_xatom( lpFormat->atom ), debugstr_format( lpFormat->id )); X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); } for (i = 0; i < nb_atoms; i++) XFree( names[i] ); @@ -2094,8 +2106,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets, &remain, (unsigned char**)&targetList)) { - TRACE("Type %lx,Format %d,nItems %ld, Remain %ld\n", - atype, aformat, cSelectionTargets, remain); + TRACE( "type %s format %d count %ld remain %ld\n", + debugstr_xatom( atype ), aformat, cSelectionTargets, remain); /* * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. @@ -2159,8 +2171,8 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA return FALSE; } - TRACE("Requesting conversion of %s property (%ld) from selection type %08x\n", - debugstr_format(lpData->lpFormat->id), lpData->lpFormat->atom, + TRACE("Requesting conversion of %s property %s from selection type %08x\n", + debugstr_format( lpData->lpFormat->id ), debugstr_xatom( lpData->lpFormat->atom ), (UINT)selectionCacheSrc); XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->atom, @@ -2222,7 +2234,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, unsigned long pos = 0, nitems, remain, count; unsigned char *val = NULL, *buffer; - TRACE("Reading property %lu from X window %lx\n", prop, w); + TRACE( "Reading property %s from X window %lx\n", debugstr_xatom( prop ), w ); for (;;) { @@ -2763,18 +2775,11 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) if ((format->id == lpData->wFormatID) && format->lpDrvExportFunc && format->atom) + { + TRACE( "%d: %s -> %s\n", i, debugstr_format( format->id ), + debugstr_xatom( format->atom )); targets[i++] = format->atom; - - if (TRACE_ON(clipboard)) - { - unsigned int i; - for ( i = 0; i < cTargets; i++) - { - char *itemFmtName = XGetAtomName(display, targets[i]); - TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName); - XFree(itemFmtName); - } - } + } /* We may want to consider setting the type to xaTargets instead, * in case some apps expect this instead of XA_ATOM */ @@ -2826,13 +2831,8 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent &cTargetPropList, &remain, (unsigned char**)&targetPropList)) { - if (TRACE_ON(clipboard)) - { - char * const typeName = XGetAtomName(display, atype); - TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", - typeName, aformat, cTargetPropList, remain); - XFree(typeName); - } + TRACE( "type %s format %d count %ld remain %ld\n", + debugstr_xatom( atype ), aformat, cTargetPropList, remain ); /* * Make sure we got what we expect. @@ -2853,16 +2853,8 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent { XSelectionRequestEvent event; - if (TRACE_ON(clipboard)) - { - char *targetName, *propName; - targetName = XGetAtomName(display, targetPropList[i]); - propName = XGetAtomName(display, targetPropList[i+1]); - TRACE("MULTIPLE(%d): Target='%s' Prop='%s'\n", - i/2, targetName, propName); - XFree(targetName); - XFree(propName); - } + TRACE( "MULTIPLE(%d): target %s property %s\n", + i/2, debugstr_xatom( targetPropList[i] ), debugstr_xatom( targetPropList[i + 1] )); /* We must have a non "None" property to service a MULTIPLE target atom */ if ( !targetPropList[i+1] )

1 0

Aric Stewart : ntoskrnl.exe: Send PnP and Power IRPs to plug and play devices.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: d39d1464f3df755729e30c1883267812bc33adaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39d1464f3df755729e30c188… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 15 06:58:21 2016 -0500 ntoskrnl.exe: Send PnP and Power IRPs to plug and play devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aebb3de..bc7ac86 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2927,6 +2927,44 @@ static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) } +static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = minor; + + irpsp->Parameters.StartDevice.AllocatedResources = NULL; + irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; + + return send_device_irp( device, irp, NULL ); +} + + +static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) +{ + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_SET_POWER; + + irpsp->Parameters.Power.Type = DevicePowerState; + irpsp->Parameters.Power.State.DeviceState = power; + + return send_device_irp( device, irp, NULL ); +} + + static void handle_bus_relations( DEVICE_OBJECT *device ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; @@ -2990,7 +3028,13 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) ObDereferenceObject( driver_obj ); if (status != STATUS_SUCCESS) + { ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); + return; + } + + send_pnp_irp( device, IRP_MN_START_DEVICE ); + send_power_irp( device, PowerDeviceD0 ); }

1 0

Michael Stefaniuc : mshtml: Avoid casts from COM objects to interfaces.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: a14674aa36f86804f757168e55b3d25c562527d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14674aa36f86804f757168e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 16 14:16:46 2016 +0200 mshtml: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 125819d..8407e02 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -400,7 +400,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) static HRESULT get_item_idx(HTMLElementCollection *This, UINT idx, IDispatch **ret) { if(idx < This->len) { - *ret = (IDispatch*)This->elems[idx]; + *ret = (IDispatch*)&This->elems[idx]->node.event_target.dispex.IDispatchEx_iface; IDispatch_AddRef(*ret); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c2eeb7d..fc5277b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1024,7 +1024,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa int i; V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = (IDispatch*)event_obj; + V_DISPATCH(&arg) = (IDispatch*)&event_obj->dispex.IDispatchEx_iface; i = data->event_table[eid]->handler_cnt; while(i--) {

1 0

Michael Stefaniuc : jscript: Use CONTAINING_RECORD() to get from a field to a struct.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: fc1ae4fc9eb545ab353b6c16529f87b3661820b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1ae4fc9eb545ab353b6c165… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 19 10:14:47 2016 +0200 jscript: Use CONTAINING_RECORD() to get from a field to a struct. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/vbarray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 7b9993b..f374fb0 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -36,7 +36,7 @@ static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) { - return (VBArrayInstance*)vdisp->u.jsdisp; + return CONTAINING_RECORD(vdisp->u.jsdisp, VBArrayInstance, dispex); } static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis)

1 0

Józef Kucia : d3d11: Sanitize buffer view flags.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 9c0212267fc587979d5e289667635b5e8a07043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0212267fc587979d5e28966… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:13 2016 +0200 d3d11: Sanitize buffer view flags. 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/d3d11/view.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 205513d..d670cb2 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2061,6 +2061,16 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb d3d10_shader_resource_view_GetDesc1, }; +static unsigned int wined3d_view_flags_from_d3d11_bufferex_flags(unsigned int d3d11_flags) +{ + unsigned int wined3d_flags = d3d11_flags & WINED3D_VIEW_BUFFER_RAW; + + if (d3d11_flags != wined3d_flags) + FIXME("Unhandled flags %#x.\n", d3d11_flags & ~wined3d_flags); + + return wined3d_flags; +} + static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shader_resource_view_desc *wined3d_desc, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { @@ -2143,7 +2153,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_BUFFEREX: - wined3d_desc->flags = desc->u.BufferEx.Flags; + wined3d_desc->flags = wined3d_view_flags_from_d3d11_bufferex_flags(desc->u.BufferEx.Flags); wined3d_desc->u.buffer.start_idx = desc->u.BufferEx.FirstElement; wined3d_desc->u.buffer.count = desc->u.BufferEx.NumElements; break; @@ -2381,6 +2391,17 @@ static const struct ID3D11UnorderedAccessViewVtbl d3d11_unordered_access_view_vt d3d11_unordered_access_view_GetDesc, }; +static unsigned int wined3d_view_flags_from_d3d11_buffer_uav_flags(unsigned int d3d11_flags) +{ + unsigned int wined3d_flags = d3d11_flags & (WINED3D_VIEW_BUFFER_RAW + | WINED3D_VIEW_BUFFER_APPEND | WINED3D_VIEW_BUFFER_COUNTER); + + if (d3d11_flags != wined3d_flags) + FIXME("Unhandled flags %#x.\n", d3d11_flags & ~wined3d_flags); + + return wined3d_flags; +} + static HRESULT wined3d_unordered_access_view_desc_from_d3d11(struct wined3d_unordered_access_view_desc *wined3d_desc, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc) { @@ -2390,7 +2411,7 @@ static HRESULT wined3d_unordered_access_view_desc_from_d3d11(struct wined3d_unor switch (desc->ViewDimension) { case D3D11_UAV_DIMENSION_BUFFER: - wined3d_desc->flags = desc->u.Buffer.Flags; + wined3d_desc->flags = wined3d_view_flags_from_d3d11_buffer_uav_flags(desc->u.Buffer.Flags); wined3d_desc->u.buffer.start_idx = desc->u.Buffer.FirstElement; wined3d_desc->u.buffer.count = desc->u.Buffer.NumElements; break;

1 0

Józef Kucia : d3d11/tests: Add test for swapchain formats.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 557c57381a97e76e6dae559a92b5b92979d1bac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557c57381a97e76e6dae559a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:14 2016 +0200 d3d11/tests: Add test for swapchain formats. 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/d3d11/tests/d3d11.c | 141 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 121 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b53de3b..e159128 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -44,6 +44,24 @@ static const D3D_FEATURE_LEVEL d3d11_feature_levels[] = D3D_FEATURE_LEVEL_9_1 }; +struct format_support +{ + DXGI_FORMAT format; + D3D_FEATURE_LEVEL fl_required; + D3D_FEATURE_LEVEL fl_optional; +}; + +static const struct format_support display_format_support[] = +{ + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10A2_UNORM, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0}, +}; + struct vec2 { float x, y; @@ -7547,6 +7565,106 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_swapchain_formats(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + HRESULT hr, expected_hr; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D11Device *device; + unsigned int i, j; + ULONG refcount; + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "d3d11_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) + { + const D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; + struct device_desc device_desc; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + continue; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x for typeless format (feature level %#x).\n", + hr, d3d11_feature_levels[i]); + if (SUCCEEDED(hr)) + IDXGISwapChain_Release(swapchain); + + for (j = 0; j < sizeof(display_format_support) / sizeof(*display_format_support); ++j) + { + DXGI_FORMAT format = display_format_support[j].format; + BOOL todo = FALSE; + + if (display_format_support[j].fl_required <= feature_level) + { + expected_hr = S_OK; + if (format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM) + todo = TRUE; + } + else if (!display_format_support[j].fl_optional + || display_format_support[j].fl_optional > feature_level) + { + expected_hr = E_INVALIDARG; + if (format != DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM) + todo = TRUE; + } + else + { + continue; + } + + swapchain_desc.BufferDesc.Format = format; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine_if(todo) + ok(hr == expected_hr || broken(hr == E_OUTOFMEMORY), + "Got hr %#x, expected %#x (feature level %#x, format %#x).\n", + hr, expected_hr, feature_level, format); + if (FAILED(hr)) + continue; + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + + DestroyWindow(swapchain_desc.OutputWindow); +} + static void test_swapchain_views(void) { D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; @@ -10507,13 +10625,6 @@ static void test_line_antialiasing_blending(void) release_test_context(&test_context); } -struct format_support -{ - DXGI_FORMAT format; - D3D_FEATURE_LEVEL fl_required; - D3D_FEATURE_LEVEL fl_optional; -}; - static void check_format_support(const unsigned int *format_support, D3D_FEATURE_LEVEL feature_level, const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, const char *feature_name) @@ -10532,7 +10643,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - if (formats[i].fl_optional <= feature_level) + if (formats[i].fl_optional && formats[i].fl_optional <= feature_level) continue; ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", @@ -10555,17 +10666,6 @@ static void test_required_format_support(void) {DXGI_FORMAT_R16_UINT, D3D_FEATURE_LEVEL_9_1}, }; - static const struct format_support display[] = - { - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, - {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, - {DXGI_FORMAT_B8G8R8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, - {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, - {DXGI_FORMAT_R16G16B16A16_FLOAT, D3D_FEATURE_LEVEL_10_0}, - {DXGI_FORMAT_R10G10B10A2_UNORM, D3D_FEATURE_LEVEL_10_0}, - {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0}, - }; - for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; @@ -10599,7 +10699,7 @@ static void test_required_format_support(void) D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); check_format_support(format_support, feature_level, - display, sizeof(display) / sizeof(*display), + display_format_support, sizeof(display_format_support) / sizeof(*display_format_support), D3D11_FORMAT_SUPPORT_DISPLAY, "display"); refcount = ID3D11Device_Release(device); @@ -10704,6 +10804,7 @@ START_TEST(d3d11) test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); + test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip(); test_clear_render_target_view();

1 0

Józef Kucia : include/d3d10: Add D3D10_FORMAT_SUPPORT enum.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: cc0d9d7db4bd1539bd447dc5b0761ecedb9dbe8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0d9d7db4bd1539bd447dc5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:15 2016 +0200 include/d3d10: Add D3D10_FORMAT_SUPPORT enum. 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> --- include/d3d10.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d3d10.idl b/include/d3d10.idl index 24fd2bf..f125956 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -893,6 +893,35 @@ typedef enum D3D10_COLOR_WRITE_ENABLE { D3D10_COLOR_WRITE_ENABLE_BLUE | D3D10_COLOR_WRITE_ENABLE_ALPHA) } D3D10_COLOR_WRITE_ENABLE; +typedef enum D3D10_FORMAT_SUPPORT +{ + D3D10_FORMAT_SUPPORT_BUFFER = 0x00000001, + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER = 0x00000002, + D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER = 0x00000004, + D3D10_FORMAT_SUPPORT_SO_BUFFER = 0x00000008, + D3D10_FORMAT_SUPPORT_TEXTURE1D = 0x00000010, + D3D10_FORMAT_SUPPORT_TEXTURE2D = 0x00000020, + D3D10_FORMAT_SUPPORT_TEXTURE3D = 0x00000040, + D3D10_FORMAT_SUPPORT_TEXTURECUBE = 0x00000080, + D3D10_FORMAT_SUPPORT_SHADER_LOAD = 0x00000100, + D3D10_FORMAT_SUPPORT_SHADER_SAMPLE = 0x00000200, + D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON = 0x00000400, + D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT = 0x00000800, + D3D10_FORMAT_SUPPORT_MIP = 0x00001000, + D3D10_FORMAT_SUPPORT_MIP_AUTOGEN = 0x00002000, + D3D10_FORMAT_SUPPORT_RENDER_TARGET = 0x00004000, + D3D10_FORMAT_SUPPORT_BLENDABLE = 0x00008000, + D3D10_FORMAT_SUPPORT_DEPTH_STENCIL = 0x00010000, + D3D10_FORMAT_SUPPORT_CPU_LOCKABLE = 0x00020000, + D3D10_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE = 0x00040000, + D3D10_FORMAT_SUPPORT_DISPLAY = 0x00080000, + D3D10_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x00100000, + D3D10_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET = 0x00200000, + D3D10_FORMAT_SUPPORT_MULTISAMPLE_LOAD = 0x00400000, + D3D10_FORMAT_SUPPORT_SHADER_GATHER = 0x00800000, + D3D10_FORMAT_SUPPORT_BACK_BUFFER_CAST = 0x01000000, +} D3D10_FORMAT_SUPPORT; + typedef enum D3D10_TEXTURECUBE_FACE { D3D10_TEXTURECUBE_FACE_POSITIVE_X, D3D10_TEXTURECUBE_FACE_NEGATIVE_X,

1 0

Józef Kucia : d3d10core/tests: Port test_required_format_support() from d3d11.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 3382e96b2472aedfcc692faa6408b5bb61666dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3382e96b2472aedfcc692faa6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:16 2016 +0200 d3d10core/tests: Port test_required_format_support() from d3d11. 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/d3d10core/tests/device.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 625928c..98a25ff 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -30,6 +30,23 @@ #define BITS_N1_0 0xbf800000 #define BITS_1_0 0x3f800000 +struct format_support +{ + DXGI_FORMAT format; + BOOL optional; +}; + +static const struct format_support display_format_support[] = +{ + {DXGI_FORMAT_R8G8B8A8_UNORM}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB}, + {DXGI_FORMAT_B8G8R8A8_UNORM, TRUE}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT}, + {DXGI_FORMAT_R10G10B10A2_UNORM}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, TRUE}, +}; + struct vec2 { float x, y; @@ -9372,6 +9389,76 @@ static void test_line_antialiasing_blending(void) release_test_context(&test_context); } +static void check_format_support(const unsigned int *format_support, + const struct format_support *formats, unsigned int format_count, + unsigned int feature_flag, const char *feature_name) +{ + unsigned int i; + + for (i = 0; i < format_count; ++i) + { + DXGI_FORMAT format = formats[i].format; + unsigned int supported = format_support[format] & feature_flag; + + if (formats[i].optional) + { + if (supported) + trace("Optional format %#x - %s supported.\n", format, feature_name); + continue; + } + + ok(supported, "Format %#x - %s supported, format support %#x.\n", + format, feature_name, format_support[format]); + } +} + +static void test_required_format_support(void) +{ + unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; + ID3D10Device *device; + DXGI_FORMAT format; + ULONG refcount; + HRESULT hr; + + static const struct format_support index_buffers[] = + { + {DXGI_FORMAT_R32_UINT}, + {DXGI_FORMAT_R16_UINT}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + memset(format_support, 0, sizeof(format_support)); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + hr = ID3D10Device_CheckFormatSupport(device, format, &format_support[format]); + todo_wine ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), + "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", + format, hr, format_support[format]); + } + if (hr == E_NOTIMPL) + { + skip("CheckFormatSupport not implemented.\n"); + ID3D10Device_Release(device); + return; + } + + check_format_support(format_support, index_buffers, + sizeof(index_buffers) / sizeof(*index_buffers), + D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + + check_format_support(format_support, display_format_support, + sizeof(display_format_support) / sizeof(*display_format_support), + D3D10_FORMAT_SUPPORT_DISPLAY, "display"); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -9424,4 +9511,5 @@ START_TEST(device) test_index_buffer_offset(); test_face_culling(); test_line_antialiasing_blending(); + test_required_format_support(); }

1 0

Józef Kucia : d3d10core/tests: Port test_swapchain_formats() from d3d11.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 568e08e27ea1d281d21c2721c1188f7b140fcc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568e08e27ea1d281d21c2721c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:17 2016 +0200 d3d10core/tests: Port test_swapchain_formats() from d3d11. 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/d3d10core/tests/device.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 98a25ff..37b08e5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -7275,6 +7275,73 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_swapchain_formats(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 0; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 0; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "d3d10core_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x for typeless format.\n", hr); + if (SUCCEEDED(hr)) + IDXGISwapChain_Release(swapchain); + + for (i = 0; i < sizeof(display_format_support) / sizeof(*display_format_support); ++i) + { + if (display_format_support[i].optional) + continue; + + swapchain_desc.BufferDesc.Format = display_format_support[i].format; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x for format %#x.\n", hr, display_format_support[i].format); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void test_swapchain_views(void) { struct d3d10core_test_context test_context; @@ -9494,6 +9561,7 @@ START_TEST(device) test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); + test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip(); test_clear_render_target_view();

1 0