wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : ntdll/tests: Add more tests for DOS to NT path conversion.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 4e044ff0d95e62f440021a92e1a748300788daff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e044ff0d95e62f440021a92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 11:14:10 2020 -0600 ntdll/tests: Add more tests for DOS to NT path conversion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 2f082b9cdd..0541f560ac 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -426,6 +426,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"c:foo/bar", L"\\??\\C:\\windows\\foo\\bar", 19}, {L"c:./foo", L"\\??\\C:\\windows\\foo", 15}, {L"c:/./foo", L"\\??\\c:\\foo", 7}, + {L"c:/..", L"\\??\\c:\\", -1}, {L"c:/foo/.", L"\\??\\c:\\foo", 7}, {L"c:/foo/./bar", L"\\??\\c:\\foo\\bar", 11}, {L"c:/foo/../bar", L"\\??\\c:\\bar", 7}, @@ -440,6 +441,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"AUX" , L"\\??\\AUX", -1}, {L"COM1" , L"\\??\\COM1", -1}, {L"?<>*\"|:", L"\\??\\C:\\windows\\?<>*\"|:", 15}, + {L"?:", L"\\??\\?:\\", -1}, {L"\\\\foo", L"\\??\\UNC\\foo", -1}, {L"//foo", L"\\??\\UNC\\foo", -1}, @@ -465,6 +467,15 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"//?/foo/.", L"\\??\\foo", 4}, {L"//?/foo/..", L"\\??\\", -1}, + {L"\\\\.", L"\\??\\", -1}, + {L"\\\\.\\", L"\\??\\", -1}, + {L"\\\\.\\/", L"\\??\\", -1}, + {L"\\\\.\\foo", L"\\??\\foo", 4}, + {L"\\\\.\\foo/", L"\\??\\foo\\", -1}, + {L"\\\\.\\foo/bar", L"\\??\\foo\\bar", 8}, + {L"\\\\.\\foo/.", L"\\??\\foo", 4}, + {L"\\\\.\\foo/..", L"\\??\\", -1}, + {L"\\\\?", L"\\??\\", -1}, {L"\\\\?\\", L"\\??\\", -1},

1 0

