October 2019 - Wine-devel - list.winehq.org

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_texture().
by Zebediah Figura 24 Oct '19

24 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1965a4303f..96021f8067 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1485,6 +1485,28 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock stateblock->changed.textureState[stage] |= 1u << state; } +void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, + UINT stage, struct wined3d_texture *texture) +{ + TRACE("stateblock %p, stage %u, texture %p.\n", stateblock, stage, texture); + + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= ARRAY_SIZE(stateblock->stateblock_state.textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + return; + } + + if (texture) + wined3d_texture_incref(texture); + if (stateblock->stateblock_state.textures[stage]) + wined3d_texture_decref(stateblock->stateblock_state.textures[stage]); + stateblock->stateblock_state.textures[stage] = texture; + stateblock->changed.textures |= 1u << stage; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2df6c510b1..23d97d47b7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -265,6 +265,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 57f5775409..37d9aeb671 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2673,6 +2673,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, -- 2.20.1

3 6

[PATCH 3/4] mmdevapi: Set data pointer to NULL on IAudioCaptureClient::GetBuffer failure
by Andrew Eikum 24 Oct '19

24 Oct '19

Matches Windows 10 behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/tests/capture.c | 9 ++++++--- dlls/winealsa.drv/mmdevdrv.c | 7 ++++++- dlls/wineandroid.drv/mmdevdrv.c | 7 ++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 7 ++++++- dlls/wineoss.drv/mmdevdrv.c | 7 ++++++- dlls/winepulse.drv/mmdevdrv.c | 7 ++++++- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 253ba3c762b..5cf61ea8245 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -122,7 +122,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, NULL, NULL, NULL); ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08x\n", hr); - ok((DWORD_PTR)data == 0xdeadf00d, "data is reset to %p\n", data); + ok(broken((DWORD_PTR)data == 0xdeadf00d) || /* <= win8 */ + data == NULL, "data is reset to %p\n", data); ok(frames == 0xdeadbeef, "frames is reset to %08x\n", frames); ok(flags == 0xabadcafe, "flags is reset to %08x\n", flags); @@ -147,7 +148,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) sum = pos; }else if (hr == AUDCLNT_S_BUFFER_EMPTY){ ok(!frames, "Amount of frames locked with empty buffer is %u!\n", frames); - ok(data == (void*)0xdeadf00d, "No data changed to %p\n", data); + ok(broken(data == (void*)0xdeadf00d) || /* <= win8 */ + data == NULL, "No data changed to %p\n", data); } trace("Wait'ed position %d pad %u flags %x, amount of frames locked: %u\n", @@ -228,7 +230,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data2, &frames2, &flags, &pos, &qpc); ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == 0xabadcafe, "Out of order frames changed to %x\n", frames2); - ok(data2 == (void*)0xdeadf00d, "Out of order data changed to %p\n", data2); + ok(broken(data2 == (void*)0xdeadf00d) /* <= win8 */ || + data2 == NULL, "Out of order data changed to %p\n", data2); ok(flags == 0xabadcafe, "Out of order flags changed to %x\n", flags); ok(pos == 0xdeadbeef, "Out of order position changed to %x\n", (UINT)pos); ok(qpc == 0xdeadbeef, "Out of order timer changed to %x\n", (UINT)qpc); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4f1270b33c8..5bc71da77ae 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2883,7 +2883,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 1dafe02f4cd..e10b3debf1c 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1845,7 +1845,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index be2b5e7e1e9..d595f43007b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2442,7 +2442,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; OSSpinLockLock(&This->lock); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dca40ecd771..c6b6e8effe5 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2007,7 +2007,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1c647c73d62..61f0e03c9f1 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2511,7 +2511,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if (!data || !frames || !flags) + if (!data) + return E_POINTER; + + *data = NULL; + + if (!frames || !flags) return E_POINTER; pthread_mutex_lock(&pulse_lock); -- 2.23.0

1 0

[PATCH 2/4] mmdevapi/tests: Use discontinuity flag to detect broken win7 behavior
by Andrew Eikum 24 Oct '19

