March 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Introduce a stateblock flag for lights.
by Matteo Bruni 04 Mar '20

04 Mar '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- So that applications not using the fixed-function pipeline get to skip the lights checks entirely. dlls/wined3d/device.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 31 ++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 660ba777efc..639e94a624b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3904,14 +3904,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_ps_consts_b(device, range.offset, range.size, &state->ps_consts_b[range.offset]); } - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + if (changed->lights) { - const struct wined3d_light_info *light; - - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 69210e1fba2..c47a7323b14 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShader = 1; states->scissorRect = 1; states->blend_state = 1; + states->lights = 1; states->streamSource = 0xffff; states->streamFreq = 0xffff; @@ -262,6 +263,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; states->blend_state = 1; + states->lights = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -982,7 +984,8 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.ps = state->ps; } - wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.lights) + wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); if (stateblock->changed.blend_state && stateblock->stateblock_state.blend_state != state->blend_state) { @@ -1050,20 +1053,23 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } - for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) + if (stateblock->changed.lights) { - const struct wined3d_light_info *light; - struct wined3d_light_info *new_light; - - LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) { - if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, - &light->OriginalParms, &new_light))) + const struct wined3d_light_info *light; + struct wined3d_light_info *new_light; + + LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) { - wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, + &light->OriginalParms, &new_light))) + { + wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + } + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } } @@ -1708,6 +1714,7 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc stateblock->changed.streamFreq |= 1u << stream_idx; return WINED3D_OK; } + HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, UINT light_idx, const struct wined3d_light *light) { @@ -1744,6 +1751,7 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock return WINED3DERR_INVALIDCALL; } + stateblock->changed.lights = 1; return wined3d_light_state_set_light(stateblock->stateblock_state.light_state, light_idx, light, &object); } @@ -1761,6 +1769,7 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta return hr; } wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable); + stateblock->changed.lights = 1; return S_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 744e647008e..c658f5104c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3937,7 +3937,8 @@ struct wined3d_saved_states DWORD scissorRect : 1; DWORD store_stream_offset : 1; DWORD blend_state : 1; - DWORD padding : 3; + DWORD lights : 1; + DWORD padding : 2; }; struct StageState { -- 2.24.1

4 10

[PATCH 3/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_fullscreen().
by Zhiyi Zhang 04 Mar '20

04 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 11 ++++++++++- dlls/wined3d/directx.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 14 ++++++-------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 10 +++++++++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 2 +- 8 files changed, 58 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 004bd1457dd..603cf171e27 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -164,7 +164,7 @@ static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_stat wined3d_mutex_lock(); hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - adapter->factory->wined3d, adapter->ordinal, NULL); + adapter->factory->wined3d, dxgi_output->wined3d_output, NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 99fbf21ada2..c338307564b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5347,6 +5347,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; + struct wined3d_output *output; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5455,8 +5456,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return hr; } } + + output = wined3d_get_output_from_window(device->wined3d, swapchain->state.device_window); + if (!output) + { + ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + return E_FAIL; + } + if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, device->adapter->ordinal, mode))) + swapchain_desc, device->wined3d, output, mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 614a6eea8d7..06f337d3648 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,6 +146,33 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d return WINED3D_OK; } +struct wined3d_output * wined3d_get_output_from_window(const struct wined3d *wined3d, HWND hwnd) +{ + unsigned int adapter_idx, output_idx; + struct wined3d_adapter *adapter; + MONITORINFOEXW monitor_info; + HMONITOR monitor; + + TRACE("wined3d %p, hwnd %p.\n", wined3d, hwnd); + + monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) + return NULL; + + for (adapter_idx = 0; adapter_idx < wined3d->adapter_count; ++adapter_idx) + { + adapter = wined3d->adapters[adapter_idx]; + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + { + if (!lstrcmpiW(adapter->outputs[output_idx].device_name, monitor_info.szDevice)) + return &adapter->outputs[output_idx]; + } + } + + return NULL; +} + /* Adjust the amount of used texture memory */ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62bab65fcf3..12d172b0e06 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1566,13 +1566,13 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d *wined3d, - unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; HRESULT hr; - TRACE("state %p, swapchain_desc %p, wined3d %p, adapter_idx %u, mode %p.\n", - state, swapchain_desc, wined3d, adapter_idx, mode); + TRACE("state %p, swapchain_desc %p, wined3d %p, output %p, mode %p.\n", + state, swapchain_desc, wined3d, output, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1584,12 +1584,10 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { if (!swapchain_desc->windowed) { - const struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - 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 = adapter_format_from_backbuffer_format(adapter, + actual_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } @@ -1599,7 +1597,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) return hr; } else @@ -1607,7 +1605,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st if (mode) WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ca626638338..bb82a6121a4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -315,7 +315,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) -@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 05684aeb3ba..21f664d7de7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -540,6 +540,7 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *swapchain; + struct wined3d_output *output; struct wined3d_wndproc *entry; MSG *msg = (MSG *)lparam; unsigned int i; @@ -564,8 +565,15 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam wined3d_swapchain_get_desc(swapchain, &swapchain_desc); swapchain_desc.windowed = !swapchain_desc.windowed; + output = wined3d_get_output_from_window(swapchain->device->wined3d, + swapchain->state.device_window); + if (!output) + { + ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + break; + } wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, swapchain->device->adapter->ordinal, NULL); + swapchain->device->wined3d, output, NULL); wined3d_wndproc_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c7ea1f1628..30a07b4a5ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2906,6 +2906,9 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +struct wined3d_output * wined3d_get_output_from_window(const struct wined3d *wined3d, + HWND hwnd) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9600bf63ee7..edd350e11a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2818,7 +2818,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, - unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d_output *output, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.20.1