Zebediah Figura : ntdll/tests: Use wide character string literals in test_RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: ef7283a02d840230357b2678c8426270af6780cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7283a02d840230357b2678… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 11:14:09 2020 -0600 ntdll/tests: Use wide character string literals in test_RtlDosPathNameToNtPathName_U(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 199 ++++++++++++++++++++++++------------------------ 1 file changed, 98 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef7283a02d840230357b…

1 0

Zebediah Figura : ntdll/tests: Separate invalid name tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: ddbea051c98e29f0ab3da8364a8adea00bbf9857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddbea051c98e29f0ab3da836… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 11:14:08 2020 -0600 ntdll/tests: Separate invalid name tests for RtlDosPathNameToNtPathName_U(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 210 +++++++++++++++++++++++++----------------------- 1 file changed, 111 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddbea051c98e29f0ab3d…

1 0

Gabriel Ivăncescu : jscript/tests: Add tests for named items.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: eb80cc0f4acdba24839b25f3d9f9b4535f4328a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb80cc0f4acdba24839b25f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 5 17:12:03 2020 +0100 jscript/tests: Add tests for named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 715 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 702 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb80cc0f4acdba24839b…

1 0

Gabriel Ivăncescu : jscript: Use struct list for named items.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: e560489e504d5acda8d5e79fbf22eb78c32ed289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e560489e504d5acda8d5e79f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 5 17:11:56 2020 +0100 jscript: Use struct list for named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.c | 26 +++++++++----------------- dlls/jscript/jscript.h | 4 ++-- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4e28b6332d..7da8f707ed 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -591,7 +591,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t DISPID id; HRESULT hres; - for(item = ctx->named_items; item; item = item->next) { + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { hres = disp_get_id(ctx, item->disp, identifier, identifier, 0, &id); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5e9b153ba4..b878aa5e2d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -113,7 +113,7 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig named_item_t *item; HRESULT hr; - for(item = ctx->named_items; item; item = item->next) { + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { IUnknown *unk; @@ -414,20 +414,13 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->host_global = NULL; } - if(This->ctx->named_items) { - named_item_t *iter, *iter2; + while(!list_empty(&This->ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); - iter = This->ctx->named_items; - while(iter) { - iter2 = iter->next; - - if(iter->disp) - IDispatch_Release(iter->disp); - release_named_item(iter); - iter = iter2; - } - - This->ctx->named_items = NULL; + list_remove(&iter->entry); + if(iter->disp) + IDispatch_Release(iter->disp); + release_named_item(iter); } if(This->ctx->secmgr) { @@ -681,6 +674,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, ctx->version = This->version; ctx->html_mode = This->html_mode; ctx->acc = jsval_undefined(); + list_init(&ctx->named_items); heap_pool_init(&ctx->tmp_heap); hres = create_jscaller(ctx); @@ -851,9 +845,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, return E_OUTOFMEMORY; } - item->next = This->ctx->named_items; - This->ctx->named_items = item; - + list_add_tail(&This->ctx->named_items, &item->entry); return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index efd5a54273..7f34b55973 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -210,7 +210,7 @@ typedef struct named_item_t { DWORD flags; LPWSTR name; - struct named_item_t *next; + struct list entry; } named_item_t; named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; @@ -409,7 +409,7 @@ struct _script_ctx_t { IActiveScript *active_script; struct _call_frame_t *call_ctx; - named_item_t *named_items; + struct list named_items; IActiveScriptSite *site; IInternetHostSecurityManager *secmgr; DWORD safeopt;

1 0

Piotr Caban : gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: f65cca4de3f6a97f0c3f6837036864719e714520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65cca4de3f6a97f0c3f6837… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 16:04:31 2020 +0100 gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index cfcbd56d34..0b6e4ec377 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7224,8 +7224,13 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI } if (max_glyphsize == 0) + { /* Nothing to draw. */ + heap_free(pti); + DeleteDC(hdc); + DeleteObject(hfont); return Ok; + } glyph_mask = heap_alloc_zero(max_glyphsize); text_mask = heap_alloc_zero((max_x - min_x) * (max_y - min_y));

1 0

Piotr Caban : gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: c74d909e3b89246ca9ed7431a2da59ffa9549501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74d909e3b89246ca9ed7431… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 16:04:16 2020 +0100 gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index af95c7aeea..cfcbd56d34 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5373,7 +5373,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { stat = GdipSetEmpty(regions[i]); if (stat != Ok) + { + SelectObject(hdc, oldfont); + DeleteObject(gdifont); + if (temp_hdc) + DeleteDC(temp_hdc); return stat; + } } args.regions = regions;

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_swapchain_get_output().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: ead3d068f969ee798ef9bd85eb220d4c24a08b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead3d068f969ee798ef9bd85… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:04:29 2020 +0800 wined3d: Introduce wined3d_swapchain_get_output(). 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/wined3d/device.c | 9 ++++++++- dlls/wined3d/swapchain.c | 13 +++++++++++++ dlls/wined3d/wined3d_main.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 85b651ffc7..21f9af9566 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5038,6 +5038,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; @@ -5146,8 +5147,14 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return hr; } } + + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, &device->adapter->outputs[0], mode))) + swapchain_desc, device->wined3d, output, mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a70b6c1e06..be41cc385e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -289,6 +289,19 @@ static struct wined3d_output * get_output_from_window(const struct wined3d *wine return &wined3d->adapters[0]->outputs[0]; } +struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) +{ + HWND hwnd; + + TRACE("swapchain %p.\n", swapchain); + + hwnd = swapchain->state.device_window; + if (!hwnd) + hwnd = swapchain->win_handle; + + return get_output_from_window(swapchain->device->wined3d, hwnd); +} + HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3e852bd4e6..ea58f4473b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -541,6 +541,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_wndproc *entry; + struct wined3d_output *output; MSG *msg = (MSG *)lparam; unsigned int i; @@ -564,8 +565,13 @@ 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; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + break; + } wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, &swapchain->device->adapter->outputs[0], 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 4c7ea1f162..23540295bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4485,6 +4485,7 @@ struct wined3d_swapchain void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_fullscreen().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 878211c36f5aa279542c1e560a61ceb622399e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=878211c36f5aa279542c1e56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:04:13 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_fullscreen(). 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/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 14 ++++++-------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 004bd1457d..603cf171e2 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 768f4bfed5..85b651ffc7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5147,7 +5147,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, device->adapter->ordinal, mode))) + swapchain_desc, device->wined3d, &device->adapter->outputs[0], mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c7c751f736..a70b6c1e06 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1604,13 +1604,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) { @@ -1622,12 +1622,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; } @@ -1637,7 +1635,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 @@ -1645,7 +1643,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 f1dc26794e..5c3efbdc8b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -283,7 +283,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 05684aeb3b..3e852bd4e6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -565,7 +565,7 @@ 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; wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, swapchain->device->adapter->ordinal, NULL); + swapchain->device->wined3d, &swapchain->device->adapter->outputs[0], NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1161a624b9..cb8f19981a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2762,7 +2762,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);

1 0

Zhiyi Zhang : wined3d: Get output from window in wined3d_swapchain_state_init().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 54d0869b2e3d1837d7a09ab246043c612b00a43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d0869b2e3d1837d7a09ab2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:03:53 2020 +0800 wined3d: Get output from window in wined3d_swapchain_state_init(). 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/wined3d/swapchain.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62bab65fcf..c7c751f736 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -257,6 +257,38 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } +static struct wined3d_output * 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)) + { + ERR("Failed to get monitor information.\n"); + 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]; + } + } + + /* Because wined3d only supports one output right now. A window can be on non-primary outputs + * and thus fails to get its correct output. In this case, return the primary output for now */ + return &wined3d->adapters[0]->outputs[0]; +} + HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { @@ -767,10 +799,17 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d, unsigned int adapter_idx) { + struct wined3d_output *output; HRESULT hr; state->desc = *desc; + if (!(output = get_output_from_window(wined3d, window))) + { + WARN("Failed to get output from window %p.\n", window); + return E_FAIL; + } + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); @@ -781,11 +820,10 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat { if (desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - state->d3d_mode.width = desc->backbuffer_width; state->d3d_mode.height = desc->backbuffer_height; - state->d3d_mode.format_id = adapter_format_from_backbuffer_format(adapter, desc->backbuffer_format); + state->d3d_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, + desc->backbuffer_format); state->d3d_mode.refresh_rate = desc->refresh_rate; state->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020