August 2016 - Wine-commits - list.winehq.org

Józef Kucia : dxgi: Introduce helper functions for converting wined3d_display_mode.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 9381ad89fbe376dce1a318b11e2c8f0d0eae3505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381ad89fbe376dce1a318b11… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:50 2016 +0200 dxgi: Introduce helper functions for converting wined3d_display_mode. 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/dxgi_private.h | 2 ++ dlls/dxgi/output.c | 30 +++++++++++++++++------------- dlls/dxgi/swapchain.c | 6 +----- dlls/dxgi/utils.c | 10 ++++++++++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 987370f1..b417470 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -91,6 +91,8 @@ void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; +void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index cfd08fe..6d7ca20 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) +{ + mode->Width = wined3d_mode->width; + mode->Height = wined3d_mode->height; + mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; + mode->RefreshRate.Denominator = 1; + mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); + mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ +} + static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface); @@ -154,11 +165,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - struct dxgi_output *This = impl_from_IDXGIOutput(iface); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); enum wined3d_format_id wined3d_format; + unsigned int i, max_count; struct wined3d *wined3d; - UINT i; - UINT max_count; FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", iface, debug_dxgi_format(format), flags, mode_count, desc); @@ -172,11 +182,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return S_OK; } - wined3d = This->adapter->factory->wined3d; + wined3d = output->adapter->factory->wined3d; wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, + max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!desc) @@ -199,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa struct wined3d_display_mode mode; HRESULT hr; - hr = wined3d_enum_adapter_modes(wined3d, This->adapter->ordinal, wined3d_format, + hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); if (FAILED(hr)) { @@ -208,13 +218,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return hr; } - desc[i].Width = mode.width; - desc[i].Height = mode.height; - desc[i].RefreshRate.Numerator = mode.refresh_rate; - desc[i].RefreshRate.Denominator = 1; - desc[i].Format = format; - desc[i].ScanlineOrdering = mode.scanline_ordering; - desc[i].Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + dxgi_mode_from_wined3d(&desc[i], &mode); } wined3d_mutex_unlock(); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0057aa2..e0185dd 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -351,11 +351,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa if (target_mode_desc->Scaling) FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - mode.width = target_mode_desc->Width; - mode.height = target_mode_desc->Height; - mode.refresh_rate = dxgi_rational_to_uint(&target_mode_desc->RefreshRate); - mode.format_id = wined3dformat_from_dxgi_format(target_mode_desc->Format); - mode.scanline_ordering = wined3d_scanline_ordering_from_dxgi(target_mode_desc->ScanlineOrdering); + wined3d_display_mode_from_dxgi(&mode, target_mode_desc); wined3d_mutex_lock(); hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index b9be4a5..eda279f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -443,6 +443,16 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, } } +void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC *mode) +{ + wined3d_mode->width = mode->Width; + wined3d_mode->height = mode->Height; + wined3d_mode->refresh_rate = dxgi_rational_to_uint(&mode->RefreshRate); + wined3d_mode->format_id = wined3dformat_from_dxgi_format(mode->Format); + wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); +} + unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0;

1 0