2 2

Re: [PATCH v3 5/5] d3dx9: Handle word breaks in ID3DXFont_DrawText.
by Matteo Bruni 04 Mar '20

04 Mar '20

On Mon, Mar 2, 2020 at 8:07 PM Sven Baars <sbaars(a)codeweavers.com> wrote: > > diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c > index 6721bc0765..6dd067f5f1 100644 > --- a/dlls/d3dx9_36/font.c > +++ b/dlls/d3dx9_36/font.c > @@ -20,6 +20,10 @@ > > #include "d3dx9_private.h" > > +#include <assert.h> > + > +#include "usp10.h" > + > WINE_DEFAULT_DEBUG_CHANNEL(d3dx); > > struct d3dx_glyph > @@ -509,13 +513,61 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, > return ret; > } > > +static void TEXT_WordBreak(HDC hdc, const WCHAR *str, unsigned int *len_str, > + int format, unsigned int chars_fit, > + unsigned int *chars_used, SIZE *size) Same thing as the other patch about picking a better name for the function. The function parameters are again a bit confusing but I don't have good suggestions. len_str certainly should be renamed though. > +{ > + SCRIPT_LOGATTR *sla; > + SCRIPT_ANALYSIS sa; > + int i; unsigned int i; > + > + assert(format & DT_WORDBREAK); This one doesn't seem to deserve an assert(), it's not like this is a required invariant such that the function breaks down if it's not valid. Actually, the format parameter is otherwise unused at the moment. > + assert(chars_fit < *len_str); > + > + *chars_used = 0; > + > + sla = heap_alloc(*len_str * sizeof(*sla)); > + if (!sla) > + return; > + > + memset(&sa, 0, sizeof(sa)); > + sa.eScript = SCRIPT_UNDEFINED; I assume this is okay although I don't know what it entails exactly.

1 0

[PATCH v3 1/5] d3dx9: Implement ID3DXFont_PreloadText.
by Sven Baars 04 Mar '20

