October 2019 - Wine-commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetClipPlane().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: ebc33e2a75e718fa3892c3f9fa48ca76a98bcde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc33e2a75e718fa3892c3f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 29 20:57:43 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetClipPlane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aa742c8c1f..7b9be1fc46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2246,7 +2246,9 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD index = min(index, device->max_user_clip_planes - 1); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetClipPlane().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: c7de24e997e066bf938f9623880c9c2be1d9ad37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7de24e997e066bf938f9623… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 29 20:57:44 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetClipPlane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 90bcfae498..680c75cb0f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1803,7 +1803,9 @@ static HRESULT WINAPI d3d8_device_SetClipPlane(IDirect3DDevice8 *iface, DWORD in TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetClipPlane().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 50f2aa92fe159d1098679d4947e038a7454c2700 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50f2aa92fe159d1098679d49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 09:42:07 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetClipPlane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 599e45c24f..525dd98d78 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6528,7 +6528,9 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_plane = (struct wined3d_vec4 *)plane; wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, idx, wined3d_plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); if (idx < ARRAY_SIZE(device->user_clip_planes)) { device->user_clip_planes[idx] = *wined3d_plane;

1 0

Zhiyi Zhang : dxgi: Implement dxgi_output_ReleaseOwnership().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 4f3d66e2c63635f3e54fb7541e58d48825ff93df URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f3d66e2c63635f3e54fb754… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 30 17:49:29 2019 +0330 dxgi: Implement dxgi_output_ReleaseOwnership(). 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/output.c | 11 ++++++- dlls/wined3d/directx.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 3 ++ dlls/wined3d/wined3d_private.h | 8 +++++ include/wine/wined3d.h | 6 +++- 5 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a66628cc60..db5c106948 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -371,7 +371,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_output *wined3d_output; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, + output->adapter->ordinal))) + wined3d_output_release_ownership(wined3d_output); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 726b1e3775..20130a75b2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -62,6 +62,56 @@ const GLenum magLookup[] = GL_NEAREST, GL_NEAREST, GL_LINEAR, }; +void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + + TRACE("output %p.\n", output); + + set_owner_desc.hDevice = output->kmt_device; + D3DKMTSetVidPnSourceOwner(&set_owner_desc); +} + +static void wined3d_output_cleanup(const struct wined3d_output *output) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + + TRACE("output %p.\n", output); + + destroy_device_desc.hDevice = output->kmt_device; + D3DKMTDestroyDevice(&destroy_device_desc); + close_adapter_desc.hAdapter = output->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); +} + +static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_CREATEDEVICE create_device_desc = {{0}}; + D3DKMT_CLOSEADAPTER close_adapter_desc; + + TRACE("output %p, device_name %s.\n", output, wine_dbgstr_w(device_name)); + + lstrcpyW(open_adapter_desc.DeviceName, device_name); + if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) + return E_INVALIDARG; + + create_device_desc.u.hAdapter = open_adapter_desc.hAdapter; + if (D3DKMTCreateDevice(&create_device_desc)) + { + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); + return E_FAIL; + } + + output->kmt_adapter = open_adapter_desc.hAdapter; + output->kmt_device = create_device_desc.hDevice; + output->vidpn_source_id = open_adapter_desc.VidPnSourceId; + + return WINED3D_OK; +} + /* Adjust the amount of used texture memory */ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { @@ -74,6 +124,7 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { + wined3d_output_cleanup(&adapter->output); heap_free(adapter->formats); } @@ -827,6 +878,16 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } +struct wined3d_output * CDECL wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx) +{ + TRACE("wined3d %p, adapter_idx %u.\n", wined3d, adapter_idx); + + if (adapter_idx >= wined3d->adapter_count) + return NULL; + + return &wined3d->adapters[adapter_idx]->output; +} + /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ @@ -2715,6 +2776,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; + HRESULT hr; adapter->ordinal = ordinal; @@ -2722,10 +2784,16 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); + if (FAILED(hr = wined3d_output_init(&adapter->output, adapter->device_name))) + { + ERR("Failed to initialise output, hr %#x.\n", hr); + return FALSE; + } if (!AllocateLocallyUniqueId(&adapter->luid)) { ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + wined3d_output_cleanup(&adapter->output); return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter %p.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2b5b6c7667..771b9597e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -15,6 +15,7 @@ @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_mode_count(ptr long long long) +@ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -191,6 +192,8 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_release_ownership(ptr) + @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eaa6493ac4..4f48687f7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2860,6 +2860,13 @@ struct wined3d_adapter_ops struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; +struct wined3d_output +{ + D3DKMT_HANDLE kmt_adapter; + D3DKMT_HANDLE kmt_device; + D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -2870,6 +2877,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; + struct wined3d_output output; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cedbb09eba..1a9551e392 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2115,11 +2115,12 @@ struct wined3d_parent_ops }; struct wined3d; +struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_device; +struct wined3d_output; struct wined3d_palette; struct wined3d_query; -struct wined3d_blend_state; struct wined3d_rasterizer_state; struct wined3d_rendertarget_view; struct wined3d_resource; @@ -2205,6 +2206,7 @@ HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UI DWORD flags, struct wined3d_adapter_identifier *identifier); UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); +struct wined3d_output * __cdecl wined3d_get_adapter_output(const struct wined3d *wined3d, unsigned int adapter_idx); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2487,6 +2489,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); + HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette);