24 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/tests/capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 732776c4014..253ba3c762b 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -142,7 +142,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(frames, "Amount of frames locked is 0!\n"); /* broken: some w7 machines return pad == 0 and DATA_DISCONTINUITY here, * AUDCLNT_S_BUFFER_EMPTY above, yet pos == 1-2 * period rather than 0 */ - ok(pos == sum || broken(pos == period || pos == 2*period), + ok(pos == sum || broken(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY), "Position %u expected %u\n", (UINT)pos, sum); sum = pos; }else if (hr == AUDCLNT_S_BUFFER_EMPTY){ -- 2.23.0

1 0

[PATCH v2 1/2] dxgi: Implement dxgi_output_ReleaseOwnership.
by Zhiyi Zhang 24 Oct '19

24 Oct '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix a typo. Supersede 171911~171912 dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/output.c | 22 +++++++++--- dlls/wined3d/directx.c | 62 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 3 ++ dlls/wined3d/wined3d_private.h | 7 ++++ include/wine/wined3d.h | 4 +++ 6 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b93449834..6506b3a392 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -146,6 +146,7 @@ struct dxgi_output LONG refcount; struct wined3d_private_store private_store; struct dxgi_adapter *adapter; + struct wined3d_output *wined3d_output; }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index abe1aef950..1faf202e24 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -203,6 +203,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) if (!refcount) { + wined3d_output_destroy(output->wined3d_output); wined3d_private_store_cleanup(&output->private_store); IWineDXGIAdapter_Release(&output->adapter->IWineDXGIAdapter_iface); heap_free(output); @@ -342,7 +343,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_output_release_ownership(output->wined3d_output); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, @@ -530,13 +537,21 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); } -static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) +static HRESULT dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { + struct wined3d_output_desc wined3d_desc; + output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; wined3d_private_store_init(&output->private_store); output->adapter = adapter; IWineDXGIAdapter_AddRef(&output->adapter->IWineDXGIAdapter_iface); + + wined3d_mutex_lock(); + wined3d_get_output_desc(output->adapter->factory->wined3d, output->adapter->ordinal, &wined3d_desc); + wined3d_mutex_unlock(); + + return wined3d_output_create(wined3d_desc.device_name, &output->wined3d_output); } HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) @@ -544,6 +559,5 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; - dxgi_output_init(*output, adapter); - return S_OK; + return dxgi_output_init(*output, adapter); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 726b1e3775..03c8781386 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -827,6 +827,68 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } +HRESULT CDECL wined3d_output_create(const WCHAR *display_name, struct wined3d_output **target) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_CREATEDEVICE create_device_desc = {0}; + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + struct wined3d_output *output; + + TRACE("display_name %s, target %p.\n", wine_dbgstr_w(display_name), target); + + lstrcpyW(open_adapter_desc.DeviceName, display_name); + if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) + return E_INVALIDARG; + + create_device_desc.u.hAdapter = open_adapter_desc.hAdapter; + if (D3DKMTCreateDevice(&create_device_desc)) + { + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); + return E_FAIL; + } + + if (!(output = heap_alloc(sizeof(*output)))) + { + destroy_device_desc.hDevice = create_device_desc.hDevice; + D3DKMTDestroyDevice(&destroy_device_desc); + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); + return E_OUTOFMEMORY; + } + + output->kmt_adapter = open_adapter_desc.hAdapter; + output->kmt_device = create_device_desc.hDevice; + output->vidpn_source_id = open_adapter_desc.VidPnSourceId; + *target = output; + return WINED3D_OK; +} + +void CDECL wined3d_output_destroy(struct wined3d_output *output) +{ + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + + TRACE("output %p.\n", output); + + destroy_device_desc.hDevice = output->kmt_device; + D3DKMTDestroyDevice(&destroy_device_desc); + close_adapter_desc.hAdapter = output->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); + heap_free(output); +} + +void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + + TRACE("output %p.\n", output); + + set_owner_desc.hDevice = output->kmt_device; + D3DKMTSetVidPnSourceOwner(&set_owner_desc); +} + /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2df6c510b1..2e3a642813 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -19,6 +19,9 @@ @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) +@ cdecl wined3d_output_create(str ptr) +@ cdecl wined3d_output_destroy(ptr) +@ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 307f7a42ad..de99b2a8d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2952,6 +2952,13 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; +struct wined3d_output +{ + D3DKMT_HANDLE kmt_adapter; + D3DKMT_HANDLE kmt_device; + D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; +}; + enum wined3d_projection_type { WINED3D_PROJECTION_NONE = 0, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 57f5775409..b75b544d11 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2120,6 +2120,7 @@ struct wined3d_device; struct wined3d_palette; struct wined3d_query; struct wined3d_blend_state; +struct wined3d_output; struct wined3d_rasterizer_state; struct wined3d_rendertarget_view; struct wined3d_resource; @@ -2212,6 +2213,9 @@ HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); +HRESULT __cdecl wined3d_output_create(const WCHAR *display_name, struct wined3d_output **target); +void __cdecl wined3d_output_destroy(struct wined3d_output *output); +void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, struct wined3d_device *device, unsigned int flags); -- 2.23.0

2 3

[PATCH 3/3] d2d1: Improve bitmap creation DPI handling.
by Henri Verbeet 24 Oct '19

24 Oct '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 171797. dlls/d2d1/bitmap.c | 13 +++++++++++++ dlls/d2d1/tests/d2d1.c | 22 ++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index dc5ed9e6ad7..bc958e50a11 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -313,6 +313,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; HRESULT hr; @@ -324,6 +325,18 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return D2DERR_UNSUPPORTED_PIXEL_FORMAT; } + if (desc->dpiX == 0.0f && desc->dpiY == 0.0f) + { + bitmap_desc = *desc; + bitmap_desc.dpiX = context->desc.dpiX; + bitmap_desc.dpiY = context->desc.dpiY; + desc = &bitmap_desc; + } + else if (desc->dpiX <= 0.0f || desc->dpiY <= 0.0f) + { + return E_INVALIDARG; + } + texture_desc.Width = size.width; texture_desc.Height = size.height; if (!texture_desc.Width || !texture_desc.Height) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a71477be3b4..0ed51c7f805 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8169,9 +8169,8 @@ static void test_dpi(void) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmapFromWicBitmap(device_context, wic_bitmap_src, &bitmap_desc, &bitmap); - todo_wine_if(FAILED(create_dpi_tests[i].hr)) - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, create_dpi_tests[i].hr); + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); IWICBitmapSource_Release(wic_bitmap_src); if (FAILED(hr)) @@ -8183,10 +8182,8 @@ static void test_dpi(void) if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) { /* Bitmap DPI values are inherited at creation time. */ - todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", - i, dpi_x, init_dpi_x); - todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", - i, dpi_y, init_dpi_y); + ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, init_dpi_x); + ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, init_dpi_y); } else { @@ -8225,9 +8222,8 @@ static void test_dpi(void) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap); - todo_wine_if(FAILED(create_dpi_tests[i].hr)) - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, create_dpi_tests[i].hr); + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); if (FAILED(hr)) continue; @@ -8238,10 +8234,8 @@ static void test_dpi(void) if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) { /* Bitmap DPI values are inherited at creation time. */ - todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", - i, dpi_x, init_dpi_x); - todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", - i, dpi_y, init_dpi_y); + ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, init_dpi_x); + ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, init_dpi_y); } else { -- 2.11.0

2 1

[PATCH 2/3] d2d1: Don't update device context DPI values when changing targets.
by Henri Verbeet 24 Oct '19

24 Oct '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 171798. dlls/d2d1/device.c | 8 +++----- dlls/d2d1/tests/d2d1.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 98f06a281a9..64b3041b2cf 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1940,9 +1940,7 @@ static void d2d_device_context_reset_target(struct d2d_device_context *context) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface); context->target = NULL; - context->desc.dpiX = 96.0f; - context->desc.dpiY = 96.0f; - + /* Note that DPI settings are kept. */ memset(&context->desc.pixelFormat, 0, sizeof(context->desc.pixelFormat)); memset(&context->pixel_size, 0, sizeof(context->pixel_size)); @@ -1983,8 +1981,6 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i d2d_device_context_reset_target(context); /* Set sizes and pixel format. */ - context->desc.dpiX = bitmap_impl->dpi_x; - context->desc.dpiY = bitmap_impl->dpi_y; context->pixel_size = bitmap_impl->pixel_size; context->desc.pixelFormat = bitmap_impl->format; context->target = bitmap_impl; @@ -3771,6 +3767,8 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, return hr; } + ID2D1DeviceContext_SetDpi(&object->ID2D1DeviceContext_iface, bitmap_desc.dpiX, bitmap_desc.dpiY); + if (surface) { bitmap_desc.pixelFormat = desc->pixelFormat; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d6b5055ed3d..a71477be3b4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8137,8 +8137,8 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } @@ -8203,8 +8203,8 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } @@ -8258,16 +8258,16 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } ID2D1DeviceContext_SetTarget(device_context, NULL); ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Got unexpected dpi_x %.8e, expected %.8e.\n", dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Got unexpected dpi_y %.8e, expected %.8e.\n", dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Got unexpected dpi_x %.8e, expected %.8e.\n", dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Got unexpected dpi_y %.8e, expected %.8e.\n", dpi_y, dc_dpi_y); ID2D1DeviceContext_Release(device_context); IDXGISurface_Release(surface); -- 2.11.0

2 1

[PATCH vkd3d 1/2] vkd3d: Align allocated GPU address ranges to the requested resource alignment.
by Henri Verbeet 24 Oct '19

24 Oct '19

From: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This (partially) supersedes patch 171219. libs/vkd3d/device.c | 23 ++++++++++++++++------- libs/vkd3d/resource.c | 1 + libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d30c447..2dee5e3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1823,37 +1823,46 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) } D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t size, void *ptr) + size_t alignment, size_t size, void *ptr) { - D3D12_GPU_VIRTUAL_ADDRESS ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0; struct vkd3d_gpu_va_allocation *allocation; + D3D12_GPU_VIRTUAL_ADDRESS base, ceiling; int rc; + if (size > ~(size_t)0 - (alignment - 1)) + return 0; + size = align(size, alignment); + if ((rc = pthread_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; } - if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, - allocator->allocation_count + 1, sizeof(*allocator->allocations))) + base = allocator->floor; + ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0; + ceiling -= alignment - 1; + if (size > ceiling || ceiling - size < base) { pthread_mutex_unlock(&allocator->mutex); return 0; } - if (size > ceiling || ceiling - size < allocator->floor) + base = (base + (alignment - 1)) & ~((D3D12_GPU_VIRTUAL_ADDRESS)alignment - 1); + + if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, + allocator->allocation_count + 1, sizeof(*allocator->allocations))) { pthread_mutex_unlock(&allocator->mutex); return 0; } allocation = &allocator->allocations[allocator->allocation_count++]; - allocation->base = allocator->floor; + allocation->base = base; allocation->size = size; allocation->ptr = ptr; - allocator->floor += size; + allocator->floor = base + size; pthread_mutex_unlock(&allocator->mutex); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 626772e..f15c371 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1684,6 +1684,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 &resource->desc, &resource->u.vk_buffer))) return hr; if (!(resource->gpu_address = vkd3d_gpu_va_allocator_allocate(&device->gpu_va_allocator, + desc->Alignment ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, desc->Width, resource))) { ERR("Failed to allocate GPU VA.\n"); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 69b08a2..520dab1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -219,7 +219,7 @@ struct vkd3d_gpu_va_allocator }; D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t size, void *ptr) DECLSPEC_HIDDEN; + size_t alignment, size_t size, void *ptr) DECLSPEC_HIDDEN; void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, -- 2.11.0