04 Mar '20

Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v3: Use debugstr_{a,w}n and pass count < 0 ? countW - 1 : countW to PreloadTextW. Resent because yesterday the first 3 patches went missing. dlls/d3dx9_36/font.c | 56 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/core.c | 2 -- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 9196295637..81ba1e4fa0 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -420,14 +420,62 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count); - return E_NOTIMPL; + WCHAR *wstr; + HRESULT hr; + int countW; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_an(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + countW = MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, NULL, 0); + + wstr = heap_alloc(countW * sizeof(*wstr)); + if (!wstr) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, wstr, countW); + + hr = ID3DXFont_PreloadTextW(iface, wstr, count < 0 ? countW - 1 : countW); + + heap_free(wstr); + + return hr; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count); - return E_NOTIMPL; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + WORD *indices; + int i; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DXFont_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return D3D_OK; } static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b8e680d1c5..662483b687 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextA(font, NULL, 0); @@ -530,7 +529,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextW(font, L"", -1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } check_release((IUnknown*)font, 0); -- 2.24.0

4 9

[PATCH 5/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Zhiyi Zhang 04 Mar '20

04 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c094464412d..cbb6559983f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1379,19 +1379,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1429,7 +1429,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1598,7 +1599,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) return hr; } else -- 2.20.1

2 1

[PATCH 1/2] comctl32/tests: Add tests for appearance of disabled toolbar button.
by Ziqing Hui 04 Mar '20

04 Mar '20

According to my tests, on v6 comctl32, a toolbar button which contains a 32bpp bitmap with alpha channel will become grayscale if disabled. This can be indicated by the first tests patch. In conclusion, for v6 comctl32, here is the disabled toolbar button appearance in different situation: * 32bpp with alpha channel: Grayscale (This is not supported before v6) * 32bpp without alpha channel ("without alpha channel" means each pixel's alpha value is set to 0): Solid color * not 32bpp (maybe 24bpp, 16bpp etc.): Solid color Current wine doesn't implement the grayscale situation, which leads to wine bug 24784. This patch set fix it. The test code is run under v6, because grayscale is not supported before v6. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 201 ++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+)

2 2

[PATCH 4/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target().
by Zhiyi Zhang 04 Mar '20

04 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 ++++-- dlls/wined3d/swapchain.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 603cf171e27..25e994c5fe8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -189,7 +189,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); adapter = dxgi_output->adapter; - IDXGIOutput_Release(output); TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -198,7 +197,10 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - return wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, adapter->ordinal, &mode); + hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, + dxgi_output->wined3d_output, &mode); + IDXGIOutput_Release(output); + return hr; } static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 12d172b0e06..c094464412d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1401,14 +1401,15 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HWND window; HRESULT hr; - TRACE("state %p, wined3d %p, adapter_idx %u, mode %p.\n", state, wined3d, adapter_idx, mode); + TRACE("state %p, wined3d %p, output %p, mode %p.\n", state, wined3d, output, mode); wined3d_mutex_lock(); @@ -1428,7 +1429,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1437,7 +1438,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bb82a6121a4..a2ec923dd97 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -314,7 +314,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edd350e11a4..906d0e39408 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2815,7 +2815,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, struct wined3d_output *output, const struct wined3d_display_mode *mode); -- 2.20.1

2 1

[PATCH] include: Add some types used for MF pipeline objects.
by Nikolay Sivov 04 Mar '20