Józef Kucia : wined3d: Introduce wined3d_find_closest_matching_adapter_mode().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 41d29a79f51cca0452fb37db38dc6b6df4b32dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d29a79f51cca0452fb37db3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:51 2016 +0200 wined3d: Introduce wined3d_find_closest_matching_adapter_mode(). 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/directx.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 + 3 files changed, 103 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ff88a8..4213df3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4199,6 +4199,106 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada return WINED3D_OK; } +HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, + unsigned int adapter_idx, struct wined3d_display_mode *mode) +{ + unsigned int i, j, mode_count, matching_mode_count, closest; + struct wined3d_display_mode **matching_modes; + struct wined3d_display_mode *modes; + HRESULT hr; + + TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); + + if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) + { + WARN("Adapter has 0 matching modes.\n"); + return E_FAIL; + } + + if (!(modes = wined3d_calloc(mode_count, sizeof(*modes)))) + return E_OUTOFMEMORY; + if (!(matching_modes = wined3d_calloc(mode_count, sizeof(*matching_modes)))) + { + HeapFree(GetProcessHeap(), 0, modes); + return E_OUTOFMEMORY; + } + + for (i = 0; i < mode_count; ++i) + { + if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, adapter_idx, + mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) + { + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + return hr; + } + matching_modes[i] = &modes[i]; + } + + matching_mode_count = mode_count; + + if (mode->scanline_ordering != WINED3D_SCANLINE_ORDERING_UNKNOWN) + { + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + if (matching_modes[i]->scanline_ordering == mode->scanline_ordering) + matching_modes[j++] = matching_modes[i]; + } + if (j > 0) + matching_mode_count = j; + } + + if (mode->refresh_rate) + { + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + if (matching_modes[i]->refresh_rate == mode->refresh_rate) + matching_modes[j++] = matching_modes[i]; + } + if (j > 0) + matching_mode_count = j; + } + + if (!mode->width || !mode->height) + { + struct wined3d_display_mode current_mode; + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, + &current_mode, NULL))) + { + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + return hr; + } + mode->width = current_mode.width; + mode->height = current_mode.height; + } + + closest = ~0u; + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + unsigned int d = abs(mode->width - matching_modes[i]->width) + + abs(mode->height - matching_modes[i]->height); + + if (closest > d) + { + closest = d; + j = i; + } + } + + *mode = *matching_modes[j]; + + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + + TRACE("Returning %ux%u@%u %s %#x.\n", mode->width, mode->height, + mode->refresh_rate, debug_d3dformat(mode->format_id), + mode->scanline_ordering); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c3899ed..0db371d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -10,6 +10,7 @@ @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) +@ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c9b262..bc343ec 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2105,6 +2105,8 @@ ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, UINT mode_idx, struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, + unsigned int adapter_idx, struct wined3d_display_mode *mode); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Józef Kucia : dxgi: Implement dxgi_output_FindClosestMatchingMode().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 8d89d0ec1ee7f50aeee348edb30c6b228f522d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d89d0ec1ee7f50aeee348edb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:52 2016 +0200 dxgi: Implement dxgi_output_FindClosestMatchingMode(). 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/output.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 6d7ca20..0cf8084 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -228,9 +228,42 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput *iface, const DXGI_MODE_DESC *mode, DXGI_MODE_DESC *closest_match, IUnknown *device) { - FIXME("iface %p, mode %p, closest_match %p, device %p stub!\n", iface, mode, closest_match, device); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", iface, mode, closest_match, device); + + if ((!mode->Width && mode->Height) || (mode->Width && !mode->Height)) + return DXGI_ERROR_INVALID_CALL; + + if (mode->Format == DXGI_FORMAT_UNKNOWN && !device) + return DXGI_ERROR_INVALID_CALL; + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + if (mode->Format == DXGI_FORMAT_UNKNOWN) + { + FIXME("Matching formats to device not implemented.\n"); + return E_NOTIMPL; + } + + adapter = output->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + dxgi_mode_from_wined3d(closest_match, &wined3d_mode); + TRACE("Returning %s.\n", debug_dxgi_mode(closest_match)); + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput *iface) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 23624eb..8ec65e2 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -225,7 +225,7 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ mode_desc.Width = new_width; mode_desc.Height = new_height; hr = IDXGIOutput_FindClosestMatchingMode(target, &mode_desc, &mode_desc, NULL); - todo_wine ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr); + ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr); new_width = mode_desc.Width; new_height = mode_desc.Height; }

1 0

Józef Kucia : dxgi/tests: Add test for IDXGIOutput_FindClosestMatchingMode().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 09a4957401d49dfaf56cbb153c41b86466eeb8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a4957401d49dfaf56cbb153… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:53 2016 +0200 dxgi/tests: Add test for IDXGIOutput_FindClosestMatchingMode(). 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/device.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09a4957401d49dfaf56cb…

1 0

Józef Kucia : wined3d: Optionally use closest matching mode in wined3d_swapchain_set_fullscreen( ).
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 92a6c5839d9ebda9b94facbfd5bdac1bbb423600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a6c5839d9ebda9b94facbfd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:54 2016 +0200 wined3d: Optionally use closest matching mode in wined3d_swapchain_set_fullscreen(). 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/swapchain.c | 48 ++++++++++++++++++++++++++++-------------------- include/wine/wined3d.h | 3 ++- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e405457..fdfe337 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1450,35 +1450,44 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { struct wined3d_device *device = swapchain->device; - struct wined3d_display_mode default_mode; - unsigned int width, height; + struct wined3d_display_mode actual_mode; HRESULT hr; TRACE("swapchain %p, desc %p, mode %p.\n", swapchain, swapchain_desc, mode); if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - width = swapchain_desc->backbuffer_width; - height = swapchain_desc->backbuffer_height; - - if (!mode) + if (mode) + { + actual_mode = *mode; + } + else { if (!swapchain_desc->windowed) { - default_mode.width = swapchain_desc->backbuffer_width; - default_mode.height = swapchain_desc->backbuffer_height; - default_mode.refresh_rate = swapchain_desc->refresh_rate; - default_mode.format_id = swapchain_desc->backbuffer_format; - default_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + actual_mode.width = swapchain_desc->backbuffer_width; + actual_mode.height = swapchain_desc->backbuffer_height; + actual_mode.refresh_rate = swapchain_desc->refresh_rate; + actual_mode.format_id = swapchain_desc->backbuffer_format; + actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else { - default_mode = swapchain->original_mode; + actual_mode = swapchain->original_mode; } - mode = &default_mode; } - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) + { + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, + device->adapter->ordinal, &actual_mode))) + { + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + } + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, &actual_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1490,19 +1499,18 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &default_mode, NULL))) + &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - mode = &default_mode; - - width = mode->width; - height = mode->height; } if (!swapchain_desc->windowed) { + unsigned int width = actual_mode.width; + unsigned int height = actual_mode.height; + if (swapchain->desc.windowed) { HWND focus_window = device->create_parms.focus_window; @@ -1522,7 +1530,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha /* Fullscreen -> fullscreen mode change */ MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); } - swapchain->d3d_mode = *mode; + swapchain->d3d_mode = actual_mode; } else if (!swapchain->desc.windowed) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc343ec..81dffea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -829,7 +829,8 @@ enum wined3d_display_rotation #define WINED3D_SWAPCHAIN_NOAUTOROTATE 0x00000020u #define WINED3D_SWAPCHAIN_UNPRUNEDMODE 0x00000040u #define WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH 0x00001000u -#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00002000u +#define WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE 0x00002000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3DDP_MAXTEXCOORD 8