1 0

Zhiyi Zhang : dxgi: Implement dxgi_output_TakeOwnership().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: c173a650e19911310e62c11aac434f630ad7c9e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c173a650e19911310e62c11a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 30 17:49:30 2019 +0330 dxgi: Implement dxgi_output_TakeOwnership(). 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/output.c | 17 +++++++++++++++-- dlls/dxgi/tests/dxgi.c | 20 ++++++++++++-------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index db5c106948..a2331358e6 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -364,9 +364,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { - FIXME("iface %p, device %p, exclusive %d stub!\n", iface, device, exclusive); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_output *wined3d_output; + HRESULT hr = DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); + + if (!device) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, + output->adapter->ordinal))) + hr = wined3d_output_take_ownership(wined3d_output, exclusive); + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cbb5806e2d..b05e7f8bf9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5611,10 +5611,14 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); @@ -5624,16 +5628,16 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -5646,11 +5650,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 20130a75b2..0688e49c8c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,6 +72,37 @@ void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) D3DKMTSetVidPnSourceOwner(&set_owner_desc); } +HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS status; + + TRACE("output %p, exclusive %#x.\n", output, exclusive); + + owner_type = exclusive ? D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE : D3DKMT_VIDPNSOURCEOWNER_SHARED; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &output->vidpn_source_id; + set_owner_desc.VidPnSourceCount = 1; + set_owner_desc.hDevice = output->kmt_device; + status = D3DKMTSetVidPnSourceOwner(&set_owner_desc); + + switch (status) + { + case STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + case STATUS_INVALID_PARAMETER: + return E_INVALIDARG; + case STATUS_PROCEDURE_NOT_FOUND: + return E_NOINTERFACE; + case STATUS_SUCCESS: + return S_OK; + default: + FIXME("Unhandled error %#x.\n", status); + return E_FAIL; + } +} + static void wined3d_output_cleanup(const struct wined3d_output *output) { D3DKMT_DESTROYDEVICE destroy_device_desc; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 771b9597e5..43b6112714 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -193,6 +193,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) +@ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1a9551e392..fabcdcb0d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2490,6 +2490,7 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette);

1 0

Connor McAdams : d3d10: Move private effect functions to effect.c.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: b44d6c25b2b04762296d55df1479f128088bd01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44d6c25b2b04762296d55df… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:31 2019 +0330 d3d10: Move private effect functions to effect.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 34 --------- dlls/d3d10/effect.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 156 ------------------------------------- 3 files changed, 186 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b44d6c25b2b04762296d…

1 0