04 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index e27294d488..82f69518df 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -82,6 +82,16 @@ typedef enum MFSESSION_GETFULLTOPOLOGY_FLAGS MFSESSION_GETFULLTOPOLOGY_CURRENT = 0x00000001, } MFSESSION_GETFULLTOPOLOGY_FLAGS; +typedef enum _MF_CONNECT_METHOD +{ + MF_CONNECT_DIRECT = 0x00000000, + MF_CONNECT_ALLOW_CONVERTER = 0x00000001, + MF_CONNECT_ALLOW_DECODER = 0x00000003, + MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES = 0x00000004, + MF_CONNECT_AS_OPTIONAL = 0x00010000, + MF_CONNECT_AS_OPTIONAL_BRANCH = 0x00020000, +} MF_CONNECT_METHOD; + typedef enum _MF_TOPOLOGY_RESOLUTION_STATUS_FLAGS { MF_TOPOLOGY_RESOLUTION_SUCCEEDED = 0x00000000, @@ -640,6 +650,19 @@ interface IMFMediaSource : IMFMediaEventGenerator HRESULT Shutdown(); } +[ + object, + uuid(3c9b2eb9-86d5-4514-a394-f56664f9f0d8) +] +interface IMFMediaSourceEx : IMFMediaSource +{ + HRESULT GetSourceAttributes([out] IMFAttributes **attributes); + HRESULT GetStreamAttributes( + [in] DWORD streamid, + [out] IMFAttributes **attributes); + HRESULT SetD3DManager([in] IUnknown *manager); +} + [ object, uuid(d182108f-4ec6-443f-aa42-a71106ec825f), @@ -689,6 +712,16 @@ interface IMFPresentationClock : IMFClock HRESULT Pause(); } +[ + object, + uuid(6ef2a662-47c0-4666-b13d-cbb717f2fa2c) +] +interface IMFClockConsumer : IUnknown +{ + HRESULT SetPresentationClock([in] IMFPresentationClock *clock); + HRESULT GetPresentationClock([out] IMFPresentationClock **clock); +} + cpp_quote("#define MEDIASINK_FIXED_STREAMS 0x00000001") cpp_quote("#define MEDIASINK_CANNOT_MATCH_CLOCK 0x00000002") cpp_quote("#define MEDIASINK_RATELESS 0x00000004") @@ -730,6 +763,26 @@ interface IMFFinalizableMediaSink : IMFMediaSink HRESULT EndFinalize([in] IMFAsyncResult *result); } +[ + object, + uuid(5dfd4b2a-7674-4110-a4e6-8a68fd5f3688) +] +interface IMFMediaSinkPreroll : IUnknown +{ + HRESULT NotifyPreroll([in] MFTIME start_time); +} + +[ + object, + uuid(9db7aa41-3cc5-40d4-8509-555804ad34cc) +] +interface IMFStreamingSinkConfig : IUnknown +{ + HRESULT StartStreaming( + [in] BOOL is_byte_offset, + [in] QWORD seek_offset); +} + [ object, uuid(0a97b3cf-8e7c-4a3d-8f8c-0c843dc247fb), @@ -786,6 +839,62 @@ interface IMFQualityManager : IUnknown HRESULT Shutdown(); } +typedef enum _MF_QUALITY_DROP_MODE +{ + MF_DROP_MODE_NONE, + MF_DROP_MODE_1, + MF_DROP_MODE_2, + MF_DROP_MODE_3, + MF_DROP_MODE_4, + MF_DROP_MODE_5, + MF_NUM_DROP_MODES +} MF_QUALITY_DROP_MODE; + +typedef enum _MF_QUALITY_LEVEL +{ + MF_QUALITY_NORMAL, + MF_QUALITY_NORMAL_MINUS_1, + MF_QUALITY_NORMAL_MINUS_2, + MF_QUALITY_NORMAL_MINUS_3, + MF_QUALITY_NORMAL_MINUS_4, + MF_QUALITY_NORMAL_MINUS_5, + MF_NUM_QUALITY_LEVELS +} MF_QUALITY_LEVEL; + +[ + object, + uuid(ec15e2e9-e36b-4f7c-8758-77d452ef4ce7) +] +interface IMFQualityAdvise : IUnknown +{ + HRESULT SetDropMode([in] MF_QUALITY_DROP_MODE mode); + HRESULT SetQualityLevel([in] MF_QUALITY_LEVEL level); + HRESULT GetDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetQualityLevel([out] MF_QUALITY_LEVEL *level); + HRESULT DropTime([in] LONGLONG interval); +} + +[ + object, + uuid(f3706f0d-8ea2-4886-8000-7155e9ec2eae) +] +interface IMFQualityAdvise2 : IMFQualityAdvise +{ + HRESULT NotifyQualityEvent( + [in] IMFMediaEvent *event, + [out] DWORD *flags); +} + +[ + object, + uuid(dfcd8e4d-30b5-4567-acaa-8eb5b7853dc9) +] +interface IMFQualityAdviseLimits : IUnknown +{ + HRESULT GetMaximumDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetMinimumQualityLevel([out] MF_QUALITY_LEVEL *level); +} + typedef struct _MFT_REGISTRATION_INFO { CLSID clsid; -- 2.25.1

1 0

[tools] winetest/dissect: Fix handling of near timeouts.
by Francois Gouget 04 Mar '20

04 Mar '20

Sometimes WineTest times out waiting for a test but that test completes at almost the same time so that there is still a valid result line. This was causing dissect to complain about the inconsistency between the test's failure count and the 258 'exit code'. With this change dissect matches the TestBot Wine report parser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 87fdc65ad7..8f30ccde2a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -739,17 +739,17 @@ while ($line = <IN>) { my $class = $l_rc ? "failed" : ""; add_test_line($class, escapeHTML($line)); - if ((!$l_pid and !%pids) or ($l_pid and !$pids{$l_pid} and !$pids{0})) + if ($l_rc == 258) + { + add_test_line("end", "Test failed: timed out"); + $summary = "failed 258"; + $extra_failures++; + $broken = 1; + } + elsif ((!$l_pid and !%pids) or ($l_pid and !$pids{$l_pid} and !$pids{0})) { # The main summary line is missing - if ($l_rc == 258) - { - add_test_line("end", "Test failed: timed out"); - $summary = "failed 258"; - $extra_failures++; - $broken = 1; - } - elsif ($l_rc & 0xc0000000) + if ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); $summary = "failed crash"; -- 2.20.1

1 0

[PATCH 2/5] wined3d: Refactor wined3d_get_adapter_mode_count() to wined3d_output_get_mode_count().
by Zhiyi Zhang 04 Mar '20

04 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 8 ++++++-- dlls/d3d9/directx.c | 20 ++++++++++++++------ dlls/dxgi/output.c | 4 +--- dlls/wined3d/directx.c | 21 +++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7e9b72eea30..b78b119d22c 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -134,12 +134,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + unsigned int output_idx, count; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return 0; + wined3d_mutex_lock(); - count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 00632019c7d..83bb3d8217c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -149,20 +149,24 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D3DFORMAT format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, format %#x.\n", iface, adapter, format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, @@ -440,19 +444,23 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 063d72e13fa..fe8dd7b5c0a 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -107,7 +107,6 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, enum wined3d_format_id wined3d_format; struct wined3d_display_mode mode; unsigned int i, max_count; - struct wined3d *wined3d; HRESULT hr; if (!mode_count) @@ -122,8 +121,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d = output->adapter->factory->wined3d; - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + max_count = wined3d_output_get_mode_count(output->wined3d_output, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!modes) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 87beb98b3f4..614a6eea8d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -952,7 +952,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in of the same bpp but different resolutions */ /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, +unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) { const struct wined3d_adapter *adapter; @@ -962,20 +962,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); + TRACE("output %p, format %s, scanline_ordering %#x.\n", + output, debug_d3dformat(format_id), scanline_ordering); - if (adapter_idx >= wined3d->adapter_count) - return 0; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) + while (EnumDisplaySettingsExW(output->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -999,7 +996,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad } } - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + TRACE("Returning %u matching modes (out of %u total) for output %p.\n", i, j, output); return i; } @@ -1093,10 +1090,10 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[0]->outputs[0], mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) { - WARN("Adapter has 0 matching modes.\n"); + WARN("Output has 0 matching modes.\n"); return E_FAIL; } @@ -1831,7 +1828,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (!windowed) { /* If the requested display format is not available, don't continue. */ - if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!wined3d_output_get_mode_count(&wined3d->adapters[0]->outputs[0], display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b8d93ef2393..ca626638338 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -14,7 +14,6 @@ @ 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) -@ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ 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) @@ -194,6 +193,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) +@ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0bd8cbdddbc..9600bf63ee7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2267,8 +2267,6 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, 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); 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, @@ -2557,6 +2555,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, unsigned int mode_idx, struct wined3d_display_mode *mode); +unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); -- 2.20.1

1 0