1 0

Józef Kucia : dxgi: Enable WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: f94ef02dbcc5db2dafcb14beaf553e5dd7626791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94ef02dbcc5db2dafcb14bea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:55 2016 +0200 dxgi: Enable WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE. 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/swapchain.c | 3 +++ dlls/dxgi/tests/device.c | 63 +++++++++++++++++++++--------------------------- dlls/dxgi/utils.c | 7 ++++-- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e0185dd..7b02b3e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -481,6 +481,9 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); + if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) + FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); + swapchain->fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d533af4..41a4d85 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1183,21 +1183,18 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - todo_wine ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", - result_desc.BufferDesc.Width, expected_width); - ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", - result_desc.BufferDesc.Height, expected_height); - check_swapchain_fullscreen_state(swapchain, &expected_state); - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - IDXGISwapChain_Release(swapchain); - } + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, expected_width); + todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, expected_height); + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + IDXGISwapChain_Release(swapchain); IDXGIOutput_Release(expected_state.target); @@ -2161,25 +2158,22 @@ static void test_inexact_modes(void) sizes[i].width, sizes[i].height, output); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - check_swapchain_fullscreen_state(swapchain, &expected_state); - hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", - result_desc.BufferDesc.Width, sizes[i].width); - ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", - result_desc.BufferDesc.Height, sizes[i].height); + check_swapchain_fullscreen_state(swapchain, &expected_state); + hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", + result_desc.BufferDesc.Width, sizes[i].width); + ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", + result_desc.BufferDesc.Height, sizes[i].height); - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - } + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); /* Test SetFullscreenState(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -2189,11 +2183,10 @@ static void test_inexact_modes(void) hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - todo_wine hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - check_swapchain_fullscreen_state(swapchain, &expected_state); + check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index eda279f..b940b15 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -453,11 +453,14 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } +#define DXGI_WINED3D_SWAPCHAIN_FLAGS \ + (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0; - wined3d_flags &= ~WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; + wined3d_flags &= ~DXGI_WINED3D_SWAPCHAIN_FLAGS; if (wined3d_flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -473,7 +476,7 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) { - unsigned int wined3d_flags = WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ + unsigned int wined3d_flags = DXGI_WINED3D_SWAPCHAIN_FLAGS; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ if (flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) {

1 0

Józef Kucia : wined3d: Optionally use closest matching mode in wined3d_swapchain_resize_target() .
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: bd10362667f04d6ea82144d1871ce143549a6bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd10362667f04d6ea82144d18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:56 2016 +0200 wined3d: Optionally use closest matching mode in wined3d_swapchain_resize_target(). 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/device.c | 5 ++-- dlls/wined3d/swapchain.c | 60 ++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 41a4d85..d9cedff 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -2215,10 +2215,9 @@ static void test_inexact_modes(void) swapchain_desc.BufferDesc.Width = sizes[i].width; swapchain_desc.BufferDesc.Height = sizes[i].height; hr = IDXGISwapChain_ResizeTarget(swapchain, &swapchain_desc.BufferDesc); - todo_wine ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - check_swapchain_fullscreen_state(swapchain, &expected_state); + check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fdfe337..695d409 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1397,20 +1397,44 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha return WINED3D_OK; } +static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swapchain, + struct wined3d_display_mode *mode) +{ + struct wined3d_device *device = swapchain->device; + HRESULT hr; + + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) + { + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, + device->adapter->ordinal, mode))) + { + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + } + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + + return WINED3D_OK; +} + HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { struct wined3d_device *device = swapchain->device; - struct wined3d_display_mode current_mode; + struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); - SetRect(&window_rect, 0, 0, mode->width, mode->height); - if (swapchain->desc.windowed) { + SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); @@ -1421,22 +1445,21 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + return hr; + SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else { if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &current_mode, NULL))) + &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - SetRect(&window_rect, 0, 0, current_mode.width, current_mode.height); + SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, @@ -1477,21 +1500,8 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha } } - if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) - { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, - device->adapter->ordinal, &actual_mode))) - { - WARN("Failed to find closest matching mode, hr %#x.\n", hr); - } - } - - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, &actual_mode))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + return hr; } else {

1 0

Bruno Jesus : msacm32: Add the 16-bit DLL version on acmGetVersion.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: e8d72a0e31ecd418cff758c945967a78d6ee10ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d72a0e31ecd418cff758c94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 24 20:12:14 2016 -0300 msacm32: Add the 16-bit DLL version on acmGetVersion. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/msacm32_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index a47611c..efe58af 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -84,6 +84,8 @@ DWORD WINAPI acmGetVersion(void) switch (version.dwPlatformId) { case VER_PLATFORM_WIN32_NT: return 0x04000565; /* 4.0.1381 */ + case VER_PLATFORM_WIN32s: + return 0x02010000; /* 2.1 */ default: FIXME("%x not supported\n", version.dwPlatformId); /* fall through */

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: bc7228a4601f867d6d6a8fda974c163fc1ef94c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7228a4601f867d6d6a8fda9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:43 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 53f851f..5ce7621 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -74,6 +74,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT WS_PROXY_MESSAGE_CALLBACK_CONTEXT; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -388,6 +389,16 @@ typedef struct _WS_WSZ_DESCRIPTION { ULONG maxCharCount; } WS_WSZ_DESCRIPTION; +typedef struct _WS_STRING_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +} WS_STRING_DESCRIPTION; + +typedef struct _WS_XML_STRING_DESCRIPTION { + ULONG minByteCount; + ULONG maxByteCount; +} WS_XML_STRING_DESCRIPTION; + struct _WS_ENUM_VALUE { int value; WS_XML_STRING *name; @@ -1346,6 +1357,17 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +typedef HRESULT (CALLBACK *WS_PROXY_MESSAGE_CALLBACK) + (WS_MESSAGE*, WS_HEAP*, void*, WS_ERROR*); + +struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT +{ + WS_PROXY_MESSAGE_CALLBACK callback; + void *state; +}; + +HRESULT WINAPI WsAddCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, ULONG, WS_ERROR*); HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); @@ -1432,6 +1454,8 @@ HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveCustomHeader(WS_MESSAGE*, const WS_XML_STRING*, const WS_XML_STRING*, + WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Flush the writer first in WsWriteXmlBuffer.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 633828f832c301d13082fd4600234732a9e583f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633828f832c301d13082fd460… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:44 2016 +0200 webservices: Flush the writer first in WsWriteXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1fb5489..177c6e0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1920,6 +1920,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W if (!writer || !xmlbuf) return E_INVALIDARG; + if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) return hr; write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK;

1 0