Connor McAdams : d3d10: Move debug_d3d10_driver_type() to d3d10_main.c.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: ae1cc9c742e5853e6e75d139e52f175f36528cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1cc9c742e5853e6e75d139… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:32 2019 +0330 d3d10: Move debug_d3d10_driver_type() to d3d10_main.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 19 +++++++++++++++++++ dlls/d3d10/d3d10_private.h | 1 - dlls/d3d10/utils.c | 15 --------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index e3d1c57e44..a54c44bdbb 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -24,6 +24,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +#define WINE_D3D10_TO_STR(x) case x: return #x + +static const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) +{ + switch (driver_type) + { + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); + default: + FIXME("Unrecognised D3D10_DRIVER_TYPE %#x.\n", driver_type); + return "unrecognised"; + } +} + +#undef WINE_D3D10_TO_STR + static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c9e6dbb823..1deba9c860 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -41,7 +41,6 @@ #define D3DERR_INVALIDCALL 0x8876086c /* TRACE helper functions */ -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) DECLSPEC_HIDDEN; const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) DECLSPEC_HIDDEN; enum d3d10_effect_object_type diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index fca8994ff2..680a11f37e 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -23,21 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define WINE_D3D10_TO_STR(x) case x: return #x -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) -{ - switch(driver_type) - { - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); - WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); - default: - FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); - return "unrecognized"; - } -} - const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) { switch (t)

1 0

Connor McAdams : d3d10: Move debug_d3d10_device_state_types() to stateblock.c.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 79aaabeb7f0c2d3686e04e98a928adae87ac79fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=79aaabeb7f0c2d3686e04e98… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Oct 30 17:49:33 2019 +0330 d3d10: Move debug_d3d10_device_state_types() to stateblock.c. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 3 +-- dlls/d3d10/d3d10_private.h | 3 --- dlls/d3d10/stateblock.c | 38 +++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 60 ---------------------------------------------- 4 files changed, 39 insertions(+), 65 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index e76f3c5f19..dec11188c4 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ d3d10_main.c \ effect.c \ shader.c \ - stateblock.c \ - utils.c + stateblock.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1deba9c860..fadd027f7a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,9 +40,6 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -/* TRACE helper functions */ -const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) DECLSPEC_HIDDEN; - enum d3d10_effect_object_type { D3D10_EOT_RASTERIZER_STATE = 0x0, diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index e20a4e31f3..ccc8a0e504 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -65,6 +65,44 @@ struct d3d10_stateblock BOOL predicate_value; }; +#define WINE_D3D10_TO_STR(x) case x: return #x + +static const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) +{ + switch (t) + { + WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); + WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); + WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); + WINE_D3D10_TO_STR(D3D10_DST_VS); + WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_VS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_GS); + WINE_D3D10_TO_STR(D3D10_DST_GS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_GS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_GS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_PS); + WINE_D3D10_TO_STR(D3D10_DST_PS_SAMPLERS); + WINE_D3D10_TO_STR(D3D10_DST_PS_SHADER_RESOURCES); + WINE_D3D10_TO_STR(D3D10_DST_PS_CONSTANT_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_IA_VERTEX_BUFFERS); + WINE_D3D10_TO_STR(D3D10_DST_IA_INDEX_BUFFER); + WINE_D3D10_TO_STR(D3D10_DST_IA_INPUT_LAYOUT); + WINE_D3D10_TO_STR(D3D10_DST_IA_PRIMITIVE_TOPOLOGY); + WINE_D3D10_TO_STR(D3D10_DST_RS_VIEWPORTS); + WINE_D3D10_TO_STR(D3D10_DST_RS_SCISSOR_RECTS); + WINE_D3D10_TO_STR(D3D10_DST_RS_RASTERIZER_STATE); + WINE_D3D10_TO_STR(D3D10_DST_PREDICATION); + default: + FIXME("Unrecognised D3D10_DEVICE_STATE_TYPES %#x.\n", t); + return "unrecognised"; + } +} + +#undef WINE_D3D10_TO_STR + static inline struct d3d10_stateblock *impl_from_ID3D10StateBlock(ID3D10StateBlock *iface) { return CONTAINING_RECORD(iface, struct d3d10_stateblock, ID3D10StateBlock_iface); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c deleted file mode 100644 index 680a11f37e..0000000000 --- a/dlls/d3d10/utils.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2008-2009 Henri Verbeet for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "d3d10_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d10); - -#define WINE_D3D10_TO_STR(x) case x: return #x - -const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) -{ - switch (t) - { - WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); - WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); - WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); - WINE_D3D10_TO_STR(D3D10_DST_VS); - WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_VS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_GS); - WINE_D3D10_TO_STR(D3D10_DST_GS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_GS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_GS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_PS); - WINE_D3D10_TO_STR(D3D10_DST_PS_SAMPLERS); - WINE_D3D10_TO_STR(D3D10_DST_PS_SHADER_RESOURCES); - WINE_D3D10_TO_STR(D3D10_DST_PS_CONSTANT_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_IA_VERTEX_BUFFERS); - WINE_D3D10_TO_STR(D3D10_DST_IA_INDEX_BUFFER); - WINE_D3D10_TO_STR(D3D10_DST_IA_INPUT_LAYOUT); - WINE_D3D10_TO_STR(D3D10_DST_IA_PRIMITIVE_TOPOLOGY); - WINE_D3D10_TO_STR(D3D10_DST_RS_VIEWPORTS); - WINE_D3D10_TO_STR(D3D10_DST_RS_SCISSOR_RECTS); - WINE_D3D10_TO_STR(D3D10_DST_RS_RASTERIZER_STATE); - WINE_D3D10_TO_STR(D3D10_DST_PREDICATION); - default: - FIXME("Unrecognized D3D10_DEVICE_STATE_TYPES %#x.\n", t); - return "unrecognized"; - } -} - -#undef WINE_D3D10_TO_STR