1 0

[PATCH] kernel32: Always return a good GeoID from GetUserGeoID() if arguments are sane.
by João Diogo Ferreira 24 Oct '19

24 Oct '19

PARTIALLY FIXES BUG #46196: Prevents the game from crashing, but the country flag is still wrong without manual configuration by the user. https://bugs.winehq.org/show_bug.cgi?id=46196 This behaviour is 100% identical to Windows 10 v1903 (probably since v1709 but I didn't check that far). 39070 is the neutral "World" GeoID. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c690aa8d5e..ce13db3369 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3648,7 +3648,7 @@ BOOL WINAPI InvalidateNLSCache(void) */ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; WCHAR bufferW[40], *end; @@ -3671,8 +3671,11 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) } break; case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); + FIXME("GEOCLASS_REGION not handled yet, returning default: 39070\n"); break; + default: + WARN("Unrecognized geoclass %d\n", GeoClass); + ret = GEOID_NOT_AVAILABLE; } NtClose(hkey); -- 2.23.0

2 1

[PATCH 1/3] d2d1/tests: Add some DPI tests.
by Henri Verbeet 24 Oct '19

24 Oct '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 171796. dlls/d2d1/tests/d2d1.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f8fc1f5a291..d6b5055ed3d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8046,6 +8046,237 @@ static void test_max_bitmap_size(void) ID2D1Factory_Release(factory); } +static void test_dpi(void) +{ + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1DeviceContext *device_context; + IWICImagingFactory *wic_factory; + IDXGISwapChain *swapchain; + ID3D10Device1 *d3d_device; + ID2D1Factory1 *factory; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + float dpi_x, dpi_y; + HWND window; + HRESULT hr; + + static const struct + { + float dpi_x, dpi_y; + HRESULT hr; + } + create_dpi_tests[] = + { + { 0.0f, 0.0f, S_OK}, + {192.0f, 0.0f, E_INVALIDARG}, + { 0.0f, 192.0f, E_INVALIDARG}, + {192.0f, -10.0f, E_INVALIDARG}, + {-10.0f, 192.0f, E_INVALIDARG}, + {-10.0f, -10.0f, E_INVALIDARG}, + { 48.0f, 96.0f, S_OK}, + { 96.0f, 48.0f, S_OK}, + }; + static const float init_dpi_x = 60.0f, init_dpi_y = 288.0f; + static const float dc_dpi_x = 120.0f, dc_dpi_y = 144.0f; + unsigned int i; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + window = create_window(); + swapchain = create_swapchain(d3d_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + device_context = create_device_context(factory, d3d_device); + ok(!!device_context, "Failed to create device context.\n"); + + ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); + ok(dpi_x == 96.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 96.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + /* DXGI surface */ + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) + { + ID2D1DeviceContext_SetDpi(device_context, init_dpi_x, init_dpi_y); + + bitmap_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = create_dpi_tests[i].dpi_x; + bitmap_desc.dpiY = create_dpi_tests[i].dpi_y; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, &bitmap_desc, &bitmap); + /* Native accepts negative DPI values for DXGI surface bitmap. */ + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + ID2D1DeviceContext_SetDpi(device_context, dc_dpi_x, dc_dpi_y); + + ID2D1Bitmap1_GetDpi(bitmap, &dpi_x, &dpi_y); + todo_wine_if(bitmap_desc.dpiX == 0.0f) + ok(dpi_x == bitmap_desc.dpiX, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", + i, dpi_x, bitmap_desc.dpiX); + todo_wine_if(bitmap_desc.dpiY == 0.0f) + ok(dpi_y == bitmap_desc.dpiY, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", + i, dpi_y, bitmap_desc.dpiY); + + ID2D1DeviceContext_BeginDraw(device_context); + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap); + hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Device context DPI values aren't updated by SetTarget. */ + ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); + todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + + ID2D1Bitmap1_Release(bitmap); + } + + /* WIC bitmap */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) + { + IWICBitmapSource *wic_bitmap_src; + IWICBitmap *wic_bitmap; + + ID2D1DeviceContext_SetDpi(device_context, init_dpi_x, init_dpi_y); + + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IWICBitmap_QueryInterface(wic_bitmap, &IID_IWICBitmapSource, (void **)&wic_bitmap_src); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + IWICBitmap_Release(wic_bitmap); + + bitmap_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = create_dpi_tests[i].dpi_x; + bitmap_desc.dpiY = create_dpi_tests[i].dpi_y; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmapFromWicBitmap(device_context, wic_bitmap_src, &bitmap_desc, &bitmap); + todo_wine_if(FAILED(create_dpi_tests[i].hr)) + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); + IWICBitmapSource_Release(wic_bitmap_src); + + if (FAILED(hr)) + continue; + + ID2D1DeviceContext_SetDpi(device_context, dc_dpi_x, dc_dpi_y); + + ID2D1Bitmap1_GetDpi(bitmap, &dpi_x, &dpi_y); + if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) + { + /* Bitmap DPI values are inherited at creation time. */ + todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", + i, dpi_x, init_dpi_x); + todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", + i, dpi_y, init_dpi_y); + } + else + { + ok(dpi_x == bitmap_desc.dpiX, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", + i, dpi_x, bitmap_desc.dpiX); + ok(dpi_y == bitmap_desc.dpiY, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", + i, dpi_y, bitmap_desc.dpiY); + } + + ID2D1DeviceContext_BeginDraw(device_context); + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap); + hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Device context DPI values aren't updated by SetTarget. */ + ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); + todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + + ID2D1Bitmap1_Release(bitmap); + } + IWICImagingFactory_Release(wic_factory); + CoUninitialize(); + + /* D2D bitmap */ + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) + { + const D2D1_SIZE_U size = {16, 16}; + + ID2D1DeviceContext_SetDpi(device_context, init_dpi_x, init_dpi_y); + + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = create_dpi_tests[i].dpi_x; + bitmap_desc.dpiY = create_dpi_tests[i].dpi_y; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap); + todo_wine_if(FAILED(create_dpi_tests[i].hr)) + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); + + if (FAILED(hr)) + continue; + + ID2D1DeviceContext_SetDpi(device_context, dc_dpi_x, dc_dpi_y); + + ID2D1Bitmap1_GetDpi(bitmap, &dpi_x, &dpi_y); + if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) + { + /* Bitmap DPI values are inherited at creation time. */ + todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", + i, dpi_x, init_dpi_x); + todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", + i, dpi_y, init_dpi_y); + } + else + { + ok(dpi_x == bitmap_desc.dpiX, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", + i, dpi_x, bitmap_desc.dpiX); + ok(dpi_y == bitmap_desc.dpiY, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", + i, dpi_y, bitmap_desc.dpiY); + } + + ID2D1DeviceContext_BeginDraw(device_context); + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap); + hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Device context DPI values aren't updated by SetTarget. */ + ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); + todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + + ID2D1Bitmap1_Release(bitmap); + } + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); + todo_wine ok(dpi_x == dc_dpi_x, "Got unexpected dpi_x %.8e, expected %.8e.\n", dpi_x, dc_dpi_x); + todo_wine ok(dpi_y == dc_dpi_y, "Got unexpected dpi_y %.8e, expected %.8e.\n", dpi_y, dc_dpi_y); + + ID2D1DeviceContext_Release(device_context); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); + DestroyWindow(window); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -8093,6 +8324,7 @@ START_TEST(d2d1) queue_test(test_skew_matrix); queue_test(test_command_list); queue_test(test_max_bitmap_size); + queue_test(test_dpi); run_queued_tests(); } -- 2.11.0

1 0

[PATCH 1/2] rpcrt4: Don't nest critical sections to prevent a deadlock (Coverity).
by Sven Baars 24 Oct '19

24 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/rpcrt4/rpc_server.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 12260b7298..b5110c879c 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1558,12 +1558,16 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) WaitForSingleObject( event, INFINITE ); TRACE( "done waiting\n" ); - EnterCriticalSection(&listen_cs); /* wait for server threads to finish */ while(1) { + EnterCriticalSection(&listen_cs); if (listen_count) + { + LeaveCriticalSection(&listen_cs); break; + } + LeaveCriticalSection(&listen_cs); wait_thread = NULL; EnterCriticalSection(&server_cs); @@ -1577,10 +1581,9 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) break; TRACE("waiting for thread %u\n", GetThreadId(wait_thread)); - LeaveCriticalSection(&listen_cs); WaitForSingleObject(wait_thread, INFINITE); - EnterCriticalSection(&listen_cs); } + EnterCriticalSection(&listen_cs); if (listen_done_event == event) { listen_done_event = NULL; -- 2.17.1

2 5