1 0

Alexandre Julliard : setupapi: Define .inf section names for ARM platforms.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: b2b3975f46c203a129a946128ccd018dd7ed6e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b3975f46c203a129a94612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 20:19:50 2019 +0100 setupapi: Define .inf section names for ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 4 ++++ dlls/setupapi/query.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 483835db24..e166754168 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1212,6 +1212,10 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; #elif defined(__x86_64__) static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; +#elif defined(__arm__) + static const WCHAR nt_platformW[] = {'.','n','t','a','r','m',0}; +#elif defined(__aarch64__) + static const WCHAR nt_platformW[] = {'.','n','t','a','r','m','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR nt_platformW[] = {'.','n','t',0}; #endif diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index cbb77d53e4..ea1b969618 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -43,6 +43,16 @@ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; static const WCHAR source_disks_files_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +#elif defined(__arm__) +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; +#elif defined(__aarch64__) +static const WCHAR source_disks_names_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; +static const WCHAR source_disks_files_platform[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0};

1 0

Alexandre Julliard : wine.inf: Add ARM64 sections.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 0ce5c82a3ce6d7665ff9fe83e20c0aa9892d7685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce5c82a3ce6d7665ff9fe83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 21:10:16 2019 +0100 wine.inf: Add ARM64 sections. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4c7b21bcc5..0ae057dc4c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -102,6 +102,33 @@ AddReg=\ VersionInfo.ntamd64,\ LicenseInformation +[DefaultInstall.ntarm64] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsWin64,FakeDlls +WinePreInstall=Wow64 +UpdateInis=SystemIni +CopyFiles=l_intl_section, inf_section +AddReg=\ + Classes,\ + ContentIndex,\ + ControlClass,\ + CurrentVersion,\ + CurrentVersionWow64,\ + Debugger,\ + DirectX,\ + Fonts,\ + MCI,\ + Misc,\ + Nls,\ + OLE,\ + Printing,\ + Services, \ + SessionMgr,\ + Tapi,\ + Timezones,\ + VersionInfo.ntamd64,\ + LicenseInformation + [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 @@ -117,6 +144,9 @@ AddReg=\ VersionInfo.ntamd64,\ LicenseInformation +[Wow64Install.ntarm64] +WineFakeDlls=FakeDllsWin32 + [DefaultInstall.Services] AddService=BITS,0,BITSService AddService=HTTP,0,HTTPService @@ -171,6 +201,24 @@ AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +[DefaultInstall.ntarm64.Services] +AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService +AddService=MSIServer,0,MSIService +AddService=MountMgr,0x800,MountMgrService +AddService=RpcSs,0,RpcSsService +AddService=Spooler,0,SpoolerService +AddService=StiSvc,0,StiService +AddService=TermService,0,TerminalServices +AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,WPFFontCacheService +AddService=LanmanServer,0,LanmanServerService +AddService=FontCache,0,FontCacheService +AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService +AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32"

1 0