- wine-devel - winehq.org

[PATCH] advapi32: Add ERR for crypto provider acquire failure.
by Paul Gofman 19 Jun '19

19 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/advapi32/crypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 96b963d87a..812561706b 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -546,6 +546,9 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, } /* FALLTHROUGH TO ERROR IF FALSE - CSP internal error! */ error: + ERR("Failed to create provider, phProv %p, pszContainer %s, pszProvider %s, dwProvType %u, dwFlags %#x.\n", + phProv, debugstr_w(pszContainer), debugstr_w(pszProvider), dwProvType, dwFlags); + if (pProv) { pProv->dwMagic = 0; -- 2.21.0

1 0

[PATCH] ntdll: Avoid repeated FIXME messages in NtQueryInformationThread
by qaisjp＠gmail.com 19 Jun '19

19 Jun '19

From: Qais Patankar <qaisjp(a)gmail.com> This complements commit 01c2af446a325bcb5535ee1665a4abc7fa99c2fd which was intended to make the messages from #36821 less noisy. The messages now made less noisy are of this pattern: 003f:fixme:thread:NtQueryInformationThread info class 22 not supported yet Links: - https://source.winehq.org/git/wine.git/commitdiff/01c2af446a325bcb5535ee166… - https://bugs.winehq.org/show_bug.cgi?id=36821 --- dlls/ntdll/thread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f837062..8929033 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1073,7 +1073,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: default: - FIXME( "info class %d not supported yet\n", class ); + static int once; + if (!once++) FIXME( "info class %d not supported yet\n", class ); return STATUS_NOT_IMPLEMENTED; } } -- 2.21.0

2 1

[PATCH 1/5] wineqtdecoder/qtsplitter: Share source pin and filter reference counts.
by Zebediah Figura 19 Jun '19

19 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Not compile-tested. dlls/wineqtdecoder/qtsplitter.c | 60 +++++++++++++-------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8a88729239c..8298406c2ed 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -779,23 +779,22 @@ static const IBaseFilterVtbl QT_Vtbl = { BaseFilterImpl_QueryVendorInfo }; -static HRESULT break_source_connection(BaseOutputPin *pin) +static void free_source_pin(QTOutPin *pin) { - HRESULT hr; - - EnterCriticalSection(pin->pin.pCritSec); - if (!pin->pin.pConnectedTo || !pin->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + EnterCriticalSection(pin->pin.pin.pCritSec); + if (pin->pin.pin.pConnectedTo) { - hr = IMemAllocator_Decommit(pin->pAllocator); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(pin->pin.pConnectedTo); - IPin_Disconnect(&pin->pin.IPin_iface); + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(&pin->pin.pin.IPin_iface); } - LeaveCriticalSection(pin->pin.pCritSec); + LeaveCriticalSection(pin->pin.pin.pCritSec); - return hr; + DeleteMediaType(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } /* @@ -803,23 +802,16 @@ static HRESULT break_source_connection(BaseOutputPin *pin) */ static HRESULT QT_RemoveOutputPins(QTSplitter *This) { - HRESULT hr; - TRACE("(%p)\n", This); - if (This->pVideo_Pin) { OutputQueue_Destroy(This->pVideo_Pin->queue); - hr = break_source_connection(&This->pVideo_Pin->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->pVideo_Pin->pin.pin.IPin_iface); + free_source_pin(This->pVideo_Pin); This->pVideo_Pin = NULL; } if (This->pAudio_Pin) { OutputQueue_Destroy(This->pAudio_Pin->queue); - hr = break_source_connection(&This->pAudio_Pin->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->pAudio_Pin->pin.pin.IPin_iface); + free_source_pin(This->pAudio_Pin); This->pAudio_Pin = NULL; } @@ -1340,22 +1332,16 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p return E_NOINTERFACE; } -static ULONG WINAPI QTOutPin_Release(IPin *iface) +static ULONG WINAPI QTOutPin_AddRef(IPin *iface) { - QTOutPin *This = impl_QTOutPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + QTOutPin *pin = impl_QTOutPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - DeleteMediaType(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI QTOutPin_Release(IPin *iface) +{ + QTOutPin *pin = impl_QTOutPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI QTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) @@ -1406,7 +1392,7 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi static const IPinVtbl QT_OutputPin_Vtbl = { QTOutPin_QueryInterface, - BasePinImpl_AddRef, + QTOutPin_AddRef, QTOutPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, -- 2.21.0

1 4

[PATCH 5/5] wined3d: Use texture2d_load_texture() in texture1d_load_location().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 154 +------------------------------ dlls/wined3d/texture.c | 200 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 11 ++- 3 files changed, 172 insertions(+), 193 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 33b60d2bc0b..a28a4277ab4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -140,7 +140,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ -static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, +void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, @@ -285,7 +285,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont context_restore(context, restore_texture, restore_idx); } -static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, +BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, const struct wined3d_resource *src_resource, DWORD src_location, const struct wined3d_resource *dst_resource, DWORD dst_location) { @@ -1470,156 +1470,6 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, return TRUE; } -BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, BOOL srgb) -{ - unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_color_key_conversion *conversion; - struct wined3d_texture_sub_resource *sub_resource; - const struct wined3d_format *format; - struct wined3d_bo_address data; - BYTE *src_mem, *dst_mem = NULL; - struct wined3d_box src_box; - BOOL depth; - - depth = texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL; - sub_resource = &texture->sub_resources[sub_resource_idx]; - - if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO - && wined3d_resource_is_offscreen(&texture->resource) - && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) - { - texture2d_load_fb_texture(texture_gl, sub_resource_idx, srgb, context); - - return TRUE; - } - - level = sub_resource_idx % texture->level_count; - wined3d_texture_get_level_box(texture, level, &src_box); - - if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) - && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, - &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, - &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) - { - RECT src_rect; - - SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); - if (srgb) - texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); - else - texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); - - return TRUE; - } - - if (!depth && sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB))) - { - DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? - WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; - DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - RECT src_rect; - - SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); - if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, - &texture->resource, src_location, &texture->resource, dst_location)) - texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, - src_location, &src_rect, texture, sub_resource_idx, dst_location, &src_rect); - - return TRUE; - } - - /* Upload from system memory */ - - if (srgb) - { - if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | texture->resource.map_binding)) - == WINED3D_LOCATION_TEXTURE_RGB) - { - FIXME_(d3d_perf)("Downloading RGB texture %p, %u to reload it as sRGB.\n", texture, sub_resource_idx); - wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); - } - } - else - { - if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | texture->resource.map_binding)) - == WINED3D_LOCATION_TEXTURE_SRGB) - { - FIXME_(d3d_perf)("Downloading sRGB texture %p, %u to reload it as RGB.\n", texture, sub_resource_idx); - wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); - } - } - - if (!(sub_resource->locations & surface_simple_locations)) - { - WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); - /* Lets hope we get it from somewhere... */ - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); - } - - wined3d_texture_gl_prepare_texture(texture_gl, context_gl, srgb); - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); - wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); - - format = texture->resource.format; - if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - format = wined3d_get_format(device->adapter, conversion->dst_format, texture->resource.bind_flags); - - /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is - * getting called. */ - if (conversion && sub_resource->buffer_object) - { - TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx); - - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); - wined3d_texture_set_map_binding(texture, WINED3D_LOCATION_SYSMEM); - } - - wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); - if (conversion) - { - width = src_box.right - src_box.left; - height = src_box.bottom - src_box.top; - wined3d_format_calculate_pitch(format, device->surface_alignment, - width, height, &dst_row_pitch, &dst_slice_pitch); - - src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (!(dst_mem = heap_alloc(dst_slice_pitch))) - { - ERR("Out of memory (%u).\n", dst_slice_pitch); - context_release(context); - return FALSE; - } - conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, - width, height, &texture->async.gl_color_key); - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); - - data.buffer_object = 0; - data.addr = dst_mem; - } - - wined3d_texture_upload_data(texture, sub_resource_idx, context, format, &src_box, - wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); - - heap_free(dst_mem); - - return TRUE; -} - /* Context activation is done by the caller. */ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2971e454629..52dbe516abd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -30,6 +30,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD 50 +static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM + | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER; + struct wined3d_texture_idx { struct wined3d_texture *texture; @@ -384,8 +387,6 @@ static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - static const DWORD sysmem_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY - | WINED3D_LOCATION_BUFFER; DWORD current = texture->sub_resources[sub_resource_idx].locations; BOOL ret; @@ -426,7 +427,7 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return wined3d_texture_load_location(texture, sub_resource_idx, context, location); } - if ((location & sysmem_locations) && (current & sysmem_locations)) + if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); else ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); @@ -2480,10 +2481,162 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl return FALSE; } +static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) +{ + unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + struct wined3d_device *device = texture_gl->t.resource.device; + const struct wined3d_color_key_conversion *conversion; + struct wined3d_texture_sub_resource *sub_resource; + const struct wined3d_format *format; + struct wined3d_bo_address data; + BYTE *src_mem, *dst_mem = NULL; + struct wined3d_box src_box; + BOOL depth; + + depth = texture_gl->t.resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL; + sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; + + if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO + && wined3d_resource_is_offscreen(&texture_gl->t.resource) + && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) + { + texture2d_load_fb_texture(texture_gl, sub_resource_idx, srgb, &context_gl->c); + + return TRUE; + } + + level = sub_resource_idx % texture_gl->t.level_count; + wined3d_texture_get_level_box(&texture_gl->t, level, &src_box); + + if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) + && (texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture_gl->t.resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture_gl->t.resource, WINED3D_LOCATION_TEXTURE_SRGB)) + { + RECT src_rect; + + SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); + if (srgb) + texture2d_blt_fbo(device, &context_gl->c, WINED3D_TEXF_POINT, + &texture_gl->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, + &texture_gl->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); + else + texture2d_blt_fbo(device, &context_gl->c, WINED3D_TEXF_POINT, + &texture_gl->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, + &texture_gl->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); + + return TRUE; + } + + if (!depth && sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) + && (!srgb || (texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB))) + { + DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? + WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; + DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; + RECT src_rect; + + SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture_gl->t.resource, src_location, &texture_gl->t.resource, dst_location)) + texture2d_blt_fbo(device, &context_gl->c, WINED3D_TEXF_POINT, &texture_gl->t, sub_resource_idx, + src_location, &src_rect, &texture_gl->t, sub_resource_idx, dst_location, &src_rect); + + return TRUE; + } + + /* Upload from system memory */ + + if (srgb) + { + if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | texture_gl->t.resource.map_binding)) + == WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME_(d3d_perf)("Downloading RGB texture %p, %u to reload it as sRGB.\n", texture_gl, sub_resource_idx); + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, + &context_gl->c, texture_gl->t.resource.map_binding); + } + } + else + { + if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | texture_gl->t.resource.map_binding)) + == WINED3D_LOCATION_TEXTURE_SRGB) + { + FIXME_(d3d_perf)("Downloading sRGB texture %p, %u to reload it as RGB.\n", texture_gl, sub_resource_idx); + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, + &context_gl->c, texture_gl->t.resource.map_binding); + } + } + + if (!(sub_resource->locations & wined3d_texture_sysmem_locations)) + { + WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); + /* Lets hope we get it from somewhere... */ + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_SYSMEM); + } + + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); + wined3d_texture_get_pitch(&texture_gl->t, level, &src_row_pitch, &src_slice_pitch); + + format = texture_gl->t.resource.format; + if ((conversion = wined3d_format_get_color_key_conversion(&texture_gl->t, TRUE))) + format = wined3d_get_format(device->adapter, conversion->dst_format, texture_gl->t.resource.bind_flags); + + /* Don't use PBOs for converted surfaces. During PBO conversion we look at + * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is + * getting called. */ + if (conversion && sub_resource->buffer_object) + { + TRACE("Removing the pbo attached to texture %p, %u.\n", texture_gl, sub_resource_idx); + + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_SYSMEM); + wined3d_texture_set_map_binding(&texture_gl->t, WINED3D_LOCATION_SYSMEM); + } + + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, sub_resource->locations); + if (conversion) + { + width = src_box.right - src_box.left; + height = src_box.bottom - src_box.top; + wined3d_format_calculate_pitch(format, device->surface_alignment, + width, height, &dst_row_pitch, &dst_slice_pitch); + + src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, + src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + if (!(dst_mem = heap_alloc(dst_slice_pitch))) + { + ERR("Out of memory (%u).\n", dst_slice_pitch); + return FALSE; + } + conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, + width, height, &texture_gl->t.async.gl_color_key); + src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); + + data.buffer_object = 0; + data.addr = dst_mem; + } + + wined3d_texture_upload_data(&texture_gl->t, sub_resource_idx, &context_gl->c, format, &src_box, + wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); + + heap_free(dst_mem); + + return TRUE; +} + /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); @@ -2492,8 +2645,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - return wined3d_texture_gl_load_sysmem(wined3d_texture_gl(texture), - sub_resource_idx, wined3d_context_gl(context), location); + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); case WINED3D_LOCATION_DRAWABLE: return texture2d_load_drawable(texture, sub_resource_idx, context); @@ -2504,8 +2656,8 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - return texture2d_load_texture(texture, sub_resource_idx, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); + return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); default: ERR("Don't know how to handle location %#x.\n", location); @@ -2895,7 +3047,6 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int row_pitch, slice_pitch; TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); @@ -2907,35 +3058,8 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in { case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) - { - struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; - struct wined3d_box src_box; - - data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) - { - struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; - struct wined3d_box src_box; - - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, - &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); - } - else - { - FIXME("Implement texture loading from %s.\n", wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: @@ -2946,8 +3070,6 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in wined3d_debug_location(sub_resource->locations)); return FALSE; } - - return TRUE; } static const struct wined3d_texture_ops texture1d_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aebaa9ed2f2..ea18b0794cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2247,6 +2247,10 @@ struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **nex void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) DECLSPEC_HIDDEN; + BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; @@ -3537,6 +3541,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, + enum wined3d_texture_filter_type filter, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, + struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, + const RECT *dst_rect) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3545,8 +3554,6 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned i BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; -BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_array().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 52f1524ca8c..c88e2b391f4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5303,26 +5303,27 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); } -static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) +static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glDisableVertexAttribArray(i)); checkGLcall("glDisableVertexAttribArray"); if (gl_info->supported[ARB_INSTANCED_ARRAYS]) GL_EXTCALL(glVertexAttribDivisor(i, 0)); - context->numbered_array_mask &= ~(1u << i); + context_gl->c.numbered_array_mask &= ~(1u << i); } static void context_unload_numbered_arrays(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int i; while (context->numbered_array_mask) { i = wined3d_bit_scan(&context->numbered_array_mask); - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); } } @@ -5348,7 +5349,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (!(stream_info->use_map & (1u << i))) { if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) { if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) @@ -5385,7 +5386,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c /* Unload instanced arrays, they will be loaded using immediate * mode instead. */ if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); context_gl->default_attrib_value_set &= ~(1u << i); continue; } @@ -5435,7 +5436,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); switch (format_gl->f.id) { -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b1dfa0dc260..52f1524ca8c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5092,7 +5092,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context checkGLcall("loadTexCoords"); } -/* This should match any arrays loaded in context_load_vertex_data(). */ +/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; @@ -5108,20 +5108,19 @@ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *con context_gl->c.namedArraysLoaded = FALSE; } -static void context_load_vertex_data(struct wined3d_context *context, +static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; GLuint current_bo; - TRACE("context %p, si %p, state %p.\n", context, si, state); + TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context->instance_count = 0; + context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5556,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context TRACE("Loading named arrays.\n"); context_unload_numbered_arrays(&context_gl->c); - context_load_vertex_data(&context_gl->c, &context_gl->c.stream_info, state); + wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); context_gl->c.namedArraysLoaded = TRUE; } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_unload_vertex_data().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a024e2844a9..b1dfa0dc260 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5093,12 +5093,11 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context } /* This should match any arrays loaded in context_load_vertex_data(). */ -static void context_unload_vertex_data(struct wined3d_context *context) +static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - if (!context->namedArraysLoaded) + if (!context_gl->c.namedArraysLoaded) return; gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); @@ -5106,7 +5105,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); wined3d_context_gl_unload_tex_coords(context_gl); - context->namedArraysLoaded = FALSE; + context_gl->c.namedArraysLoaded = FALSE; } static void context_load_vertex_data(struct wined3d_context *context, @@ -5547,7 +5546,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context if (context_gl->c.use_immediate_mode_draw) return; - context_unload_vertex_data(&context_gl->c); + wined3d_context_gl_unload_vertex_data(context_gl); if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); @@ -5635,7 +5634,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - context_unload_vertex_data(context); + wined3d_context_gl_unload_vertex_data(context_gl); context_unload_numbered_arrays(context); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to draw_indirect().
by Henri Verbeet 18 Jun '19

18 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a7aafc9625..a024e2844a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4709,10 +4709,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, checkGLcall("draw immediate mode"); } -static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, +static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_buffer *buffer = parameters->buffer; const void *offset; @@ -4977,7 +4977,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - draw_indirect(context, state, &parameters->u.indirect, idx_size); + wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); } -- 2.11.0

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 22:54, Rosanne DiMesio wrote: > On Tue, 18 Jun 2019 21:21:01 +0200 > Tim Schumacher <timschumi(a)gmx.de> wrote: > >> >> The main point is that even on Windows (well, at least on Vista or newer) you'd >> need a NoCD patch to run the game, else I wouldn't have asked this question in >> the first place. >> > I understand that. The issue for the AppDB is that NoCD patches are illegal in many jurisdictions. > >> >> I wasn't planning to do any of those things. I was just planning to say something like >> "Game doesn't start if it has the StarForce copy protection", which would imply that the >> Steam version works (and any other version if they manage to remove the protection _somehow_). >> > I'd prefer you not do that. Test reports are submitted for specific versions, so for the Steam version, you shouldn't have to mention StarForce at all. For the CD version, assuming there was never a legal version without copy protection (if there was, it should be a separate version anyway), then your test report should be based on what you actually tested. I guess the question for you is whether you want to publicly admit to having tested something that may be illegal where you live. > As already mentioned in the E-Mail to Robert, I have come to the conclusion that I should probably keep everything as-is, except for appending "CD/DVD" to the releases that shipped on CD (to avoid future confusion between Steam v1.1 and the v1.1 from CD). I'm also going to keep their ratings on "Garbage" due to the copy protection. Thank you both for your input on this issue. Tim

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 22:11, Bob Wya wrote: > On Tue, 18 Jun 2019 at 20:21, Tim Schumacher <timschumi(a)gmx.de> wrote: > >> Alright then. I was just confused because they seem to be exactly the same version >> (except for the copy protection of course), down to the version number. >> Based on the responses I have been getting, I'm going to keep the versions >> and ratings as-is, renaming the "1.x.0.0" versions to "1.x.0.0 CD/DVD" >> to avoid future confusion. >> >> Tim >> >> > > Now you're truly making work, where none exists. > > WineHQ AppDB applications often require wildcard versions of the form 1.x > - when an application has frequent major/minor version updates. > > If an application has 2 versions. There is absolutely no reason to merge these. > What purpose does this serve? > > Your time would be better served knocking up some simple 'How to' guides, > that are specific to the DVD/CD and Steam versions. > > All the best, > Robert > I specifically said "version_s_" and "rename", since I don't plan to merge anything. I could have said the following as well, which would have been longer and harder to understand: I'm going to rename "v1.0.0.0" and "v1.1.0.0" to "v1.0.0.0 CD/DVD" and "v1.1.0.0 CD/DVD" respectively to avoid further confusion. I have also come to the conclusion that it's the best solution if I don't do anything except for appending "CD/DVD" to the versions that shipped on CD (to avoid future confusion) and keeping those CD versions on "Garbage" due to the copy protection. Tim

1 0

WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

I am writing here because I have a question concerning AppDB reports and the usage of NoCD-Patches for games. The background to this is that a game called GT Legends relies on a fragile copy protection driver called "StarForce", which hasn't worked properly on everything later than Windows XP (wine doesn't support it either, but the game is in an unplayable state right now anyways, apart from the copy protection issue). Due to this, most of the people that only have the CD version rely on a NoCD-Patch to remove that protection driver. Now the question is, if I update an app's page in the DB ([1]), is it ok if I list something like the following (assuming the game works properly at some point, excluding the copy protection): What works: - Installation - Starting the game (except if the copy protection is active) - ... - ... On another topic, the game can be obtained on two ways, a Steam version and a version that is available on CD/DVD. Now the CD version is at game version v1.0.0.0 by default and there is a official patch to v1.1.0.0, which is the same version number that the Steam version uses. However, apart from the missing copy protection driver in the Steam version, it isn't really known if and what changed between v1.1.0.0 CD and v1.1.0.0 Steam. Would it still be fine to merge "Steam" and "v1.1.0.0" in the AppDB (which is why I chose the wording "if the copy protection is active"), which are currently listed seperately? This would obviously only work if it is OK to mention that the copy protection mustn't be enabled for the game to start (i.e. what I suggested in the first part of the E-Mail), else v1.1.0.0 would have to be listed seperately as "Garbage". Thanks for taking the time reading through this and thanks in advance for your input on this. Tim [1] https://appdb.winehq.org/objectManager.php?sClass=application&iId=3906

2 2

[PATCH] mscoree: Update Wine Mono to 4.9.0.
by Vincent Povirk 18 Jun '19

18 Jun '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index ed9ae3a4d2e..08d9f85fac3 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.3" -#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" +#define MONO_VERSION "4.9.0" +#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8311db7684e..7420b4bea3f 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.3" +#define WINE_MONO_VERSION "4.9.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

Re: WineHQ AppDB and NoCD-Patches
by Tim Schumacher 18 Jun '19

18 Jun '19

On 18.06.19 19:11, Bob Wya wrote: > On Tue, 18 Jun 2019 at 15:17, Tim Schumacher <timschumi(a)gmx.de> wrote: > ... >> >> On another topic, the game can be obtained on two ways, a Steam version >> and a version that is available on CD/DVD. Now the CD version is at >> game version v1.0.0.0 by default and there is a official patch to v1.1.0.0, >> which is the same version number that the Steam version uses. >> >> However, apart from the missing copy protection driver in the >> Steam version, it isn't really known if and what changed between >> v1.1.0.0 CD and v1.1.0.0 Steam. Would it still be fine to merge >> "Steam" and "v1.1.0.0" in the AppDB (which is why I chose the wording >> "if the copy protection is active"), which are currently listed >> seperately? This would obviously only work if it is OK to mention >> that the copy protection mustn't be enabled for the game to start >> (i.e. what I suggested in the first part of the E-Mail), >> else v1.1.0.0 would have to be listed seperately as "Garbage". >> >> Thanks for taking the time reading through this and thanks in >> advance for your input on this. >> >> Tim >> >> [1] https://appdb.winehq.org/objectManager.php?sClass=application&iId=3906 >> >> > > This makes no sense what-so-ever, and would be inconsistent with the majority > of games listed on the AppDB. This is exactly why I asked, since I am fairly new to all of this compared to most of the people here. > > Games, distributed on different media, should always be kept as > separate versions. > Especially since you've highlighted the fact that the Steam version of > GT Legends > uses Steam's builtin DRM vs. copy protection present in the CD/DVD version > 1.1.0.0 release. > > The current versioning split for GT Legends looks spot-on to me. I was previously wondering if I should split it further apart or if I should merge both versions (since "v1.1.0.0" is kind of ambiguous). Based on your input, I will probably rename the current "1.1.0.0" version to "1.1.0.0 CD/DVD". > > The use a NoCD patch, can be mentioned in the "Extra Comments" section > and the games playability, with the patch, > The overall rating still has to be based on vanilla Wine/Wine Staging. > This is, after all, what is going to govern the end-user's experience... The question was never about modifying wine, but rather about modifying the game (which needs to be done on Windows as well, since the copy protection is faulty there too). > > All the best, > Robert > Thanks again for your input Tim

1 0

On helping new developers
by Zebediah Figura 18 Jun '19

18 Jun '19

Hello all, It's a well-known fact that our wiki sucks and is out of date. I've been making at least some effort to try to improve that. Not much, but... In particular I've just done some lengthy expansion to the "debugging hints" page: https://wiki.winehq.org/Debugging_Hints As a new Wine developer I remember being frustrated by how difficult it is to debug things. To a certain degree I still am, sometimes. While being good at debugging applications in Wine really is a matter of experience more than anything else, I do think there are some things that can be taught, at least as a starting point. To that end I've tried to sort of document my process of debugging, and as many specific tips as I can think of, at that page. This mail, then, is a call to help that. There are plenty of people around who are far more experienced than me, so I'd really appreciate any further tips that they can add to the page. Similarly, any blatant misinformation that I've put in there would be best corrected immediately. ἔρρωσθε, Zeb

7 6

[PATCH v3 1/4] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura 18 Jun '19

18 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c66d46..c3d3b770b5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.20.1

4 9

[PATCH vkd3d 6/7] vkd3d: Implement D3D12_RESOURCE_STATE_PREDICATION resource barriers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5a5b6a220437..6423640ed4ae 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1861,7 +1861,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); @@ -1900,7 +1900,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, - resource, vk_queue_flags, access_mask, stage_flags, image_layout); + resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); return true; } } @@ -2035,6 +2035,11 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, { *access_mask |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; *stage_flags |= VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT; + if (vk_info->EXT_conditional_rendering) + { + *access_mask |= VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT; + *stage_flags |= VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT; + } state &= ~D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT; } @@ -2057,6 +2062,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 struct d3d12_resource *resource) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; const struct vkd3d_format *format; VkImageMemoryBarrier barrier; @@ -2079,7 +2085,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3701,11 +3707,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; unsigned int i; TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; d3d12_command_list_end_current_render_pass(list); @@ -3749,13 +3757,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3775,7 +3783,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; @@ -4645,6 +4653,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; VkBufferMemoryBarrier buffer_barrier; @@ -4657,6 +4666,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; resource_impl = unsafe_impl_from_ID3D12Resource(resource); @@ -4693,7 +4703,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID buffer_barrier.size = cpu_descriptor->uav.buffer.size; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &buffer_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, @@ -4726,7 +4736,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID image_barrier.subresourceRange = range; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &image_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, -- 2.21.0

2 1

[PATCH vkd3d 2/7] tests: Fix test failures in conditional rendering tests.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 9 ++++++++- tests/d3d12_crosstest.h | 27 +++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 79c30ec2465f..b75cd996a2ff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30553,6 +30553,13 @@ static void test_conditional_rendering(void) command_list = context.list; queue = context.queue; + if (is_intel_windows_device(context.device)) + { + skip("Predicated rendering is broken on Intel.\n"); + destroy_test_context(&context); + return; + } + conditions = create_default_buffer(context.device, sizeof(predicate_args), D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list); @@ -30587,7 +30594,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 4a490628e483..22844ab398e7 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -323,14 +323,15 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } -static inline bool is_amd_windows_device(ID3D12Device *device) +static inline bool get_adapter_desc(ID3D12Device *device, DXGI_ADAPTER_DESC *desc) { - DXGI_ADAPTER_DESC desc = {0}; IDXGIFactory4 *factory; IDXGIAdapter *adapter; HRESULT hr; LUID luid; + memset(desc, 0, sizeof(*desc)); + if (!vkd3d_test_platform_is_windows()) return false; @@ -342,14 +343,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); if (SUCCEEDED(hr)) { - hr = IDXGIAdapter_GetDesc(adapter, &desc); + hr = IDXGIAdapter_GetDesc(adapter, desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); } IDXGIFactory4_Release(factory); + return SUCCEEDED(hr); +} + +static inline bool is_amd_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; + + return get_adapter_desc(device, &desc) && desc.VendorId == 0x1002; +} + +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; - return desc.VendorId == 0x1002; + return get_adapter_desc(device, &desc) && desc.VendorId == 0x8086; } static inline bool is_mesa_device(ID3D12Device *device) @@ -566,6 +580,11 @@ static inline bool is_amd_windows_device(ID3D12Device *device) return false; } +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + return false; +} + static inline bool is_mesa_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; -- 2.21.0

2 1

[PATCH vkd3d 7/7] tests: Add test to confirm predicate must not be read before every rendering command.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> In Vulkan both behaviors are allowed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b75cd996a2ff..f8a4f94c5036 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30668,6 +30668,39 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* Direct3D latches the value of the predicate upon beginning predicated rendering. */ + buffer = create_default_buffer(context.device, sizeof(predicate_args), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + transition_resource_state(command_list, conditions, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_CopyResource(command_list, buffer, conditions); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, buffer, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + + transition_resource_state(command_list, buffer, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, 0, conditions, sizeof(uint64_t), sizeof(uint64_t)); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + transition_resource_state(command_list, + conditions, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(buffer); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); -- 2.21.0

2 1

[PATCH vkd3d 4/7] vkd3d: End conditional rendering before ending command buffer.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 133c23328201..5a5b6a220437 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2245,6 +2245,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; d3d12_command_list_end_current_render_pass(list); + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { -- 2.21.0

2 1

[PATCH vkd3d 5/7] vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d005fa8865aa..bcf523e47d75 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -523,10 +523,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT) { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + + if (device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } } if (heap_type == D3D12_HEAP_TYPE_UPLOAD) -- 2.21.0

2 1

[PATCH vkd3d 3/7] vkd3d: Begin and end conditional rendering outside render passes.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> The Vulkan spec says: "Conditional rendering must also either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances)." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4723e7969012..133c23328201 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4928,11 +4928,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo vk_procs = &list->device->vk_procs; + /* FIXME: Add support for conditional rendering in render passes. */ + d3d12_command_list_end_current_render_pass(list); + if (resource) { VkConditionalRenderingBeginInfoEXT cond_info; - if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + if (aligned_buffer_offset & (sizeof(uint64_t) - 1)) { WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); return; @@ -4944,7 +4947,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo return; } - FIXME("Predication doesn't support clear and copy commands, " + FIXME_ONCE("Predication doesn't support clear and copy commands, " "and predication values are treated as 32-bit values.\n"); cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; -- 2.21.0

2 1

[PATCH vkd3d 1/7] tests: Fix test_conditional_rendering().
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes crashes, Vulkan and Direct3D validation errors. * Fix state transitions. * Use a multisample texture with ResolveSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0c70d5f4a856..79c30ec2465f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30489,8 +30489,11 @@ static void test_conditional_rendering(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12Resource *texture, *texture_copy; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_HEAP_PROPERTIES heap_properties; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + D3D12_RESOURCE_DESC resource_desc; struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; @@ -30505,6 +30508,7 @@ static void test_conditional_rendering(void) static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float ms_color[] = {0.345f, 0.282f, 0.219f, 0.156f}; static const uint32_t init_value = 0xdeadbeef; static const D3D12_SUBRESOURCE_DATA copy_data[] = { @@ -30654,6 +30658,8 @@ static void test_conditional_rendering(void) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); @@ -30730,17 +30736,43 @@ static void test_conditional_rendering(void) check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); - /* ResolveSubresource(). */ + /* Multisample texture. */ + ID3D12Resource_Release(texture); + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + hr = ID3D12Device_CreateCommittedResource(context.device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS; + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + ID3D12Device_CreateRenderTargetView(context.device, texture, &rtv_desc, + get_cpu_rtv_handle(&context, context.rtv_heap, 0)); + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, ms_color, 0, NULL); + + /* ResolveSubresource(). */ transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, texture_copy, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_RESOLVE_DEST); transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); /* Skip. */ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); @@ -30768,7 +30800,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 2); reset_command_list(command_list, context.allocator); @@ -30777,7 +30809,7 @@ static void test_conditional_rendering(void) buffer = create_default_buffer(context.device, 512, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data(buffer, 0, sizeof(uint32_t), &init_value, queue, command_list); + upload_buffer_data(buffer, 0, sizeof(init_value), &init_value, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, buffer, 0, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); -- 2.21.0

2 1

[PATCH vkd3d 5/8] vkd3d: Use vkd3d_waiting_fence structure in more places.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 17 +++++++---------- libs/vkd3d/vkd3d_private.h | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b145413efdc3..fd7f32231280 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -247,6 +247,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value, struct vkd3d_queue *queue, uint64_t queue_sequence_number) { + struct vkd3d_waiting_fence *waiting_fence; int rc; TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value); @@ -266,10 +267,11 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, } worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence; - worker->enqueued_fences[worker->enqueued_fence_count].fence = fence; - worker->enqueued_fences[worker->enqueued_fence_count].value = value; - worker->enqueued_fences[worker->enqueued_fence_count].queue = queue; - worker->enqueued_fences[worker->enqueued_fence_count].queue_sequence_number = queue_sequence_number; + waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence; + waiting_fence->fence = fence; + waiting_fence->value = value; + waiting_fence->queue = queue; + waiting_fence->queue_sequence_number = queue_sequence_number; ++worker->enqueued_fence_count; InterlockedIncrement(&fence->pending_worker_operation_count); @@ -337,12 +339,7 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i]; worker->vk_fences[worker->fence_count] = current->vk_fence; - - worker->fences[worker->fence_count].fence = current->fence; - worker->fences[worker->fence_count].value = current->value; - worker->fences[worker->fence_count].queue = current->queue; - worker->fences[worker->fence_count].queue_sequence_number = current->queue_sequence_number; - + worker->fences[worker->fence_count] = current->waiting_fence; ++worker->fence_count; } assert(worker->fence_count == count); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e22549d5055d..f31c250fedfd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -151,6 +151,14 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +struct vkd3d_waiting_fence +{ + struct d3d12_fence *fence; + uint64_t value; + struct vkd3d_queue *queue; + uint64_t queue_sequence_number; +}; + struct vkd3d_fence_worker { union vkd3d_thread_handle thread; @@ -164,23 +172,14 @@ struct vkd3d_fence_worker struct vkd3d_enqueued_fence { VkFence vk_fence; - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; + struct vkd3d_waiting_fence waiting_fence; } *enqueued_fences; size_t enqueued_fences_size; size_t fence_count; VkFence *vk_fences; size_t vk_fences_size; - struct vkd3d_waiting_fence - { - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; - } *fences; + struct vkd3d_waiting_fence *fences; size_t fences_size; struct d3d12_device *device; -- 2.21.0

2 1

[PATCH vkd3d 8/8] include/vkd3d_utils: Declare all exported functions.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo.h | 1 - demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/demos/demo.h b/demos/demo.h index 2869ea7b5eba..b2b931728241 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -141,7 +141,6 @@ static inline HRESULT demo_create_root_signature(ID3D12Device *device, #ifdef _WIN32 #include "demo_win32.h" #else -#include <vkd3d_utils.h> #define INFINITE VKD3D_INFINITE #include "demo_xcb.h" #endif diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 40e25340b3f1..6fae7909769c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,6 +19,7 @@ #define VK_USE_PLATFORM_XCB_KHR #include <vkd3d.h> +#include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 8a5689a80c3d..4a5ee5dd6ae7 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H +#include <vkd3d.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -34,6 +36,18 @@ HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); void vkd3d_destroy_event(HANDLE event); +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device); +HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + +/* 1.2 */ +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, + SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.21.0

2 1

[PATCH vkd3d 7/8] tests: Add test for parsing version.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 + include/private/vkd3d_common.h | 14 ++++++++++ libs/vkd3d/device.c | 15 +---------- tests/vkd3d_common.c | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 tests/vkd3d_common.c diff --git a/Makefile.am b/Makefile.am index 299ec2603b46..fe3a363977c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,7 @@ vkd3d_demos_shaders = \ vkd3d_tests = \ tests/vkd3d_api \ + tests/vkd3d_common \ tests/vkd3d_shader_api vkd3d_cross_tests = \ diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 16c31e633ab1..c696f8858cd3 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,6 +22,8 @@ #include "config.h" #include "vkd3d_windows.h" +#include <ctype.h> + #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #endif @@ -137,4 +139,16 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # error "atomic_add_fetch() not implemented for this platform" #endif /* HAVE_SYNC_ADD_AND_FETCH */ +static inline void vkd3d_parse_version(const char *version, int *major, int *minor) +{ + *major = atoi(version); + + while (isdigit(*version)) + ++version; + if (*version == '.') + ++version; + + *minor = atoi(version); +} + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c93e6785ed01..9f8c0ac65916 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,8 +18,6 @@ #include "vkd3d_private.h" -#include <ctype.h> - #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -94,20 +92,9 @@ struct vk_struct static uint32_t vkd3d_get_vk_version(void) { - const char *ptr = PACKAGE_VERSION; int major, minor; - major = atoi(ptr); - - while (isdigit(*ptr)) - ++ptr; - if (*ptr == '.') - ++ptr; - - minor = atoi(ptr); - - TRACE("Version %d.%d.\n", major, minor); - + vkd3d_parse_version(PACKAGE_VERSION, &major, &minor); return VK_MAKE_VERSION(major, minor, 0); } diff --git a/tests/vkd3d_common.c b/tests/vkd3d_common.c new file mode 100644 index 000000000000..379c8b06e3c7 --- /dev/null +++ b/tests/vkd3d_common.c @@ -0,0 +1,49 @@ +/* + * Copyright 2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_common.h" +#include "vkd3d_test.h" + +static void check_version(const char *v, int expected_major, int expected_minor) +{ + int major, minor; + + vkd3d_parse_version(v, &major, &minor); + ok(major == expected_major && minor == expected_minor, + "Got %d.%d, expected %d.%d for %s.\n", + major, minor, expected_major, expected_minor, v); +} + +static void test_parse_version(void) +{ + check_version("", 0, 0); + check_version(".3", 0, 3); + check_version(".4.5", 0, 4); + + check_version("1", 1, 0); + check_version("2", 2, 0); + + check_version("1.0", 1, 0); + check_version("1.1", 1, 1); + check_version("2.3.0", 2, 3); +} + +START_TEST(vkd3d_common) +{ + run_test(test_parse_version); +} -- 2.21.0

2 1

[PATCH vkd3d 6/8] include: Document API versions.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 39 ++++++++++++++++++++++----------------- include/vkd3d_shader.h | 1 + include/vkd3d_utils.h | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index b78076e43927..e2d9ec81f2c4 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -36,12 +36,15 @@ extern "C" { enum vkd3d_structure_type { + /* 1.0 */ VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + /* 1.1 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, + /* 1.2 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, @@ -74,7 +77,7 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.1. */ struct vkd3d_optional_instance_extensions_info { enum vkd3d_structure_type type; @@ -84,7 +87,7 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.2. */ struct vkd3d_application_info { enum vkd3d_structure_type type; @@ -116,7 +119,7 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* Extends vkd3d_device_create_info. */ +/* Extends vkd3d_device_create_info. Available since 1.2. */ struct vkd3d_optional_device_extensions_info { enum vkd3d_structure_type type; @@ -167,18 +170,19 @@ ULONG vkd3d_resource_incref(ID3D12Resource *resource); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +/* 1.1 */ DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); + +/* 1.2 */ +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #endif /* VKD3D_NO_PROTOTYPES */ @@ -209,18 +213,19 @@ typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); +/* 1.1 */ typedef DXGI_FORMAT (*PFN_vkd3d_get_dxgi_format)(VkFormat format); -typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); + +/* 1.2 */ +typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #ifdef __cplusplus } diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e6cccd84cc67..fcf5db8efc03 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -29,6 +29,7 @@ extern "C" { enum vkd3d_shader_structure_type { + /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 6c926e4e1643..8a5689a80c3d 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -28,6 +28,7 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) +/* 1.0 */ HANDLE vkd3d_create_event(void); HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); -- 2.21.0

2 1

[PATCH v3 vkd3d 4/8] vkd3d: Try to guess application name.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: Free memory returned by realpath(). --- libs/vkd3d/device.c | 7 ++++++ libs/vkd3d/utils.c | 44 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 53 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1b651f144233..c93e6785ed01 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -466,6 +466,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; + char application_name[PATH_MAX]; uint32_t extension_count; const char **extensions; VkInstance vk_instance; @@ -529,6 +530,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = vkd3d_application_info->engine_version; } } + else if (vkd3d_get_program_name(application_name)) + { + application_info.pApplicationName = application_name; + } + + TRACE("Application: %s.\n", debugstr_a(application_info.pApplicationName)); if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 4483a8d456f7..245f297587ae 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -602,6 +602,50 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } +#ifdef _GNU_SOURCE + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + char *name, *p, *real_path = NULL; + + if ((name = strrchr(program_invocation_name, '/'))) + { + real_path = realpath("/proc/self/exe", NULL); + + /* Try to strip command line arguments. */ + if (real_path && (p = strrchr(real_path, '/')) + && !strncmp(real_path, program_invocation_name, strlen(real_path))) + { + name = p; + } + + ++name; + } + else if ((name = strrchr(program_invocation_name, '\\'))) + { + ++name; + } + else + { + name = program_invocation_name; + } + + strncpy(program_name, name, PATH_MAX); + program_name[PATH_MAX - 1] = '\0'; + free(real_path); + return true; +} + +#else + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + *program_name = '\0'; + return false; +} + +#endif /* _GNU_SOURCE */ + static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a9594a5e..e22549d5055d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1200,6 +1200,8 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; + static inline void vkd3d_set_thread_name(const char *name) { #if defined(HAVE_PTHREAD_SETNAME_NP_2) -- 2.21.0

2 1

[PATCH vkd3d 2/8] tests: Add test for SV_PrimitiveID in hull shader.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 81fb26ad7d60..2146e905e6f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27062,6 +27062,328 @@ done: destroy_test_context(&context); } +static void test_tessellation_primitive_id(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + D3D12_ROOT_PARAMETER root_parameters[1]; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12Resource *raw_buffer; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + +#if 0 + ByteAddressBuffer b; + + struct data + { + float4 position : POSITION; + float ref_buffer_data : REF_BUFFER_DATA; + }; + + struct ds_data + { + float4 position : POSITION; + float ref_buffer_data : REF_BUFFER_DATA; + uint primitive_id : PRIM_ID; + uint invocation_id : CP_ID; + }; + + struct ps_data + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + float buffer_data : BUFFER_DATA; + uint primitive_id : PATCH_PRIM_ID; + }; + + data vs_main(in data input) + { + return input; + } + + void patch_constant(uint prim_id : SV_PrimitiveID, out patch_constant_data output) + { + output.edges[0] = output.edges[1] = output.edges[2] = 4.0f; + output.inside = 4.0f; + output.buffer_data = b.Load(4 * prim_id); + output.primitive_id = prim_id; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + ds_data hs_main(const InputPatch<data, 3> input, + uint prim_id : SV_PrimitiveID, uint i : SV_OutputControlPointID) + { + ds_data output; + output.position = input[i].position; + output.ref_buffer_data = input[i].ref_buffer_data; + output.primitive_id = prim_id; + output.invocation_id = i; + return output; + } + + [domain("tri")] + void ds_main(patch_constant_data input, + float3 tess_coord : SV_DomainLocation, + const OutputPatch<ds_data, 3> patch, + out ps_data output) + { + uint i; + + output.position = tess_coord.x * patch[0].position + + tess_coord.y * patch[1].position + + tess_coord.z * patch[2].position; + + for (i = 0; i < 3; ++i) + { + if (patch[i].ref_buffer_data != input.buffer_data) + { + output.color = float4(1, patch[i].ref_buffer_data / 255.0f, input.buffer_data / 255.0f, 0); + return; + } + } + + for (i = 0; i < 3; ++i) + { + if (patch[i].primitive_id != input.primitive_id) + { + output.color = float4(1, 0, 1, 1); + return; + } + } + + if (patch[0].invocation_id != 0 || patch[1].invocation_id != 1 || patch[2].invocation_id != 2) + { + output.color = float4(1, 1, 0, 1); + return; + } + + output.color = float4(0, 1, 0, 1); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0x1cf34a89, 0x09f0ca02, 0x1d9d7e25, 0x4161cddd, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x00000088, 0x000000e4, 0x4e475349, 0x00000054, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, + 0x41544144, 0xababab00, 0x4e47534f, 0x00000054, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000041, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x00000e01, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, + 0xababab00, 0x58454853, 0x00000068, 0x00010050, 0x0000001a, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, + 0x00102012, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x23a919a7, 0xf5fdd1b4, 0x4f5a835f, 0xca389c71, 0x00000001, 0x00000464, 0x00000004, + 0x00000030, 0x0000008c, 0x00000124, 0x00000200, 0x4e475349, 0x00000054, 0x00000002, 0x00000008, + 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, + 0x5f524546, 0x41544144, 0xababab00, 0x4e47534f, 0x00000090, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000071, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000e01, 0x00000081, 0x00000000, 0x00000000, 0x00000001, 0x00000002, + 0x00000e01, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000d02, 0x49534f50, + 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d, 0x5f504300, + 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000e01, 0x000000a6, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000d02, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x000000b2, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000d02, 0x00000098, 0x00000002, 0x0000000d, + 0x00000003, 0x00000002, 0x00000e01, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003, 0x00000003, + 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f, 0x41500041, + 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673, 0x00726f74, + 0x58454853, 0x0000025c, 0x00030050, 0x00000097, 0x01000071, 0x01001893, 0x01001894, 0x01001095, + 0x01000896, 0x01001897, 0x0100086a, 0x030000a1, 0x00107000, 0x00000000, 0x01000072, 0x0200005f, + 0x00016000, 0x0200005f, 0x0000b000, 0x0400005f, 0x002010f2, 0x00000003, 0x00000000, 0x0400005f, + 0x00201012, 0x00000003, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102012, + 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x02000068, + 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x07000036, 0x001020f2, 0x00000000, + 0x00a01e46, 0x0010000a, 0x00000000, 0x00000000, 0x07000036, 0x00102012, 0x00000001, 0x00a0100a, + 0x0010000a, 0x00000000, 0x00000001, 0x04000036, 0x00102012, 0x00000002, 0x0000b001, 0x04000036, + 0x00102022, 0x00000002, 0x00016001, 0x0100003e, 0x01000073, 0x02000099, 0x00000003, 0x0200005f, + 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, 0x00102012, 0x00000001, + 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, 0x00000001, 0x0400005b, + 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x06000036, + 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x40800000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, 0x00004001, 0x40800000, + 0x0100003e, 0x01000073, 0x0200005f, 0x0000b000, 0x03000065, 0x00102022, 0x00000000, 0x02000068, + 0x00000001, 0x06000029, 0x00100012, 0x00000000, 0x0000b001, 0x00004001, 0x00000002, 0x890000a5, + 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00107006, 0x00000000, + 0x05000056, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x0200005f, + 0x0000b000, 0x03000065, 0x00102022, 0x00000001, 0x04000036, 0x00102022, 0x00000001, 0x0000b001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x4b659bb4, 0x3eb61f16, 0xaa8397b6, 0xd60e8c43, 0x00000001, 0x000005ec, 0x00000004, + 0x00000030, 0x000000c8, 0x000001a4, 0x000001f8, 0x4e475349, 0x00000090, 0x00000004, 0x00000008, + 0x00000068, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x00000081, 0x00000000, 0x00000000, 0x00000001, + 0x00000002, 0x00000101, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000202, + 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d, + 0x5f504300, 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000, + 0x0000000d, 0x00000003, 0x00000000, 0x00000001, 0x000000a6, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x00000202, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000001, + 0x000000b2, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000202, 0x00000098, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f, + 0x41500041, 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673, + 0x00726f74, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x000003ec, + 0x00040050, 0x000000fb, 0x01001893, 0x01001095, 0x0100086a, 0x0300005f, 0x0011b022, 0x00000000, + 0x0300005f, 0x0011b022, 0x00000001, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000003, + 0x00000000, 0x0400005f, 0x00219012, 0x00000003, 0x00000001, 0x0400005f, 0x00219012, 0x00000003, + 0x00000002, 0x0400005f, 0x00219022, 0x00000003, 0x00000002, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002, 0x07000038, 0x001000f2, + 0x00000000, 0x0001c556, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, + 0x0001c006, 0x00219e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x09000032, 0x001000f2, + 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x05000036, + 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, 0x00000001, + 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003, 0x0010001a, 0x00000001, 0x09000039, + 0x00100022, 0x00000001, 0x0011b01a, 0x00000000, 0x00a1900a, 0x0010000a, 0x00000001, 0x00000001, + 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x08000036, 0x00102092, 0x00000001, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, + 0x09000038, 0x00102022, 0x00000001, 0x00004001, 0x3b808081, 0x00a1900a, 0x0010000a, 0x00000001, + 0x00000001, 0x07000038, 0x00102042, 0x00000001, 0x0011b01a, 0x00000000, 0x00004001, 0x3b808081, + 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, + 0x00000001, 0x01000016, 0x05000036, 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030, + 0x07000050, 0x00100022, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003, + 0x0010001a, 0x00000001, 0x09000027, 0x00100022, 0x00000001, 0x0011b01a, 0x00000001, 0x00a1900a, + 0x0010000a, 0x00000001, 0x00000002, 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000, + 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001, + 0x0010000a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x08000027, 0x00100012, 0x00000001, + 0x00004001, 0x00000000, 0x0021901a, 0x00000000, 0x00000002, 0x08000027, 0x00100022, 0x00000001, + 0x00004001, 0x00000001, 0x0021901a, 0x00000001, 0x00000002, 0x0700003c, 0x00100012, 0x00000001, + 0x0010001a, 0x00000001, 0x0010000a, 0x00000001, 0x08000027, 0x00100022, 0x00000001, 0x00004001, + 0x00000002, 0x0021901a, 0x00000002, 0x00000002, 0x0700003c, 0x00100012, 0x00000001, 0x0010001a, + 0x00000001, 0x0010000a, 0x00000001, 0x0304001f, 0x0010000a, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x05000036, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, + 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"REF_BUFFER_DATA", 0, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + float ref_buffer_data; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, 1.0f}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 1.0f}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 1.0f}, + + {{-1.0f, 1.0f, 0.0f, 1.0f}, 2.0f}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 2.0f}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 2.0f}, + }; + static const uint32_t buffer_data[] = {1, 2}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_HULL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, &input_layout); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PS = ps; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + raw_buffer = create_upload_buffer(context.device, sizeof(buffer_data), buffer_data); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list, + 0, ID3D12Resource_GetGPUVirtualAddress(raw_buffer)); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb); + ID3D12Resource_Release(raw_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -30608,6 +30930,7 @@ START_TEST(d3d12) run_test(test_hull_shader_control_point_phase); run_test(test_hull_shader_fork_phase); run_test(test_line_tessellation); + run_test(test_tessellation_primitive_id); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.21.0

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Fix component decoration for shader IO variables.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> This fixes a regression introduced by commit 91820630cb49ef645ca6251f63ce2ff63e0c568d. We need to take into account the combined write mask returned from needs_private_io_variable(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 +++++ tests/d3d12.c | 65 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 25e3f8ea6f52..73d266195f5d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3944,6 +3944,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_count = VKD3D_VEC4_SIZE; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } storage_class = SpvStorageClassInput; @@ -4300,6 +4304,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } vkd3d_symbol_make_register(&reg_symbol, reg); diff --git a/tests/d3d12.c b/tests/d3d12.c index 2146e905e6f2..3dc55fe5a7fc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10039,6 +10039,62 @@ static void test_shader_input_output_components(void) 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps4 = {ps4_code, sizeof(ps4_code)}; +#if 0 + struct ps_data + { + float4 position : SV_Position; + float4 color : COLOR; + float3 color1 : COLOR1; + float color2 : COLOR2; + }; + + ps_data vs_main(float4 position : POSITION) + { + ps_data o; + o.position = position; + o.color = float4(0, 1, 0, 1); + o.color1 = (float3)0.5; + o.color2 = 0.25; + return o; + } + + float4 ps_main(ps_data i) : SV_Target + { + return float4(i.color.rgb, i.color2); + } +#endif + static const DWORD vs5_code[] = + { + 0x43425844, 0xc3e1b9fc, 0xb99e43ef, 0x9a2a6dfc, 0xad719e68, 0x00000001, 0x00000190, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x00000074, 0x00000002, + 0x00000000, 0x00000003, 0x00000002, 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, + 0xabab0052, 0x58454853, 0x000000a4, 0x00010050, 0x00000029, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, + 0x03000065, 0x00102072, 0x00000002, 0x03000065, 0x00102082, 0x00000002, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3e800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs5 = {vs5_code, sizeof(vs5_code)}; + static const DWORD ps5_code[] = + { + 0x43425844, 0x285bf397, 0xbc07e078, 0xc4e528e3, 0x74efea4d, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x000000b0, 0x000000e4, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000007, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000808, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, 0x0100086a, 0x03001062, 0x00101072, + 0x00000001, 0x03001062, 0x00101082, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102072, 0x00000000, 0x00101246, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x0010103a, + 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps5 = {ps5_code, sizeof(ps5_code)}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, @@ -10071,10 +10127,11 @@ static void test_shader_input_output_components(void) } tests[] = { - {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.0f}, {0xdeadbeef, 0, 2, 3}}, - {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.0f}, { 9, 5, 0, 1}}, - {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.0f}, { 9, 0, 0, 1}}, - {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.0f}, { 0, 1, 0, 0}}, + {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.00f}, {0xdeadbeef, 0, 2, 3}}, + {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.00f}, { 9, 5, 0, 1}}, + {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.00f}, { 9, 0, 0, 1}}, + {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.00f}, { 0, 1, 0, 0}}, + {&vs5, &ps5, {0.0f, 1.0f, 0.0f, 0.25f}, { 0, 1, 0, 0}}, }; memset(&desc, 0, sizeof(desc)); -- 2.21.0

2 1

[PATCH vkd3d 1/8] vkd3d: Validate resource pointer for transition barriers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 28 ++++++++++++++++++++++------ libs/vkd3d/device.c | 2 +- tests/d3d12_invalid_usage.c | 12 ++++++++++-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5335e3..b145413efdc3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1140,6 +1140,18 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, } /* Command buffers */ +static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list, + const char *message, ...) +{ + va_list args; + + va_start(args, message); + WARN("Command list %p is invalid: \"%s\".\n", list, vkd3d_dbg_vsprintf(message, args)); + va_end(args); + + list->is_valid = false; +} + static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list *list) { struct d3d12_device *device = list->device; @@ -3729,19 +3741,23 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC if (!is_valid_resource_state(transition->StateBefore)) { - WARN("Invalid StateBefore %#x (barrier %u).\n", transition->StateBefore, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateBefore %#x (barrier %u).", transition->StateBefore, i); continue; } if (!is_valid_resource_state(transition->StateAfter)) { - WARN("Invalid StateAfter %#x (barrier %u).\n", transition->StateAfter, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateAfter %#x (barrier %u).", transition->StateAfter, i); + continue; + } + + if (!(resource = unsafe_impl_from_ID3D12Resource(transition->pResource))) + { + d3d12_command_list_mark_as_invalid(list, "A resource pointer is NULL."); continue; } - resource = unsafe_impl_from_ID3D12Resource(transition->pResource); - assert(resource); sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8e096b..1b651f144233 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3189,7 +3189,7 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, va_list args; va_start(args, message); - WARN("Device %p is lost (reason %#x, message \"%s\").\n", + WARN("Device %p is lost (reason %#x, \"%s\").\n", device, reason, vkd3d_dbg_vsprintf(message, args)); va_end(args); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ab5deb5b1e11..feb45b456612 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -32,7 +32,7 @@ static void recreate_command_list_(unsigned int line, ID3D12Device *device, ok_(line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); } -static void test_invalid_texture_resource_barriers(void) +static void test_invalid_resource_barriers(void) { ID3D12Resource *texture, *readback_buffer, *upload_buffer; ID3D12CommandAllocator *command_allocator; @@ -127,6 +127,14 @@ static void test_invalid_texture_resource_barriers(void) hr = ID3D12GraphicsCommandList_Close(command_list); todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + recreate_command_list(device, command_allocator, &command_list); + + /* NULL resource. */ + transition_resource_state(command_list, NULL, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); ID3D12GraphicsCommandList_Release(command_list); @@ -284,6 +292,6 @@ START_TEST(d3d12_invalid_usage) enable_d3d12_debug_layer(argc, argv); init_adapter_info(); - run_test(test_invalid_texture_resource_barriers); + run_test(test_invalid_resource_barriers); run_test(test_invalid_copy_texture_region); } -- 2.21.0

2 1

[PATCH v2 1/8] kernel32/tests: Fix NtMapViewOfSection tests results for w1064v1809
by Rémi Bernon 18 Jun '19

18 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0b718606d0e..47e61566c9c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1265,8 +1265,8 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1288,7 +1288,8 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1328,25 +1329,30 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER || + broken(STATUS_MAPPED_ALIGNMENT) /* w1064v1809 inconsistently returns STATUS_MAPPED_ALIGNMENT or STATUS_INVALID_PARAMETER */, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1001; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 1; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) @@ -1409,7 +1415,8 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); todo_wine - ok( status == STATUS_INVALID_PARAMETER_9, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); } status = pNtUnmapViewOfSection( hProcess, ptr ); -- 2.20.1

3 19

[PATCH 3/4] mshtml: Add IHTMLBlockElement interface stub.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

While IHTMLDOMNode_QueryInterface(node, &IID_IHTMLBlockElement) works fine in my local VM with fully updated Windows XP and IE8 it fails under many of testbot VMs, and even adding is_ie9plus check doesn't help. So, instead of checking is_ie9plus I've added a broken() statement. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmlnode.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 9 ++++ include/mshtmdid.h | 3 ++ include/mshtml.idl | 18 ++++++++ 6 files changed, 114 insertions(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index faffb6bd02..59d3be0ffb 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1390,6 +1390,85 @@ static const IHTMLDOMNode3Vtbl HTMLDOMNode3Vtbl = { HTMLDOMNode3_isSupported }; +static inline HTMLDOMNode *impl_from_IHTMLBlockElement(IHTMLBlockElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLBlockElement_iface); +} + +static HRESULT WINAPI HTMLBlockElement_QueryInterface(IHTMLBlockElement *iface, REFIID riid, void **ppv) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLBlockElement_AddRef(IHTMLBlockElement *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLBlockElement_Release(IHTMLBlockElement *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLBlockElement_GetTypeInfoCount(IHTMLBlockElement *iface, UINT *pctinfo) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLBlockElement_GetTypeInfo(IHTMLBlockElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLBlockElement_GetIDsOfNames(IHTMLBlockElement *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLBlockElement_Invoke(IHTMLBlockElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLBlockElement_put_clear(IHTMLBlockElement *iface, BSTR v) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLBlockElement_get_clear(IHTMLBlockElement *iface, BSTR *p) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLBlockElementVtbl HTMLBlockElementVtbl = { + HTMLBlockElement_QueryInterface, + HTMLBlockElement_AddRef, + HTMLBlockElement_Release, + HTMLBlockElement_GetTypeInfoCount, + HTMLBlockElement_GetTypeInfo, + HTMLBlockElement_GetIDsOfNames, + HTMLBlockElement_Invoke, + HTMLBlockElement_put_clear, + HTMLBlockElement_get_clear +}; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -1404,6 +1483,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) { *ppv = &This->IHTMLDOMNode3_iface; + }else if(IsEqualGUID(&IID_IHTMLBlockElement, riid)) { + *ppv = &This->IHTMLBlockElement_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; return S_OK; @@ -1457,6 +1538,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; + node->IHTMLBlockElement_iface.lpVtbl = &HTMLBlockElementVtbl; ccref_init(&node->ccref, 1); EventTarget_Init(&node->event_target, (IUnknown*)&node->IHTMLDOMNode_iface, dispex_data, doc->document_mode); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 29396a5475..8ce7f8680c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -710,6 +710,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); + X(IID_IHTMLBlockElement); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); X(IID_IHTMLEditServices); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a36da94e43..6c25cc828c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -776,6 +776,7 @@ struct HTMLDOMNode { IHTMLDOMNode IHTMLDOMNode_iface; IHTMLDOMNode2 IHTMLDOMNode2_iface; IHTMLDOMNode3 IHTMLDOMNode3_iface; + IHTMLBlockElement IHTMLBlockElement_iface; const NodeImplVtbl *vtbl; nsCycleCollectingAutoRefCnt ccref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191a6e..320be5b43a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8521,6 +8521,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection *col; IHTMLDOMChildrenCollection *child_col; IHTMLElement *elem, *elem2, *elem3; + IHTMLBlockElement *block_elem; IHTMLDOMNode *node, *node2; IHTMLWindow2 *window; IDispatch *disp; @@ -8650,10 +8651,18 @@ static void test_elems(IHTMLDocument2 *doc) node = test_node_get_parent((IUnknown*)elem); ok(node != NULL, "node == NULL\n"); test_node_name((IUnknown*)node, "BODY"); + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLBlockElement, (void**)&block_elem); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLBlockElement iface: %08x\n", hres); + if (block_elem) + IHTMLBlockElement_Release(block_elem); node2 = test_node_get_parent((IUnknown*)node); IHTMLDOMNode_Release(node); ok(node2 != NULL, "node == NULL\n"); test_node_name((IUnknown*)node2, "HTML"); + hres = IHTMLDOMNode_QueryInterface(node2, &IID_IHTMLBlockElement, (void**)&block_elem); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLBlockElement iface: %08x\n", hres); + if (block_elem) + IHTMLBlockElement_Release(block_elem); node = test_node_get_parent((IUnknown*)node2); IHTMLDOMNode_Release(node2); ok(node != NULL, "node == NULL\n"); diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f690b..a58b3f9247 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3857,6 +3857,9 @@ /* IHTMLLabelElement2 */ #define DISPID_IHTMLLABELELEMENT2_FORM DISPID_LABEL+2 +/* IHTMLBlockElement */ +#define DISPID_IHTMLBLOCKELEMENT_CLEAR DISPID_A_CLEAR + /* IHTMLTxtRange */ #define DISPID_IHTMLTXTRANGE_HTMLTEXT DISPID_RANGE+3 #define DISPID_IHTMLTXTRANGE_TEXT DISPID_RANGE+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e71a..e90e0018a8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28609,6 +28609,24 @@ interface IHTMLDOMConstructorCollection : IDispatch HRESULT XMLHttpRequest([out, retval] IDispatch **p); } +/***************************************************************************** + * IHTMLBlockElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f208-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLBlockElement : IDispatch +{ + [propput, id(DISPID_IHTMLBLOCKELEMENT_CLEAR), displaybind, bindable] + HRESULT clear([in] BSTR v); + + [propget, id(DISPID_IHTMLBLOCKELEMENT_CLEAR), displaybind, bindable] + HRESULT clear([retval, out] BSTR *p); +}; + /***************************************************************************** * IXMLGenericParse interface */ -- 2.20.1

3 2

[PATCH 4/4] mshtml: Add IHTMLControlRange interface stub.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/main.c | 1 + dlls/mshtml/txtrange.c | 196 +++++++++++++++++++++++++++++++++++++++++ include/mshtmdid.h | 17 ++++ include/mshtml.idl | 57 ++++++++++++ 4 files changed, 271 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8ce7f8680c..b3c6cf80d4 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -711,6 +711,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumVARIANT); X(IID_IHlinkTarget); X(IID_IHTMLBlockElement); + X(IID_IHTMLControlRange); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); X(IID_IHTMLEditServices); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c6a6ed096b..ab83009a09 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -39,6 +39,7 @@ static const WCHAR hrW[] = {'h','r',0}; typedef struct { DispatchEx dispex; IHTMLTxtRange IHTMLTxtRange_iface; + IHTMLControlRange IHTMLControlRange_iface; IOleCommandTarget IOleCommandTarget_iface; LONG ref; @@ -69,6 +70,198 @@ typedef enum { RU_TEXTEDIT } range_unit_t; +static inline HTMLTxtRange *impl_from_IHTMLControlRange(IHTMLControlRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLTxtRange, IHTMLControlRange_iface); +} + +static HRESULT WINAPI HTMLControlRange_QueryInterface(IHTMLControlRange *iface, REFIID riid, void **ppv) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_QueryInterface(&This->IHTMLTxtRange_iface, riid, ppv); +} + +static ULONG WINAPI HTMLControlRange_AddRef(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_AddRef(&This->IHTMLTxtRange_iface); +} + +static ULONG WINAPI HTMLControlRange_Release(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_Release(&This->IHTMLTxtRange_iface); +} + +static HRESULT WINAPI HTMLControlRange_GetTypeInfoCount(IHTMLControlRange *iface, UINT *pctinfo) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLControlRange_GetTypeInfo(IHTMLControlRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLControlRange_GetIDsOfNames(IHTMLControlRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLControlRange_Invoke(IHTMLControlRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLControlRange_select(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_add(IHTMLControlRange *iface, IHTMLControlElement *item) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_remove(IHTMLControlRange *iface, LONG index) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_item(IHTMLControlRange *iface, LONG index, IHTMLElement **pdisp) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_scrollIntoView(IHTMLControlRange *iface, VARIANT varargStart) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandSupported(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandEnabled(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandState(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandIndeterm(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandText(IHTMLControlRange *iface, + BSTR cmdID, BSTR *pcmdText) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandValue(IHTMLControlRange *iface, + BSTR cmdID, VARIANT *pcmdValue) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_execCommand(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_execCommandShowHelp(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_commonParentElement(IHTMLControlRange *iface, IHTMLElement **parent) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_get_length(IHTMLControlRange *iface, LONG *p) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IHTMLControlRangeVtbl HTMLControlRangeVtbl = { + HTMLControlRange_QueryInterface, + HTMLControlRange_AddRef, + HTMLControlRange_Release, + HTMLControlRange_GetTypeInfoCount, + HTMLControlRange_GetTypeInfo, + HTMLControlRange_GetIDsOfNames, + HTMLControlRange_Invoke, + HTMLControlRange_select, + HTMLControlRange_add, + HTMLControlRange_remove, + HTMLControlRange_item, + HTMLControlRange_scrollIntoView, + HTMLControlRange_queryCommandSupported, + HTMLControlRange_queryCommandEnabled, + HTMLControlRange_queryCommandState, + HTMLControlRange_queryCommandIndeterm, + HTMLControlRange_queryCommandText, + HTMLControlRange_queryCommandValue, + HTMLControlRange_execCommand, + HTMLControlRange_execCommandShowHelp, + HTMLControlRange_commonParentElement, + HTMLControlRange_get_length +}; + static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *iface) { HTMLTxtRange *iter; @@ -831,6 +1024,8 @@ static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID r *ppv = &This->IHTMLTxtRange_iface; }else if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) { *ppv = &This->IHTMLTxtRange_iface; + }else if(IsEqualGUID(&IID_IHTMLControlRange, riid)) { + *ppv = &This->IHTMLControlRange_iface; }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { *ppv = &This->IOleCommandTarget_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { @@ -1744,6 +1939,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex); ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; + ret->IHTMLControlRange_iface.lpVtbl = &HTMLControlRangeVtbl; ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; ret->ref = 1; diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a58b3f9247..8544d4be2a 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4208,6 +4208,23 @@ #define DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT DISPID_TEXTSITE+5 #define DISPID_IHTMLTEXTCONTAINER_ONSCROLL DISPID_EVPROP_ONSCROLL +/* IHTMLControlRange */ +#define DISPID_IHTMLCONTROLRANGE_SELECT DISPID_RANGE+2 +#define DISPID_IHTMLCONTROLRANGE_ADD DISPID_RANGE+3 +#define DISPID_IHTMLCONTROLRANGE_REMOVE DISPID_RANGE+4 +#define DISPID_IHTMLCONTROLRANGE_ITEM DISPID_VALUE +#define DISPID_IHTMLCONTROLRANGE_SCROLLINTOVIEW DISPID_RANGE+6 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSUPPORTED DISPID_RANGE+7 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDENABLED DISPID_RANGE+8 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSTATE DISPID_RANGE+9 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDINDETERM DISPID_RANGE+10 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDTEXT DISPID_RANGE+11 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDVALUE DISPID_RANGE+12 +#define DISPID_IHTMLCONTROLRANGE_EXECCOMMAND DISPID_RANGE+13 +#define DISPID_IHTMLCONTROLRANGE_EXECCOMMANDSHOWHELP DISPID_RANGE+14 +#define DISPID_IHTMLCONTROLRANGE_COMMONPARENTELEMENT DISPID_RANGE+15 +#define DISPID_IHTMLCONTROLRANGE_LENGTH DISPID_RANGE+5 + /* IHTMLTableCaption */ #define DISPID_IHTMLTABLECAPTION_ALIGN STDPROPID_XOBJ_BLOCKALIGN #define DISPID_IHTMLTABLECAPTION_VALIGN DISPID_A_TABLEVALIGN diff --git a/include/mshtml.idl b/include/mshtml.idl index e90e0018a8..a666c628ae 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16262,6 +16262,63 @@ coclass HTMLUnknownElement /* interface IHTMLUnknownElement; */ } +/***************************************************************************** + * IHTMLControlRange interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f29c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLControlRange : IDispatch +{ + [id(DISPID_IHTMLCONTROLRANGE_SELECT)] + HRESULT select(); + + [id(DISPID_IHTMLCONTROLRANGE_ADD)] + HRESULT add([in] IHTMLControlElement *item); + + [id(DISPID_IHTMLCONTROLRANGE_REMOVE)] + HRESULT remove([in] long index); + + [id(DISPID_IHTMLCONTROLRANGE_ITEM)] + HRESULT item([in] long index,[retval, out] IHTMLElement **pdisp); + + [id(DISPID_IHTMLCONTROLRANGE_SCROLLINTOVIEW)] + HRESULT scrollIntoView([optional, in] VARIANT varargStart); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSUPPORTED)] + HRESULT queryCommandSupported([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDENABLED)] + HRESULT queryCommandEnabled([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSTATE)] + HRESULT queryCommandState([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDINDETERM)] + HRESULT queryCommandIndeterm([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDTEXT)] + HRESULT queryCommandText([in] BSTR cmdID,[retval, out] BSTR* pcmdText); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDVALUE)] + HRESULT queryCommandValue([in] BSTR cmdID,[retval, out] VARIANT *pcmdValue); + + [id(DISPID_IHTMLCONTROLRANGE_EXECCOMMAND)] + HRESULT execCommand([in] BSTR cmdID,[defaultvalue(0), in] VARIANT_BOOL showUI,[optional, in] VARIANT value,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_EXECCOMMANDSHOWHELP)] + HRESULT execCommandShowHelp([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_COMMONPARENTELEMENT)] + HRESULT commonParentElement([retval, out] IHTMLElement **parent); + + [propget, id(DISPID_IHTMLCONTROLRANGE_LENGTH)] + HRESULT length([retval, out] long *p); +}; + /***************************************************************************** * ISVGAnimatedEnumeration interface */ -- 2.20.1

3 2

[PATCH 2/4] mshtml: Replace a useless trace with a slightly better one.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/dispex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f0daafaa49..dab44991bf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -256,8 +256,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, HRESULT hres; hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + WARN("GetDocumentation failed: %08x\n", hres); return; + } for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { if(info->id == desc->memid || !wcscmp(info->name, name)) { @@ -269,6 +271,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } } + TRACE("adding %s...\n", debugstr_w(name)); + if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); @@ -414,7 +418,6 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp } if(!hook || hook->invoke) { - TRACE("adding...\n"); add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo, hook ? hook->invoke : NULL); } -- 2.20.1

3 2

[PATCH 1/4] mshtml: Add recently added GUIDs to debugstr_mshtml_guid().
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 7cb3006812..29396a5475 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -705,6 +705,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IDispatch); X(IID_IDispatchEx); X(IID_IDispatchJS); + X(IID_IDisplayServices); X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); @@ -719,6 +720,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IInternetProtocol); X(IID_IInternetProtocolRoot); X(IID_IManagedObject); + X(IID_IMarkupContainer); + X(IID_IMarkupServices); X(IID_IMarshal); X(IID_IMonikerProp); X(IID_IObjectIdentity); -- 2.20.1

3 2

[PATCH] mshtml: Add better stub for HTMLDocument7::get_onmsthumbnailclick.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/htmlevent.c | 3 +++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/dom.c | 7 +++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 868a9a0048..04efb11819 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3339,8 +3339,10 @@ static HRESULT WINAPI HTMLDocument7_put_onmsthumbnailclick(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MSTHUMBNAILCLICK, p);; } static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 453fe32c1f..b090d1c828 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -88,6 +88,7 @@ static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0}; static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0}; +static const WCHAR msthumbnailclickW[] = {'m','s','t','h','u','m','b','n','a','i','l','c','l','i','c','k',0}; static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; @@ -208,6 +209,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {mousewheelW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, EVENT_FIXME}, + {msthumbnailclickW, EVENT_TYPE_MOUSE, DISPID_EVPROP_ONMSTHUMBNAILCLICK, + EVENT_FIXME}, {pasteW, EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {readystatechangeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e2f45dc812..c5d9753722 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -46,6 +46,7 @@ typedef enum { EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_MOUSEWHEEL, + EVENTID_MSTHUMBNAILCLICK, EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191a6e..e152c4fc25 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7014,6 +7014,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + VARIANT v; IDispatch *disp; test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); @@ -7045,6 +7046,12 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + memset(&v, 0xcc, sizeof(v)); + hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); + ok(hres == S_OK, "get_onmsthumbnailclick returned: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "got %u\n", V_VT(&v)); + ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); -- 2.20.1

3 2

[PATCH v3] mshtml: Implement IHTMLDocument2 put/get_bgColor
by Alistair Leslie-Hughes 18 Jun '19

18 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 48 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1ccfa3020a..594096ea45 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -680,15 +680,55 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + IHTMLElement *element; + IHTMLBodyElement *body; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hr = IHTMLDocument2_get_body(iface, &element); + if (FAILED(hr)) + { + ERR("Failed to get body (0x%08x)\n", hr); + return hr; + } + + hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); + if (SUCCEEDED(hr)) + { + hr = IHTMLBodyElement_put_bgColor(body, v); + IHTMLBodyElement_Release(body); + } + IHTMLElement_Release(element); + + return hr; } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLElement *element; + IHTMLBodyElement *body; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, p); + + hr = IHTMLDocument2_get_body(iface, &element); + if (FAILED(hr)) + { + ERR("Failed to get body (0x%08x)\n", hr); + return hr; + } + + hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); + if (SUCCEEDED(hr)) + { + hr = IHTMLBodyElement_get_bgColor(body, p); + IHTMLBodyElement_Release(body); + } + IHTMLElement_Release(element); + + return hr; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191a6e..9e6c407451 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6708,7 +6708,7 @@ static void _set_body_scroll(unsigned line, IHTMLBodyElement *body, const char * _test_body_scroll(line, body, val); } -static void test_body_funs(IHTMLBodyElement *body) +static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) { VARIANT vbg, vDefaultbg; HRESULT hres; @@ -6730,6 +6730,36 @@ static void test_body_funs(IHTMLBodyElement *body) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Original */ + hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + + /* Set via IHTMLDocument2 */ + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLDocument2_put_bgColor(doc, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLBodyElement_get_bgColor(body, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); @@ -7154,7 +7184,7 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); - test_body_funs(body); + test_body_funs(body, doc); IHTMLBodyElement_Release(body); test_elem_set_outertext_fail(elem); -- 2.17.1

2 1

[PATCH] wininet: Silence wininet no support on this platform message.
by Alistair Leslie-Hughes 18 Jun '19

18 Jun '19

From: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b9f9f91777..6671950f8c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2324,7 +2324,8 @@ static WCHAR *get_proxy_autoconfig_url(void) CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static int once; + if (!once++) FIXME( "no support on this platform\n" ); return NULL; #endif } -- 2.17.1

2 1

[PATCH 1/5] strmbase/renderer: Share pin and filter reference counts.
by Zebediah Figura 18 Jun '19

18 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/tests/nullrenderer.c | 10 +++++----- dlls/quartz/tests/dsoundrender.c | 8 +++----- dlls/quartz/tests/videorenderer.c | 8 +++----- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 18 +++++++++++++++--- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index a45f30a3092..d39b28d5779 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -122,9 +122,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); @@ -226,7 +226,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -236,9 +236,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 44c7119552a..cf7b0e32b41 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -288,10 +288,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -399,7 +397,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -409,9 +407,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index fdd4dfb954f..0b9ea3ff873 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -221,10 +221,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -329,7 +327,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -340,9 +338,9 @@ static void test_pin_info(void) todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index ee80590cc1d..e702be70609 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -427,9 +427,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 13f6e196adf..d14a9705393 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -435,9 +435,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b1b318f54f2..36e934f2232 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -45,6 +45,18 @@ static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { QualityControlImpl_SetSink }; +static ULONG WINAPI BaseRenderer_InputPin_AddRef(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI BaseRenderer_InputPin_Release(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} + static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -164,8 +176,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) static const IPinVtbl BaseRenderer_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, + BaseRenderer_InputPin_AddRef, + BaseRenderer_InputPin_Release, BaseInputPinImpl_Connect, BaseRenderer_InputPin_ReceiveConnection, BaseRenderer_InputPin_Disconnect, @@ -298,7 +310,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) IPin_Release(peer); } IPin_Disconnect(&filter->pInputPin->pin.IPin_iface); - IPin_Release(&filter->pInputPin->pin.IPin_iface); + BaseInputPin_Destroy(filter->pInputPin); if (filter->pPosition) IUnknown_Release(filter->pPosition); -- 2.21.0

2 9

[PATCH v2 1/6] d3drm: Implement frame AddTransform combine types
by Jeff Smith 18 Jun '19

18 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/frame.c | 27 +++++++++++++++++-- dlls/d3drm/tests/d3drm.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b57e..46b5f37412 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -937,10 +937,31 @@ static HRESULT WINAPI d3drm_frame1_AddMoveCallback(IDirect3DRMFrame *iface, return E_NOTIMPL; } +static void matrix_multiply_affine(D3DRMMATRIX4D d, D3DRMMATRIX4D s1, D3DRMMATRIX4D s2) +{ + d[0][0] = s1[0][0] * s2[0][0] + s1[0][1] * s2[1][0] + s1[0][2] * s2[2][0]; + d[0][1] = s1[0][0] * s2[0][1] + s1[0][1] * s2[1][1] + s1[0][2] * s2[2][1]; + d[0][2] = s1[0][0] * s2[0][2] + s1[0][1] * s2[1][2] + s1[0][2] * s2[2][2]; + d[0][3] = 0.0f; + d[1][0] = s1[1][0] * s2[0][0] + s1[1][1] * s2[1][0] + s1[1][2] * s2[2][0]; + d[1][1] = s1[1][0] * s2[0][1] + s1[1][1] * s2[1][1] + s1[1][2] * s2[2][1]; + d[1][2] = s1[1][0] * s2[0][2] + s1[1][1] * s2[1][2] + s1[1][2] * s2[2][2]; + d[1][3] = 0.0f; + d[2][0] = s1[2][0] * s2[0][0] + s1[2][1] * s2[1][0] + s1[2][2] * s2[2][0]; + d[2][1] = s1[2][0] * s2[0][1] + s1[2][1] * s2[1][1] + s1[2][2] * s2[2][1]; + d[2][2] = s1[2][0] * s2[0][2] + s1[2][1] * s2[1][2] + s1[2][2] * s2[2][2]; + d[2][3] = 0.0f; + d[3][0] = s1[3][0] * s2[0][0] + s1[3][1] * s2[1][0] + s1[3][2] * s2[2][0] + s2[3][0]; + d[3][1] = s1[3][0] * s2[0][1] + s1[3][1] * s2[1][1] + s1[3][2] * s2[2][1] + s2[3][1]; + d[3][2] = s1[3][0] * s2[0][2] + s1[3][1] * s2[1][2] + s1[3][2] * s2[2][2] + s2[3][2]; + d[3][3] = 1.0f; +} + static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + D3DRMMATRIX4D m; TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); @@ -951,11 +972,13 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, break; case D3DRMCOMBINE_BEFORE: - FIXME("D3DRMCOMBINE_BEFORE not supported yet\n"); + memcpy(m, frame->transform, sizeof(D3DRMMATRIX4D)); + matrix_multiply_affine(frame->transform, matrix, m); break; case D3DRMCOMBINE_AFTER: - FIXME("D3DRMCOMBINE_AFTER not supported yet\n"); + memcpy(m, frame->transform, sizeof(D3DRMMATRIX4D)); + matrix_multiply_affine(frame->transform, m, matrix); break; default: diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a..9cfdba484e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -75,6 +75,30 @@ static void vector_eq_(unsigned int line, const D3DVECTOR *left, const D3DVECTOR check_vector_(line, left, U1(right)->x, U2(right)->y, U3(right)->z, 0); } +#define check_matrix(a, b,c,d, e,f,g, h,i,j, k,l,m, n) check_matrix_(__LINE__, a, b,c,d, e,f,g, h,i,j, k,l,m, n) +static void check_matrix_(unsigned int line, const D3DRMMATRIX4D m, + D3DVALUE m11, D3DVALUE m12, D3DVALUE m13, + D3DVALUE m21, D3DVALUE m22, D3DVALUE m23, + D3DVALUE m31, D3DVALUE m32, D3DVALUE m33, + D3DVALUE m41, D3DVALUE m42, D3DVALUE m43, + unsigned int ulps) +{ + BOOL ret = compare_float(m[0][0], m11, ulps) + && compare_float(m[0][1], m12, ulps) + && compare_float(m[0][2], m13, ulps) + && compare_float(m[1][0], m21, ulps) + && compare_float(m[1][1], m22, ulps) + && compare_float(m[1][2], m23, ulps) + && compare_float(m[2][0], m31, ulps) + && compare_float(m[2][1], m32, ulps) + && compare_float(m[2][2], m33, ulps) + && compare_float(m[3][0], m41, ulps) + && compare_float(m[3][1], m42, ulps) + && compare_float(m[3][2], m43, ulps); + + ok_(__FILE__, line)(ret, "Got unexpected matrix.\n"); +} + static D3DRMMATRIX4D identity = { { 1.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f, 0.0f }, @@ -2709,12 +2733,28 @@ cleanup: DestroyWindow(window); } +static void set_transform(IDirect3DRMFrame *frame, + D3DVALUE m11, D3DVALUE m12, D3DVALUE m13, + D3DVALUE m21, D3DVALUE m22, D3DVALUE m23, + D3DVALUE m31, D3DVALUE m32, D3DVALUE m33, + D3DVALUE m41, D3DVALUE m42, D3DVALUE m43) +{ + D3DRMMATRIX4D matrix = { + {m11, m12, m13, 0.0f}, + {m21, m22, m23, 0.0f}, + {m31, m32, m33, 0.0f}, + {m41, m42, m43, 1.0f} + }; + + IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); +} + static void test_frame_transform(void) { HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMFrame *frame; - D3DRMMATRIX4D matrix; + D3DRMMATRIX4D matrix, add_matrix; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -2726,6 +2766,31 @@ static void test_frame_transform(void) ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + + memcpy(add_matrix, identity, sizeof(D3DRMMATRIX4D)); + add_matrix[3][0] = 3.0f; + add_matrix[3][1] = 3.0f; + add_matrix[3][2] = 3.0f; + + set_transform(frame, 2,0,0, 0,2,0, 0,0,2, 0,0,0); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix); + ok(hr == D3DRM_OK, "Cannot add transform (REPLACE) (hr = %x)", hr); + IDirect3DRMFrame_GetTransform(frame, matrix); + check_matrix(matrix, 1,0,0, 0,1,0, 0,0,1, 3,3,3, 32); + + set_transform(frame, 2,0,0, 0,2,0, 0,0,2, 0,0,0); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix); + ok(hr == D3DRM_OK, "Cannot add transform (BEFORE) (hr = %x)", hr); + IDirect3DRMFrame_GetTransform(frame, matrix); + check_matrix(matrix, 2,0,0, 0,2,0, 0,0,2, 6,6,6, 32); + + set_transform(frame, 2,0,0, 0,2,0, 0,0,2, 0,0,0); + hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix); + ok(hr == D3DRM_OK, "Cannot add transform (AFTER) (hr = %x)", hr); + IDirect3DRMFrame_GetTransform(frame, matrix); + check_matrix(matrix, 2,0,0, 0,2,0, 0,0,2, 3,3,3, 32); + + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.14.3

2 12

[PATCH v2] include: Avoid depending on config.h for the __builtin_clz check.
by Alistair Leslie-Hughes 18 Jun '19

18 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wine/wined3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ada5636550..ef1e3cf4ce 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2752,7 +2752,7 @@ HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_ /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -#ifdef HAVE___BUILTIN_CLZ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) return __builtin_clz(x) ^ 0x1f; #else static const unsigned int l[] = -- 2.17.1

1 0

[PATCH 5/5] wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 47 ++++------------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 13ebd311718..2971e454629 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3266,6 +3266,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; @@ -3282,8 +3283,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3294,8 +3294,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3317,46 +3316,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in break; case WINED3D_LOCATION_SYSMEM: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {0, texture->resource.heap_memory}; - - data.addr += sub_resource->offset; - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - } - else - { - FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; - case WINED3D_LOCATION_BUFFER: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; - - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - } - else - { - FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); default: FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to draw_primitive_arrays().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d7c9252e1dc..6a7aafc9625 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4347,15 +4347,15 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state } /* Context activation is done by the caller. */ -static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, - const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, - unsigned int count, unsigned int start_instance, unsigned int instance_count) +static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, + unsigned int start_idx, unsigned int count, unsigned int start_instance, unsigned int instance_count) { - const struct wined3d_ffp_attrib_ops *ops = &context->d3d_info->ffp_attrib_ops; + const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - const struct wined3d_stream_info *si = &context->stream_info; + const struct wined3d_stream_info *si = &context_gl->c.stream_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; - const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int instanced_element_count = 0; GLenum mode = state->gl_primitive_type; const void *indices; @@ -4460,7 +4460,8 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct element = &si->elements[element_idx]; ptr = element->data.addr + element->stride * i; if (element->data.buffer_object) - ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, + &context_gl->c); ops->generic[element->format->emit_idx](element_idx, ptr); } @@ -4991,9 +4992,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s idx_size, parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); else - draw_primitive_arrays(context, state, idx_data, idx_size, parameters->u.direct.base_vertex_idx, - parameters->u.direct.start_idx, parameters->u.direct.index_count, - parameters->u.direct.start_instance, instance_count); + wined3d_context_gl_draw_primitive_arrays(context_gl, state, idx_data, idx_size, + parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, + parameters->u.direct.index_count, parameters->u.direct.start_instance, instance_count); } if (context->uses_uavs) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_setup_target().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6bd6d438294..d7c9252e1dc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4122,27 +4122,26 @@ static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_g wined3d_context_gl_end_transform_feedback(context_gl); } -static void context_setup_target(struct wined3d_context *context, +static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_gl, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + BOOL old_render_offscreen = context_gl->c.render_offscreen, render_offscreen; render_offscreen = wined3d_resource_is_offscreen(&texture->resource); - if (context->current_rt.texture == texture - && context->current_rt.sub_resource_idx == sub_resource_idx + if (context_gl->c.current_rt.texture == texture + && context_gl->c.current_rt.sub_resource_idx == sub_resource_idx && render_offscreen == old_render_offscreen) return; /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ - if (!context->current_rt.texture) + if (!context_gl->c.current_rt.texture) { - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); } else { - const struct wined3d_format *old = context->current_rt.texture->resource.format; + const struct wined3d_format *old = context_gl->c.current_rt.texture->resource.format; const struct wined3d_format *new = texture->resource.format; if (old->id != new->id) @@ -4150,12 +4149,12 @@ static void context_setup_target(struct wined3d_context *context, /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context->current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) + if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not @@ -4166,22 +4165,22 @@ static void context_setup_target(struct wined3d_context *context, * has to be called with the old rendertarget active, otherwise a * wrong drawable is read. */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && (context->current_rt.texture != texture - || context->current_rt.sub_resource_idx != sub_resource_idx)) + && old_render_offscreen && (context_gl->c.current_rt.texture != texture + || context_gl->c.current_rt.sub_resource_idx != sub_resource_idx)) { - struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context->current_rt.texture); - unsigned int prev_sub_resource_idx = context->current_rt.sub_resource_idx; + struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context_gl->c.current_rt.texture); + unsigned int prev_sub_resource_idx = context_gl->c.current_rt.sub_resource_idx; /* Read the back buffer of the old drawable into the destination texture. */ if (prev_texture->texture_srgb.name) - wined3d_texture_load(&prev_texture->t, context, TRUE); - wined3d_texture_load(&prev_texture->t, context, FALSE); + wined3d_texture_load(&prev_texture->t, &context_gl->c, TRUE); + wined3d_texture_load(&prev_texture->t, &context_gl->c, FALSE); wined3d_texture_invalidate_location(&prev_texture->t, prev_sub_resource_idx, WINED3D_LOCATION_DRAWABLE); } } - context->current_rt.texture = texture; - context->current_rt.sub_resource_idx = sub_resource_idx; + context_gl->c.current_rt.texture = texture; + context_gl->c.current_rt.sub_resource_idx = sub_resource_idx; wined3d_context_gl_set_render_offscreen(context_gl, render_offscreen); } @@ -4190,7 +4189,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, { wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); - context_setup_target(&context_gl->c, texture, sub_resource_idx); + wined3d_context_gl_setup_target(context_gl, texture, sub_resource_idx); if (!context_gl->valid) return; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_pause_transform_feedback().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bc4e214f95e..6bd6d438294 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4101,19 +4101,18 @@ void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *contex } } -static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) +static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_gl *context_gl, BOOL force) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - if (!context->transform_feedback_active || context->transform_feedback_paused) + if (!context_gl->c.transform_feedback_active || context_gl->c.transform_feedback_paused) return; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) { GL_EXTCALL(glPauseTransformFeedback()); checkGLcall("glPauseTransformFeedback"); - context->transform_feedback_paused = 1; + context_gl->c.transform_feedback_paused = 1; return; } @@ -4833,7 +4832,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info = context->gl_info; if (!use_transform_feedback(state)) - context_pause_transform_feedback(context, TRUE); + wined3d_context_gl_pause_transform_feedback(context_gl, TRUE); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -5004,7 +5003,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } - context_pause_transform_feedback(context, FALSE); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); if (rasterizer_discard) { -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_bind_unordered_access_views().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ea9f1763908..bc4e214f95e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3842,10 +3842,10 @@ static void context_load_unordered_access_resources(struct wined3d_context *cont } } -static void context_bind_unordered_access_views(struct wined3d_context *context, +static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_unordered_access_view_gl *view_gl; const struct wined3d_format_gl *format_gl; GLuint texture_name; @@ -3874,7 +3874,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (view_gl->v.resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); - texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + texture_name = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); level = view_gl->v.desc.u.texture.level_idx; } else @@ -4002,7 +4002,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_unordered_access_view_bindings) { - context_bind_unordered_access_views(context, + wined3d_context_gl_bind_unordered_access_views(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context->update_unordered_access_view_bindings = 0; @@ -4059,7 +4059,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co if (context_gl->c.update_compute_unordered_access_view_bindings) { - context_bind_unordered_access_views(&context_gl->c, + wined3d_context_gl_bind_unordered_access_views(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); context_gl->c.update_compute_unordered_access_view_bindings = 0; -- 2.11.0

1 0

[PATCH 1/2] winex11: Remove redundant calls to update_key_state().
by Zebediah Figura 17 Jun '19

17 Jun '19

These will not actually do anything, and were probably added by mistake, after the similar calls to VK_CONTROL et al. above. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3b8d91678716..b063491ad5b3 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1288,8 +1288,6 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); update_key_state( keystate, VK_MENU, (keystate[VK_LMENU] | keystate[VK_RMENU]) & 0x80 ); update_key_state( keystate, VK_SHIFT, (keystate[VK_LSHIFT] | keystate[VK_RSHIFT]) & 0x80 ); - update_key_state( keystate, VK_LWIN, keystate[VK_LWIN] & 0x80 ); - update_key_state( keystate, VK_RWIN, keystate[VK_RWIN] & 0x80 ); set_async_key_state( keystate ); return TRUE; } -- 2.20.1

1 1

[PATCH] include: Avoid depending on config.h for the __builtin_clz check.
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wine/wined3d.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ada5636550..8ffe189fa9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,10 +26,6 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H -#ifndef __WINE_WINE_PORT_H -# error You must include wine/port.h to use this header -#endif - #include "wine/list.h" #define WINED3D_OK S_OK @@ -2752,7 +2748,7 @@ HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_ /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -#ifdef HAVE___BUILTIN_CLZ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) return __builtin_clz(x) ^ 0x1f; #else static const unsigned int l[] = -- 2.17.1

2 1

[PATCH v3 1/2] kernel32: Add sxs tests
by Fabian Maurer 17 Jun '19

17 Jun '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/actctx.c | 256 +++++++++++++++++++++++++++++++++ dlls/kernel32/tests/dummy.c | 21 ++- dlls/kernel32/tests/dummy.spec | 2 +- 3 files changed, 277 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 6891fbe761..6929fd4365 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -504,6 +504,22 @@ static const char settings_manifest3[] = " </asmv3:application>" "</assembly>"; +static const char two_dll_manifest_dll[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v3\" manifestVersion=\"1.0\">" +" <assemblyIdentity type=\"win32\" name=\"sxs_dll\" version=\"1.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"0000000000000000\"/>" +" <file name=\"sxs_dll.dll\"></file>" +"</assembly>"; + +static const char two_dll_manifest_exe[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"sxs_dll\" version=\"1.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"0000000000000000\" language=\"*\"/>" +" </dependentAssembly>" +" </dependency>" +"</assembly>"; + + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -3171,6 +3187,236 @@ static void test_settings(void) pReleaseActCtx(handle); } + +typedef struct +{ + char path_tmp[MAX_PATH]; + char path_dll[MAX_PATH]; + char path_manifest_exe[MAX_PATH]; + char path_manifest_dll[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + HMODULE module; + void (WINAPI *get_path)(char *buffer, int buffer_size); +} sxs_info; + +static BOOL fill_sxs_info(sxs_info *info, const char *temp, const char *path_dll, const char *exe_manifest, const char *dll_manifest) +{ + BOOL success; + + GetTempPathA(MAX_PATH, info->path_tmp); + strcat(info->path_tmp, temp); + strcat(info->path_tmp, "\\"); + CreateDirectoryA(info->path_tmp, NULL); + + sprintf(info->path_dll, "%s%s", info->path_tmp, "sxs_dll.dll"); + extract_resource(path_dll, "TESTDLL", info->path_dll); + + sprintf(info->path_manifest_exe, "%s%s", info->path_tmp, "exe.manifest"); + create_manifest_file(info->path_manifest_exe, exe_manifest, -1, NULL, NULL); + + sprintf(info->path_manifest_dll, "%s%s", info->path_tmp, "sxs_dll.manifest"); + create_manifest_file(info->path_manifest_dll, dll_manifest, -1, NULL, NULL); + + info->context.cbSize = sizeof(ACTCTXA); + info->context.lpSource = info->path_manifest_exe; + info->context.lpAssemblyDirectory = info->path_tmp; + info->context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + info->handle_context = CreateActCtxA(&info->context); + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE ) + || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX), /* XP doesn't support manifests outside of PE files */ + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + skip("Failed to create activation context.\n"); + return FALSE; + } + + success = ActivateActCtx(info->handle_context, &info->cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + info->module = LoadLibraryA("sxs_dll.dll"); + ok(info->module != NULL, "LoadLibrary failed\n"); + + info->get_path = (void *)GetProcAddress(info->module, "get_path"); + ok(info->get_path != NULL, "GetProcAddress failed\n"); + + DeactivateActCtx(0, info->cookie); + return TRUE; +} + +static void clean_sxs_info(sxs_info *info) +{ + if (info->handle_context) + ReleaseActCtx(info->handle_context); + if (*info->path_dll) + ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + if (*info->path_manifest_exe) + ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + if (*info->path_manifest_dll) + ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + if (*info->path_tmp) + ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); +} + +static void get_application_directory(char *buffer, int buffer_size) +{ + char *end; + GetModuleFileNameA(NULL, buffer, buffer_size); + end = strrchr(buffer, '\\'); + end[1] = 0; +} + +/* Test loading two sxs dlls at the same time */ +static void test_two_dlls_at_same_time(void) +{ + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; + char path1[MAX_PATH], path2[MAX_PATH]; + + if (!fill_sxs_info(&dll_1, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll)) + goto cleanup; + if (!fill_sxs_info(&dll_2, "2", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll)) + goto cleanup; + + todo_wine + ok(dll_1.module != dll_2.module, "Libraries are the same\n"); + dll_1.get_path(path1, sizeof(path1)); + ok(strcmp(path1, dll_1.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll_1.path_dll); + dll_2.get_path(path2, sizeof(path2)); + todo_wine + ok(strcmp(path2, dll_2.path_dll) == 0, "Got '%s', expected '%s'\n", path2, dll_2.path_dll); + +cleanup: + if (dll_1.module) + FreeLibrary(dll_1.module); + if (dll_2.module) + FreeLibrary(dll_2.module); + clean_sxs_info(&dll_1); + clean_sxs_info(&dll_2); +} + +/* Test loading a normal dll and then a sxs dll with the same name */ +static void test_one_sxs_and_one_local_1(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + char path1[MAX_PATH], path2[MAX_PATH]; + void (WINAPI *get_path)(char *buffer, int buffer_size); + + get_application_directory(path_application, sizeof(path_application)); + + sprintf(path_dll_local, "%s%s", path_application, "sxs_dll.dll"); + extract_resource("dummy.dll", "TESTDLL", path_dll_local); + + module = LoadLibraryA(path_dll_local); + get_path = (void *)GetProcAddress(module, "get_path"); + + if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll)) + goto cleanup; + + todo_wine + ok(dll.module != module, "Libraries are the same\n"); + dll.get_path(path1, sizeof(path1)); + todo_wine + ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); + get_path(path2, sizeof(path2)); + ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +/* Test if sxs dll has priority over normal dll */ +static void test_one_sxs_and_one_local_2(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + char path1[MAX_PATH], path2[MAX_PATH]; + void (WINAPI *get_path)(char *buffer, int buffer_size); + + get_application_directory(path_application, sizeof(path_application)); + + sprintf(path_dll_local, "%s%s", path_application, "sxs_dll.dll"); + extract_resource("dummy.dll", "TESTDLL", path_dll_local); + + if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll)) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + get_path = (void *)GetProcAddress(module, "get_path"); + + ok(dll.module != module, "Libraries are the same\n"); + dll.get_path(path1, sizeof(path1)); + ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll); + get_path(path2, sizeof(path2)); + ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +static void run_sxs_test(int run) +{ + switch(run) + { + case 1: + test_two_dlls_at_same_time(); + break; + case 2: + test_one_sxs_and_one_local_1(); + break; + case 3: + test_one_sxs_and_one_local_2(); + break; + } +} + +static void run_child_process_two_dll(int run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s two_dll %d", argv[0], argv[1], run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + START_TEST(actctx) { int argc; @@ -3190,6 +3436,13 @@ START_TEST(actctx) return; } + if (argc > 2 && !strcmp(argv[2], "two_dll")) + { + int run = atoi(argv[3]); + run_sxs_test(run); + return; + } + test_actctx(); test_create_fail(); test_CreateActCtx(); @@ -3198,4 +3451,7 @@ START_TEST(actctx) run_child_process(); test_compatibility(); test_settings(); + run_child_process_two_dll(1); + run_child_process_two_dll(2); + run_child_process_two_dll(3); } diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c index 3053583c76..14d0d90dea 100644 --- a/dlls/kernel32/tests/dummy.c +++ b/dlls/kernel32/tests/dummy.c @@ -1 +1,20 @@ -/* nothing here */ +#include <windows.h> + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = instance_new; + break; + } + + return TRUE; +} + +WINAPI void get_path(char *buffer, int buffer_size) +{ + GetModuleFileNameA(instance, buffer, buffer_size); +} diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec index b2a4ba5910..d227c47895 100644 --- a/dlls/kernel32/tests/dummy.spec +++ b/dlls/kernel32/tests/dummy.spec @@ -1 +1 @@ -# nothing here +@ stdcall get_path(ptr long) -- 2.22.0

3 8

[PATCH] mshtml: Remove redundant assignments.
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/oleobj.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index ba02e811cc..3a27985c37 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -922,7 +922,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS if(V_VT(&res) == VT_BOOL) { if(V_BOOL(&res)) { FIXME("silent mode is not supported\n"); - hres = E_FAIL; } }else { FIXME("silent=%s\n", debugstr_variant(&res)); @@ -935,7 +934,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_USERAGENT\n"); - hres = E_FAIL; return S_OK; case DISPID_AMBIENT_PALETTE: TRACE("(%p)->(DISPID_AMBIENT_PALETTE)\n", This); @@ -944,7 +942,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_PALETTE\n"); - hres = E_FAIL; return S_OK; } -- 2.17.1

2 1

[PATCH] mshtml: Fix a typo.
by Dmitry Timoshkov 17 Jun '19

17 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmlelemcol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 15b58440bb..62c7254c77 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -523,7 +523,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Finish(&tag_str); elem_vector_normalize(&buf); - TRACE("fount %d tags\n", buf.len); + TRACE("found %d tags\n", buf.len); *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, dispex_compat_mode(&This->dispex)); -- 2.20.1

2 1

[PATCH] mshtml: Add better stub for HTMLDocument7::get_onmsthumbnailclick.
by Dmitry Timoshkov 17 Jun '19

17 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 868a9a0048..ee1492d83b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3340,7 +3340,8 @@ static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface { HTMLDocument *This = impl_from_IHTMLDocument7(iface); FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + V_VT(p) = VT_NULL; + return S_OK; } static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191a6e..e152c4fc25 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7014,6 +7014,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + VARIANT v; IDispatch *disp; test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); @@ -7045,6 +7046,12 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + memset(&v, 0xcc, sizeof(v)); + hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); + ok(hres == S_OK, "get_onmsthumbnailclick returned: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "got %u\n", V_VT(&v)); + ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); -- 2.20.1

2 1

[PATCH] dxgi: Fix SetFullscreenState return values after window is destroyed
by Andrew Eikum 17 Jun '19

17 Jun '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 3 ++- dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 24 ++++++++++++++++++------ 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d8..69db2c32ab6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -397,7 +397,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (target) IDXGIOutput_Release(target); - return hr; + + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15c..68e49ee6e5f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2282,6 +2282,40 @@ static void test_set_fullscreen(void) ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd9ec123c20..24a8c0ce527 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1475,6 +1475,10 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha { /* Switch from windowed to fullscreen */ HWND focus_window = device->create_parms.focus_window; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + if (!focus_window) focus_window = swapchain->device_window; if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) @@ -1485,10 +1489,15 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); } - else + else if (swapchain->d3d_mode.width != width || + swapchain->d3d_mode.height != height) { /* Fullscreen -> fullscreen mode change */ BOOL filter_messages = device->filter_messages; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + device->filter_messages = TRUE; MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); @@ -1501,11 +1510,14 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha else if (!swapchain->desc.windowed) { /* Fullscreen -> windowed switch */ - RECT *window_rect = NULL; - if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) - window_rect = &swapchain->original_window_rect; - wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); - wined3d_device_release_focus_window(device); + if (IsWindow(swapchain->device_window)) + { + RECT *window_rect = NULL; + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + window_rect = &swapchain->original_window_rect; + wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); + wined3d_device_release_focus_window(device); + } } swapchain->desc.windowed = swapchain_desc->windowed; -- 2.22.0

1 0

[PATCH] xaudio2: Fix some TRACE calls erroneously marked as stubs
by elee＠codeweavers.com 17 Jun '19

17 Jun '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index cbbedc4f7f..da21cc0353 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1806,7 +1806,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p): stub!\n", This, pPerfData); + TRACE("(%p)->(%p)\n", This, pPerfData); FAudio_GetPerformanceData(This->faudio, (FAudioPerformanceData *)pPerfData); } @@ -1817,7 +1817,7 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + TRACE("(%p)->(%p, %p)\n", This, pDebugConfiguration, pReserved); FAudio_SetDebugConfiguration(This->faudio, (FAudioDebugConfiguration *)pDebugConfiguration, pReserved); } -- 2.21.0

3 2

[PATCH] po: Update on Brazilian Portuguese translation
by Roberto Pungartnik 17 Jun '19

17 Jun '19

1 0

[PATCH 5/5] wined3d: Use texture2d_load_sysmem() in texture1d_load_location().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 62 ++------------------------- dlls/wined3d/texture.c | 97 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++------ 3 files changed, 81 insertions(+), 116 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d67e52afa2..33b60d2bc0b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -138,15 +138,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct checkGLcall("glBlitFramebuffer()"); } -static BOOL is_multisample_location(const struct wined3d_texture_gl *texture_gl, DWORD location) -{ - if (location == WINED3D_LOCATION_RB_MULTISAMPLE) - return TRUE; - if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) - return FALSE; - return texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; -} - /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, @@ -185,7 +176,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont } /* Resolve the source surface first if needed. */ - if (is_multisample_location(wined3d_texture_gl(src_texture), src_location) + if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) @@ -708,7 +699,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) { struct wined3d_resource *resource = &texture->resource; @@ -1432,52 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) -{ - struct wined3d_texture_sub_resource *sub_resource; - - sub_resource = &texture->sub_resources[sub_resource_idx]; - wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - - /* We cannot download data from multisample textures directly. */ - if (is_multisample_location(wined3d_texture_gl(texture), WINED3D_LOCATION_TEXTURE_RGB)) - { - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - texture2d_read_from_framebuffer(texture, sub_resource_idx, context, - WINED3D_LOCATION_RB_RESOLVED, dst_location); - return TRUE; - } - - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - - /* Download the sub-resource to system memory. */ - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - return TRUE; - } - - if (!(texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) - { - texture2d_read_from_framebuffer(texture, sub_resource_idx, context, - texture->resource.draw_binding, dst_location); - return TRUE; - } - - FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", - texture, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); - return FALSE; -} - -/* Context activation is done by the caller. */ BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { @@ -3359,7 +3304,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because of format conversion.\n"); else if (src_texture->resource.format->conv_byte_count) TRACE("Not doing download because the source format needs conversion.\n"); - else if (is_multisample_location(wined3d_texture_gl(src_texture), WINED3D_LOCATION_TEXTURE_RGB)) + else if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), + WINED3D_LOCATION_TEXTURE_RGB)) TRACE("Not doing download because of multisample source.\n"); else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 16f0a56875f..13ebd311718 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2433,6 +2433,53 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int } } +/* Context activation is done by the caller. */ +static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, DWORD dst_location) +{ + struct wined3d_texture_sub_resource *sub_resource; + + sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; + wined3d_texture_prepare_location(&texture_gl->t, sub_resource_idx, &context_gl->c, dst_location); + + /* We cannot download data from multisample textures directly. */ + if (wined3d_texture_gl_is_multisample_location(texture_gl, WINED3D_LOCATION_TEXTURE_RGB)) + { + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_RB_RESOLVED); + texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, + WINED3D_LOCATION_RB_RESOLVED, dst_location); + return TRUE; + } + + if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_TEXTURE_RGB); + + /* Download the sub-resource to system memory. */ + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + struct wined3d_bo_address data; + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, + !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, dst_location); + wined3d_texture_download_data(&texture_gl->t, sub_resource_idx, &context_gl->c, &data); + ++texture_gl->t.download_count; + return TRUE; + } + + if (!(texture_gl->t.resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) + { + texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, + texture_gl->t.resource.draw_binding, dst_location); + return TRUE; + } + + FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", + texture_gl, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); + + return FALSE; +} + /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) @@ -2445,7 +2492,8 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - return texture2d_load_sysmem(texture, sub_resource_idx, context, location); + return wined3d_texture_gl_load_sysmem(wined3d_texture_gl(texture), + sub_resource_idx, wined3d_context_gl(context), location); case WINED3D_LOCATION_DRAWABLE: return texture2d_load_drawable(texture, sub_resource_idx, context); @@ -2845,6 +2893,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; @@ -2864,8 +2913,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2876,8 +2924,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, - location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2891,46 +2938,8 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in break; case WINED3D_LOCATION_SYSMEM: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {0, texture->resource.heap_memory}; - - data.addr += sub_resource->offset; - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - } - else - { - FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; - case WINED3D_LOCATION_BUFFER: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; - - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - } - else - { - FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); default: FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbcc6acf164..aebaa9ed2f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3372,6 +3372,18 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define RESOURCE_ALIGNMENT 16 #define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16 +#define WINED3D_LOCATION_DISCARDED 0x00000001 +#define WINED3D_LOCATION_SYSMEM 0x00000002 +#define WINED3D_LOCATION_USER_MEMORY 0x00000004 +#define WINED3D_LOCATION_BUFFER 0x00000008 +#define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 +#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020 +#define WINED3D_LOCATION_DRAWABLE 0x00000040 +#define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 +#define WINED3D_LOCATION_RB_RESOLVED 0x00000100 + +const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; + struct wined3d_blt_info { GLenum bind_target; @@ -3533,10 +3545,10 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned i BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; -BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; @@ -3622,6 +3634,16 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win ? cube_targets[sub_resource_idx / texture_gl->t.level_count] : texture_gl->target; } +static inline BOOL wined3d_texture_gl_is_multisample_location(const struct wined3d_texture_gl *texture_gl, + DWORD location) +{ + if (location == WINED3D_LOCATION_RB_MULTISAMPLE) + return TRUE; + if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) + return FALSE; + return texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; +} + void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, @@ -3634,18 +3656,6 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -#define WINED3D_LOCATION_DISCARDED 0x00000001 -#define WINED3D_LOCATION_SYSMEM 0x00000002 -#define WINED3D_LOCATION_USER_MEMORY 0x00000004 -#define WINED3D_LOCATION_BUFFER 0x00000008 -#define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 -#define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020 -#define WINED3D_LOCATION_DRAWABLE 0x00000040 -#define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 -#define WINED3D_LOCATION_RB_RESOLVED 0x00000100 - -const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; - struct wined3d_renderbuffer_entry { struct list entry; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_apply_blit_projection().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0aaeac76002..ea9f1763908 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2870,9 +2870,10 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, checkGLcall("blit state application"); } -static void context_apply_blit_projection(const struct wined3d_context *context, unsigned int w, unsigned int h) +static void wined3d_context_gl_apply_blit_projection(const struct wined3d_context_gl *context_gl, + unsigned int w, unsigned int h) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const GLdouble projection[] = { 2.0 / w, 0.0, 0.0, 0.0, @@ -2904,7 +2905,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ wined3d_context_gl_get_rt_size(context_gl, &rt_size); if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) - context_apply_blit_projection(context, rt_size.cx, rt_size.cy); + wined3d_context_gl_apply_blit_projection(context_gl, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); checkGLcall("ffp blit state application"); @@ -2958,7 +2959,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glLoadIdentity(); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context_apply_blit_projection(context, context_gl->blit_size.cx, context_gl->blit_size.cy); + wined3d_context_gl_apply_blit_projection(context_gl, context_gl->blit_size.cx, context_gl->blit_size.cy); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); /* Other misc states. */ -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_set_render_offscreen().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66c7d79c19c..0aaeac76002 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2685,23 +2685,23 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } -static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) +static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { - if (context->render_offscreen == offscreen) + if (context_gl->c.render_offscreen == offscreen) return; - context_invalidate_state(context, STATE_VIEWPORT); - context_invalidate_state(context, STATE_SCISSORRECT); - if (!context->gl_info->supported[ARB_CLIP_CONTROL]) + context_invalidate_state(&context_gl->c, STATE_VIEWPORT); + context_invalidate_state(&context_gl->c, STATE_SCISSORRECT); + if (!context_gl->c.gl_info->supported[ARB_CLIP_CONTROL]) { - context_invalidate_state(context, STATE_RASTERIZER); - context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN); - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + context_invalidate_state(&context_gl->c, STATE_RASTERIZER); + context_invalidate_state(&context_gl->c, STATE_POINTSPRITECOORDORIGIN); + context_invalidate_state(&context_gl->c, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); - if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); - context->render_offscreen = offscreen; + context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); + if (context_gl->c.gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + context_gl->c.render_offscreen = offscreen; } GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) @@ -3928,7 +3928,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, return FALSE; } - context_set_render_offscreen(context, TRUE); + wined3d_context_gl_set_render_offscreen(context_gl, TRUE); } /* Preload resources before FBO setup. Texture preload in particular may @@ -4126,6 +4126,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); render_offscreen = wined3d_resource_is_offscreen(&texture->resource); if (context->current_rt.texture == texture @@ -4181,7 +4182,7 @@ static void context_setup_target(struct wined3d_context *context, context->current_rt.texture = texture; context->current_rt.sub_resource_idx = sub_resource_idx; - context_set_render_offscreen(context, render_offscreen); + wined3d_context_gl_set_render_offscreen(context_gl, render_offscreen); } static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a787a290e5..66c7d79c19c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2444,9 +2444,9 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) +static void wined3d_context_gl_apply_draw_buffers(struct wined3d_context_gl *context_gl, uint32_t rt_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum draw_buffers[MAX_RENDER_TARGET_VIEWS]; if (!rt_mask) @@ -2775,7 +2775,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } @@ -3079,7 +3079,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(&context_gl->c, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); } @@ -3195,7 +3195,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; @@ -3451,7 +3451,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_create_fbo_entry().
by Henri Verbeet 17 Jun '19

17 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6258771976a..6a787a290e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -514,12 +514,11 @@ static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); } -static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, +static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3d_context_gl *context_gl, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); @@ -691,7 +690,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex if (context_gl->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) { - entry = context_create_fbo_entry(&context_gl->c, render_targets, depth_stencil, color_location, ds_location); + entry = wined3d_context_gl_create_fbo_entry(context_gl, + render_targets, depth_stencil, color_location, ds_location); list_add_head(&context_gl->fbo_list, &entry->entry); ++context_gl->fbo_entry_count; } -- 2.11.0

1 0

[PATCH 2/2] bcrypt: Add support for BCRYPT_RSA_SIGN_ALGORITHM.
by Hans Leidekker 17 Jun '19

17 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47371 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 1 + dlls/bcrypt/tests/bcrypt.c | 47 ++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 2 ++ 3 files changed, 50 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 86073bbab0..3846341644 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -193,6 +193,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_RSA_ALGORITHM )) alg_id = ALG_ID_RSA; + else if (!strcmpW( id, BCRYPT_RSA_SIGN_ALGORITHM )) alg_id = ALG_ID_RSA; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 8e57d53e21..11e274bc5f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1808,6 +1808,52 @@ static void test_RSA(void) ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); } +static void test_RSA_SIGN(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_SIGN_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA_SIGN provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + static BYTE eccprivkey[] = { 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, 0xfb, 0xbd, 0x3d, 0x20, 0x1b, 0x6d, 0x66, 0xb3, @@ -1963,6 +2009,7 @@ START_TEST(bcrypt) test_key_import_export(); test_ECDSA(); test_RSA(); + test_RSA_SIGN(); test_ECDH(); test_BCryptEnumContextFunctions(); diff --git a/include/bcrypt.h b/include/bcrypt.h index 8947d130f9..4638e51dcf 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -76,6 +76,7 @@ typedef LONG NTSTATUS; #define BCRYPT_MD5_ALGORITHM L"MD5" #define BCRYPT_RNG_ALGORITHM L"RNG" #define BCRYPT_RSA_ALGORITHM L"RSA" +#define BCRYPT_RSA_SIGN_ALGORITHM L"RSA_SIGN" #define BCRYPT_SHA1_ALGORITHM L"SHA1" #define BCRYPT_SHA256_ALGORITHM L"SHA256" #define BCRYPT_SHA384_ALGORITHM L"SHA384" @@ -129,6 +130,7 @@ static const WCHAR BCRYPT_MD4_ALGORITHM[] = {'M','D','4',0}; static const WCHAR BCRYPT_MD5_ALGORITHM[] = {'M','D','5',0}; static const WCHAR BCRYPT_RNG_ALGORITHM[] = {'R','N','G',0}; static const WCHAR BCRYPT_RSA_ALGORITHM[] = {'R','S','A',0}; +static const WCHAR BCRYPT_RSA_SIGN_ALGORITHM[] = {'R','S','A','_','S','I','G','N',0}; static const WCHAR BCRYPT_SHA1_ALGORITHM[] = {'S','H','A','1',0}; static const WCHAR BCRYPT_SHA256_ALGORITHM[] = {'S','H','A','2','5','6',0}; static const WCHAR BCRYPT_SHA384_ALGORITHM[] = {'S','H','A','3','8','4',0}; -- 2.20.1

1 0

[PATCH 1/2] bcrypt: Add stub implementations of BCryptEnumContextFunctions and BCryptFreeBuffer.
by Hans Leidekker 17 Jun '19

17 Jun '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 4 ++-- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- include/bcrypt.h | 11 +++++++++++ include/ncrypt.h | 5 +++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 4946ee5d79..1ea3760ba2 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -17,14 +17,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) @ stdcall BCryptFinalizeKeyPair(ptr long) @ stdcall BCryptFinishHash(ptr ptr long long) -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) @ stdcall BCryptGenRandom(ptr ptr long long) @ stdcall BCryptGenerateKeyPair(ptr ptr long long) @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 399626d19b..86073bbab0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -68,6 +68,18 @@ NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG iface, ULONG *buflen, + CRYPT_CONTEXT_FUNCTIONS **buffer ) +{ + FIXME( "%u, %s, %u, %p, %p\n", table, debugstr_w(ctx), iface, buflen, buffer ); + return STATUS_NOT_IMPLEMENTED; +} + +void WINAPI BCryptFreeBuffer( void *buffer ) +{ + FIXME( "%p\n", buffer ); +} + NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) { FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index a8bc43ce3d..8e57d53e21 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -23,6 +23,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <bcrypt.h> +#include <ncrypt.h> #include "wine/test.h" @@ -39,9 +40,11 @@ static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_H static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptEnumContextFunctions)(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptFinalizeKeyPair)(BCRYPT_KEY_HANDLE, ULONG); static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static void (WINAPI *pBCryptFreeBuffer)(void *); static NTSTATUS (WINAPI *pBCryptGenerateKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptGenerateSymmetricKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -1896,6 +1899,19 @@ static void test_ECDH(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static void test_BCryptEnumContextFunctions(void) +{ + static const WCHAR sslW[] = {'S','S','L',0}; + CRYPT_CONTEXT_FUNCTIONS *buffer; + NTSTATUS status; + ULONG buflen; + + buffer = NULL; + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); + if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); +} + START_TEST(bcrypt) { HMODULE module; @@ -1916,9 +1932,11 @@ START_TEST(bcrypt) pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash"); pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); + pBCryptEnumContextFunctions = (void *)GetProcAddress(module, "BCryptEnumContextFunctions"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); pBCryptFinalizeKeyPair = (void *)GetProcAddress(module, "BCryptFinalizeKeyPair"); pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash"); + pBCryptFreeBuffer = (void *)GetProcAddress(module, "BCryptFreeBuffer"); pBCryptGenerateKeyPair = (void *)GetProcAddress(module, "BCryptGenerateKeyPair"); pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom"); @@ -1946,6 +1964,7 @@ START_TEST(bcrypt) test_ECDSA(); test_RSA(); test_ECDH(); + test_BCryptEnumContextFunctions(); FreeLibrary(module); } diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d35f8a9316..dfe715db9c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -18,14 +18,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) bcrypt.BCryptEnumContextFunctions @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey @ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom @ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey diff --git a/include/bcrypt.h b/include/bcrypt.h index 0151afdc36..8947d130f9 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -293,6 +293,15 @@ typedef PVOID BCRYPT_SECRET_HANDLE; /* Flags for BCryptCreateHash */ #define BCRYPT_HASH_REUSABLE_FLAG 0x00000020 +#define CRYPT_LOCAL 0x00000001 +#define CRYPT_DOMAIN 0x00000002 + +typedef struct _CRYPT_CONTEXT_FUNCTIONS +{ + ULONG cFunctions; + WCHAR **rgpszFunctions; +} CRYPT_CONTEXT_FUNCTIONS, *PCRYPT_CONTEXT_FUNCTIONS; + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); @@ -304,8 +313,10 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); +NTSTATUS WINAPI BCryptEnumContextFunctions(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE, ULONG); NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +void WINAPI BCryptFreeBuffer(void *); NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); diff --git a/include/ncrypt.h b/include/ncrypt.h index 2bfdae0652..85ced7a2fb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -38,6 +38,11 @@ typedef ULONG_PTR NCRYPT_KEY_HANDLE; typedef ULONG_PTR NCRYPT_HASH_HANDLE; typedef ULONG_PTR NCRYPT_SECRET_HANDLE; +#define NCRYPT_KEY_STORAGE_INTERFACE 0x00010001 +#define NCRYPT_SCHANNEL_INTERFACE 0x00010002 +#define NCRYPT_SCHANNEL_SIGNATURE_INTERFACE 0x00010003 +#define NCRYPT_KEY_PROTECTION_INTERFACE 0x00010004 + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); -- 2.20.1

1 0

[PATCH v2] advapi32: Dont read a value that might be uninitialized. (Coverity)
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Supersedes 166626. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6b..2d2c1be4dc 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2118,7 +2118,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; -- 2.17.1

1 0

[PATCH] wininet: Remove unsued flag HTTP_ADDHDR_FLAG_COALESCE.
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

This flag has the same value as HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA which is used in multiple places. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54bb569eb9..cbc95fb8ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -137,7 +137,6 @@ static const WCHAR emptyW[] = {0}; #define HTTP_ADDHDR_FLAG_ADD 0x20000000 #define HTTP_ADDHDR_FLAG_ADD_IF_NEW 0x10000000 -#define HTTP_ADDHDR_FLAG_COALESCE 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON 0x01000000 #define HTTP_ADDHDR_FLAG_REPLACE 0x80000000 @@ -6047,7 +6046,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { -- 2.17.1

1 0

[PATCH] advapi32: Dont read a value that might be uninitialized. (Coverity)
by Alistair Leslie-Hughes 17 Jun '19

17 Jun '19

Supersedes 166626. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6b..4f7f0ee7d5 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; -- 2.17.1

2 1

[PATCH 1/5] qcap/avimux: Store the source pin and AVI data inline in the AviMux structure.
by Zebediah Figura 17 Jun '19

17 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 193 +++++++++++++++++++++------------------------ 1 file changed, 92 insertions(+), 101 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 9dcff5074e6..784d93a57c4 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -39,22 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define AVISTDINDEX_ENTRIES 4000 #define ALIGN(x) ((x+1)/2*2) -typedef struct { - BaseOutputPin pin; - IQualityControl IQualityControl_iface; - - int cur_stream; - LONGLONG cur_time; - - int buf_pos; - BYTE buf[65536]; - - int movi_off; - int out_pos; - int size; - IStream *stream; -} AviMuxOut; - typedef struct { BaseInputPin pin; IAMStreamControl IAMStreamControl_iface; @@ -97,7 +81,9 @@ typedef struct { REFERENCE_TIME interleave; REFERENCE_TIME preroll; - AviMuxOut *out; + BaseOutputPin source; + IQualityControl IQualityControl_iface; + int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -107,6 +93,17 @@ typedef struct { int idx1_entries; int idx1_size; AVIINDEXENTRY *idx1; + + int cur_stream; + LONGLONG cur_time; + + int buf_pos; + BYTE buf[65536]; + + int movi_off; + int out_pos; + int size; + IStream *stream; } AviMux; static HRESULT create_input_pin(AviMux*); @@ -121,7 +118,7 @@ static IPin *avi_mux_get_pin(BaseFilter *iface, unsigned int index) AviMux *filter = impl_from_BaseFilter(iface); if (!index) - return &filter->out->pin.pin.IPin_iface; + return &filter->source.pin.IPin_iface; else if (index <= filter->input_pin_no) return &filter->in[index - 1]->pin.pin.IPin_iface; return NULL; @@ -132,7 +129,7 @@ static void avi_mux_destroy(BaseFilter *iface) AviMux *filter = impl_from_BaseFilter(iface); int i; - BaseOutputPinImpl_Release(&filter->out->pin.pin.IPin_iface); + strmbase_source_cleanup(&filter->source); for (i = 0; i < filter->input_pin_no; ++i) { @@ -187,16 +184,16 @@ static HRESULT out_flush(AviMux *This) ULONG written; HRESULT hr; - if(!This->out->buf_pos) + if(!This->buf_pos) return S_OK; - hr = IStream_Write(This->out->stream, This->out->buf, This->out->buf_pos, &written); + hr = IStream_Write(This->stream, This->buf, This->buf_pos, &written); if(FAILED(hr)) return hr; - if(written != This->out->buf_pos) + if (written != This->buf_pos) return E_FAIL; - This->out->buf_pos = 0; + This->buf_pos = 0; return S_OK; } @@ -210,13 +207,13 @@ static HRESULT out_seek(AviMux *This, int pos) return hr; li.QuadPart = pos; - hr = IStream_Seek(This->out->stream, li, STREAM_SEEK_SET, NULL); + hr = IStream_Seek(This->stream, li, STREAM_SEEK_SET, NULL); if(FAILED(hr)) return hr; - This->out->out_pos = pos; - if(This->out->out_pos > This->out->size) - This->out->size = This->out->out_pos; + This->out_pos = pos; + if(This->out_pos > This->size) + This->size = This->out_pos; return hr; } @@ -226,18 +223,18 @@ static HRESULT out_write(AviMux *This, const void *data, int size) HRESULT hr; while(1) { - if(size > sizeof(This->out->buf)-This->out->buf_pos) - chunk_size = sizeof(This->out->buf)-This->out->buf_pos; + if (size > sizeof(This->buf) - This->buf_pos) + chunk_size = sizeof(This->buf) - This->buf_pos; else chunk_size = size; - memcpy(This->out->buf + This->out->buf_pos, data, chunk_size); + memcpy(This->buf + This->buf_pos, data, chunk_size); size -= chunk_size; data = (const BYTE*)data + chunk_size; - This->out->buf_pos += chunk_size; - This->out->out_pos += chunk_size; - if(This->out->out_pos > This->out->size) - This->out->size = This->out->out_pos; + This->buf_pos += chunk_size; + This->out_pos += chunk_size; + if (This->out_pos > This->size) + This->size = This->out_pos; if(!size) break; @@ -278,7 +275,7 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) DWORD flags; HRESULT hr; - if(avimux->out->cur_stream != avimuxin->stream_id) + if (avimux->cur_stream != avimuxin->stream_id) return S_OK; while(avimuxin->samples_head) { @@ -301,17 +298,18 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) if(IMediaSample_IsSyncPoint(sample) == S_OK) flags |= AM_SAMPLE_SPLICEPOINT; - if(avimuxin->stream_time + (closing ? 0 : avimuxin->strh.dwScale) > avimux->out->cur_time && - !(flags & AM_SAMPLE_TIMEDISCONTINUITY)) { + if (avimuxin->stream_time + (closing ? 0 : avimuxin->strh.dwScale) > avimux->cur_time + && !(flags & AM_SAMPLE_TIMEDISCONTINUITY)) + { if(closing) break; - avimux->out->cur_stream++; - if(avimux->out->cur_stream >= avimux->input_pin_no-1) { - avimux->out->cur_time += avimux->interleave; - avimux->out->cur_stream = 0; + avimux->cur_stream++; + if(avimux->cur_stream >= avimux->input_pin_no-1) { + avimux->cur_time += avimux->interleave; + avimux->cur_stream = 0; } - avimuxin = avimux->in[avimux->out->cur_stream]; + avimuxin = avimux->in[avimux->cur_stream]; continue; } @@ -333,8 +331,8 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) avimuxin->ix->nEntriesInUse = 0; avimuxin->ix->qwBaseOffset = 0; - avimuxin->ix_off = avimux->out->size; - avimux->out->size += sizeof(avimuxin->ix_data); + avimuxin->ix_off = avimux->size; + avimux->size += sizeof(avimuxin->ix_data); } if(*head_prev == avimuxin->samples_head) @@ -346,11 +344,11 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) avimuxin->strh.dwLength++; if(!(flags & AM_SAMPLE_TIMEDISCONTINUITY)) { if(!avimuxin->ix->qwBaseOffset) - avimuxin->ix->qwBaseOffset = avimux->out->size; - avimuxin->ix->aIndex[avimuxin->ix->nEntriesInUse].dwOffset = avimux->out->size - + sizeof(RIFFCHUNK) - avimuxin->ix->qwBaseOffset; + avimuxin->ix->qwBaseOffset = avimux->size; + avimuxin->ix->aIndex[avimuxin->ix->nEntriesInUse].dwOffset = + avimux->size + sizeof(RIFFCHUNK) - avimuxin->ix->qwBaseOffset; - hr = out_seek(avimux, avimux->out->size); + hr = out_seek(avimux, avimux->size); if(FAILED(hr)) { IMediaSample_Release(sample); return hr; @@ -365,7 +363,7 @@ static HRESULT flush_queue(AviMux *avimux, AviMuxIn *avimuxin, BOOL closing) rf.cb = size; hr = idx1_add_entry(avimux, rf.fcc, flags & AM_SAMPLE_SPLICEPOINT ? AVIIF_KEYFRAME : 0, flags & AM_SAMPLE_TIMEDISCONTINUITY ? - avimux->idx1[avimux->idx1_entries-1].dwChunkOffset : avimux->out->size, size); + avimux->idx1[avimux->idx1_entries-1].dwChunkOffset : avimux->size, size); if(FAILED(hr)) { IMediaSample_Release(sample); return hr; @@ -432,26 +430,27 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) if(This->filter.state == State_Stopped) return S_OK; - if(This->out->stream) { + if (This->stream) + { AVIEXTHEADER dmlh; RIFFCHUNK rc; RIFFLIST rl; int idx1_off, empty_stream; - empty_stream = This->out->cur_stream; + empty_stream = This->cur_stream; for(i=empty_stream+1; ; i++) { if(i >= This->input_pin_no-1) i = 0; if(i == empty_stream) break; - This->out->cur_stream = i; - hr = flush_queue(This, This->in[This->out->cur_stream], TRUE); + This->cur_stream = i; + hr = flush_queue(This, This->in[This->cur_stream], TRUE); if(FAILED(hr)) return hr; } - idx1_off = This->out->size; + idx1_off = This->size; rc.fcc = ckidAVIOLDINDEX; rc.cb = This->idx1_entries * sizeof(*This->idx1); hr = out_write(This, &rc, sizeof(rc)); @@ -495,14 +494,14 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) return hr; rl.fcc = FCC('R','I','F','F'); - rl.cb = This->out->size-sizeof(RIFFCHUNK)-2*sizeof(int); + rl.cb = This->size - sizeof(RIFFCHUNK) - 2 * sizeof(int); rl.fccListType = FCC('A','V','I',' '); hr = out_write(This, &rl, sizeof(rl)); if(FAILED(hr)) return hr; rl.fcc = FCC('L','I','S','T'); - rl.cb = This->out->movi_off - sizeof(RIFFLIST) - sizeof(RIFFCHUNK); + rl.cb = This->movi_off - sizeof(RIFFLIST) - sizeof(RIFFCHUNK); rl.fccListType = FCC('h','d','r','l'); hr = out_write(This, &rl, sizeof(rl)); if(FAILED(hr)) @@ -550,13 +549,13 @@ static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) dmlh.dwGrandFrames = This->in[0]->strh.dwLength; hr = out_write(This, &dmlh, sizeof(dmlh)); - rl.cb = idx1_off - This->out->movi_off - sizeof(RIFFCHUNK); + rl.cb = idx1_off - This->movi_off - sizeof(RIFFCHUNK); rl.fccListType = FCC('m','o','v','i'); out_write(This, &rl, sizeof(rl)); out_flush(This); - IStream_Release(This->out->stream); - This->out->stream = NULL; + IStream_Release(This->stream); + This->stream = NULL; } This->filter.state = State_Stopped; @@ -611,9 +610,10 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) IMediaSeeking_Release(ms); } - if(This->out->pin.pMemInputPin) { - hr = IMemInputPin_QueryInterface(This->out->pin.pMemInputPin, - &IID_IStream, (void**)&This->out->stream); + if (This->source.pMemInputPin) + { + hr = IMemInputPin_QueryInterface(This->source.pMemInputPin, + &IID_IStream, (void **)&This->stream); if(FAILED(hr)) return hr; } @@ -626,7 +626,7 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return E_OUTOFMEMORY; } - This->out->size = 3*sizeof(RIFFLIST) + sizeof(AVIMAINHEADER) + sizeof(AVIEXTHEADER); + This->size = 3*sizeof(RIFFLIST) + sizeof(AVIMAINHEADER) + sizeof(AVIEXTHEADER); This->start = -1; This->stop = -1; memset(&This->avih, 0, sizeof(This->avih)); @@ -635,34 +635,35 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) continue; This->avih.dwStreams++; - This->out->size += sizeof(RIFFLIST) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) - + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); + This->size += sizeof(RIFFLIST) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) + + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); This->in[i]->strh.dwScale = MulDiv(This->in[i]->avg_time_per_frame, This->interleave, 10000000); This->in[i]->strh.dwRate = This->interleave; hr = IMemAllocator_Commit(This->in[i]->pin.pAllocator); if(FAILED(hr)) { - if(This->out->stream) { - IStream_Release(This->out->stream); - This->out->stream = NULL; + if (This->stream) + { + IStream_Release(This->stream); + This->stream = NULL; } return hr; } } - This->out->movi_off = This->out->size; - This->out->size += sizeof(RIFFLIST); + This->movi_off = This->size; + This->size += sizeof(RIFFLIST); - idx1_add_entry(This, FCC('7','F','x','x'), 0, This->out->movi_off+sizeof(RIFFLIST), 0); + idx1_add_entry(This, FCC('7','F','x','x'), 0, This->movi_off + sizeof(RIFFLIST), 0); stream_id = 0; for(i=0; i<This->input_pin_no; i++) { if(!This->in[i]->pin.pin.pConnectedTo) continue; - This->in[i]->ix_off = This->out->size; - This->out->size += sizeof(This->in[i]->ix_data); + This->in[i]->ix_off = This->size; + This->size += sizeof(This->in[i]->ix_data); This->in[i]->ix->fcc = FCC('i','x','0'+stream_id/10,'0'+stream_id%10); This->in[i]->ix->cb = sizeof(This->in[i]->ix_data) - sizeof(RIFFCHUNK); This->in[i]->ix->wLongsPerEntry = 2; @@ -680,8 +681,8 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->in[i]->stream_id = stream_id++; } - This->out->buf_pos = 0; - This->out->out_pos = 0; + This->buf_pos = 0; + This->out_pos = 0; This->avih.fcc = ckidMAINAVIHEADER; This->avih.cb = sizeof(AVIMAINHEADER) - sizeof(RIFFCHUNK); @@ -813,9 +814,9 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( return E_INVALIDARG; if(This->mode != mode) { - if(This->out->pin.pin.pConnectedTo) { + if(This->source.pin.pConnectedTo) { HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, - &This->out->pin.pin.IPin_iface); + &This->source.pin.IPin_iface); if(FAILED(hr)) return hr; } @@ -1229,12 +1230,9 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { AviMuxOut_DecideAllocator, }; -static inline AviMux* impl_from_out_IPin(IPin *iface) +static inline AviMux *impl_from_out_IPin(IPin *iface) { - BasePin *bp = CONTAINING_RECORD(iface, BasePin, IPin_iface); - IBaseFilter *bf = bp->pinInfo.pFilter; - - return impl_from_IBaseFilter(bf); + return CONTAINING_RECORD(iface, AviMux, source.pin.IPin_iface); } static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) @@ -1246,7 +1244,7 @@ static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void ** if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if(IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->out->IQualityControl_iface; + *ppv = &This->IQualityControl_iface; else { FIXME("no interface for %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -1431,15 +1429,14 @@ static const IPinVtbl AviMuxOut_PinVtbl = { static inline AviMux* impl_from_out_IQualityControl(IQualityControl *iface) { - AviMuxOut *amo = CONTAINING_RECORD(iface, AviMuxOut, IQualityControl_iface); - return impl_from_IBaseFilter(amo->pin.pin.pinInfo.pFilter); + return CONTAINING_RECORD(iface, AviMux, IQualityControl_iface); } static HRESULT WINAPI AviMuxOut_QualityControl_QueryInterface( IQualityControl *iface, REFIID riid, void **ppv) { AviMux *This = impl_from_out_IQualityControl(iface); - return IPin_QueryInterface(&This->out->pin.pin.IPin_iface, riid, ppv); + return IPin_QueryInterface(&This->source.pin.IPin_iface, riid, ppv); } static ULONG WINAPI AviMuxOut_QualityControl_AddRef(IQualityControl *iface) @@ -2084,10 +2081,10 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveCanBlock(IMemInputPin *iface) TRACE("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); - if(!This->out->pin.pMemInputPin) + if(!This->source.pMemInputPin) return S_FALSE; - hr = IMemInputPin_ReceiveCanBlock(This->out->pin.pMemInputPin); + hr = IMemInputPin_ReceiveCanBlock(This->source.pMemInputPin); return hr != S_FALSE ? S_OK : S_FALSE; } @@ -2289,22 +2286,16 @@ IUnknown * WINAPI QCAP_createAVIMux(IUnknown *outer, HRESULT *phr) info.dir = PINDIR_OUTPUT; info.pFilter = &avimux->filter.IBaseFilter_iface; lstrcpyW(info.achName, output_name); - hr = BaseOutputPin_Construct(&AviMuxOut_PinVtbl, sizeof(AviMuxOut), &info, - &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter, (IPin**)&avimux->out); - if(FAILED(hr)) { - strmbase_filter_cleanup(&avimux->filter); - HeapFree(GetProcessHeap(), 0, avimux); - *phr = hr; - return NULL; - } - avimux->out->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; - avimux->out->cur_stream = 0; - avimux->out->cur_time = 0; - avimux->out->stream = NULL; + strmbase_source_init(&avimux->source, &AviMuxOut_PinVtbl, &info, + &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter); + avimux->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; + avimux->cur_stream = 0; + avimux->cur_time = 0; + avimux->stream = NULL; hr = create_input_pin(avimux); if(FAILED(hr)) { - BaseOutputPinImpl_Release(&avimux->out->pin.pin.IPin_iface); + strmbase_source_cleanup(&avimux->source); strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; -- 2.21.0

1 4

[PATCH 3/3] usp10: Fix advance width when glyph is missing.
by Akihiro Sagawa 16 Jun '19

16 Jun '19

This fixes a regression introduced by 8d018d8d1dadf9d731690567b9c98d5a9eae37db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47327 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/tests/usp10.c | 4 ++-- dlls/usp10/usp10.c | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-)

2 1

[PATCH 2/3] usp10/tests: Add advance width tests with CJK bitmap font.
by Akihiro Sagawa 16 Jun '19

16 Jun '19

We should use associated glyph's advance width instead of the default one. Because, when using CJK bitmap system font, full-width character (e.g. Hiragana) is rendered with associated font. The glyph is different from the default glyph. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/tests/usp10.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)

2 1

[PATCH 1/3] usp10: Cache ScriptString_pSize value, again.
by Akihiro Sagawa 16 Jun '19

16 Jun '19

Fixes a harmless regression caused by c5b41a45f92830fe64306e5b343cf0cc336fcd14. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/usp10/usp10.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH] dpnet: Initialize size variable. (Coverity)
by Alistair Leslie-Hughes 16 Jun '19

16 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..3df07749c5 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { -- 2.20.1

3 3

[PATCH] advapi32: Return on failed allocation (Coverity)
by André Hentschel 16 Jun '19

16 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898c6be..2b2ca65e5b2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3261,7 +3261,7 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, size = GetFullPathNameW(file_name, 0, NULL, NULL); full_name = heap_alloc(size * sizeof(WCHAR)); - if (!size) + if (!full_name) return GetLastError(); GetFullPathNameW(file_name, size, full_name, NULL); -- 2.17.1

1 0

[PATCH v2 4/4] ddraw/tests: Add tests for checking available depth formats.
by Jactry Zeng 16 Jun '19

16 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 31 +++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 31 +++++++++++++++++++ 4 files changed, 192 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 860e101159..6ae9d0c49c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12899,6 +12899,70 @@ static void test_caps(void) IDirectDraw_Release(ddraw); } +static void test_available_formats(void) +{ + static const DWORD z_bitmasks[] = {0x00ffffff, 0xffffff00, 0xffffffff}; + DDSURFACEDESC surface_desc, desc; + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + int i; + + window = create_window(); + ddraw = create_ddraw(); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags: %#x.\n", desc.dwFlags); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d.\n", U2(desc).dwZBufferBitDepth); + IDirectDrawSurface_Release(surface); + + for (i = 0; i < ARRAY_SIZE(z_bitmasks); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = z_bitmasks[i]; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, i=%d.\n", hr, i); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH) && !(desc.dwFlags & DDSD_PIXELFORMAT), + "Got unexpected flags: %#x, i=%d.\n", desc.dwFlags, i); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d, i=%d.\n", + U2(desc).dwZBufferBitDepth, i); + + IDirectDrawSurface_Release(surface); + } + + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13010,4 +13074,5 @@ START_TEST(ddraw1) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2c047a5e1f..f443352e5c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13775,6 +13775,70 @@ static void test_caps(void) IDirectDraw2_Release(ddraw); } +static void test_available_formats(void) +{ + static const DWORD z_bitmasks[] = {0x00ffffff, 0xffffff00, 0xffffffff}; + DDSURFACEDESC surface_desc, desc; + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + int i; + + window = create_window(); + ddraw = create_ddraw(); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = 32; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags: %#x.\n", desc.dwFlags); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d.\n", U2(desc).dwZBufferBitDepth); + IDirectDrawSurface_Release(surface); + + for (i = 0; i < ARRAY_SIZE(z_bitmasks); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = z_bitmasks[i]; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, i=%d.\n", hr, i); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok((desc.dwFlags & DDSD_ZBUFFERBITDEPTH) && !(desc.dwFlags & DDSD_PIXELFORMAT), + "Got unexpected flags: %#x, i=%d.\n", desc.dwFlags, i); + ok(U2(desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth: %d, i=%d.\n", + U2(desc).dwZBufferBitDepth, i); + + IDirectDrawSurface_Release(surface); + } + + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13893,4 +13957,5 @@ START_TEST(ddraw2) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 77ae359a9c..6cb7b75fca 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16215,6 +16215,36 @@ static void test_caps(void) IDirectDraw4_Release(ddraw); } +static HRESULT CALLBACK enum_available_formats(DDPIXELFORMAT *format, void *ctx) +{ + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + return DDENUMRET_OK; +} + +static void test_available_formats(void) +{ + IDirectDraw4 *ddraw; + IDirect3D3 *d3d3; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d3); + IDirectDraw4_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + hr = IDirect3D3_EnumZBufferFormats(d3d3, &IID_IDirect3DHALDevice, enum_available_formats, NULL); + if (FAILED(hr)) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D3_Release(d3d3); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16348,4 +16378,5 @@ START_TEST(ddraw4) test_alphatest(); test_clipper_refcount(); test_caps(); + test_available_formats(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b0fc634eef..b91de58984 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16289,6 +16289,36 @@ static void test_caps(void) IDirectDraw7_Release(ddraw); } +static HRESULT CALLBACK enum_available_formats(DDPIXELFORMAT *format, void *ctx) +{ + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + return DDENUMRET_OK; +} + +static void test_available_formats(void) +{ + IDirectDraw7 *ddraw; + IDirect3D7 *d3d7; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_QueryInterface(ddraw, &IID_IDirect3D7, (void **)&d3d7); + IDirectDraw7_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DHALDevice, enum_available_formats, NULL); + if (FAILED(hr)) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D7_Release(d3d7); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16436,4 +16466,5 @@ START_TEST(ddraw7) test_clipper_refcount(); test_begin_end_state_block(); test_caps(); + test_available_formats(); } -- 2.20.1

2 1

[PATCH 4/4] ddraw/tests: Add test for checking available depth format.
by Jactry Zeng 16 Jun '19

16 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cb7582c1d4..db70fa2423 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16002,6 +16002,49 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static HRESULT CALLBACK enum_available_fmt(DDPIXELFORMAT *format, void *ctx) +{ + DDPIXELFORMAT *z_fmt = ctx; + + if (U1(*format).dwZBufferBitDepth > U1(*z_fmt).dwZBufferBitDepth) + *z_fmt = *format; + + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + + return DDENUMRET_OK; +} + +static void test_available_fmt(void) +{ + DDPIXELFORMAT z_fmt; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d3; + HWND window; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + window = create_window(); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d3); + IDirectDraw4_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D3_EnumZBufferFormats(d3d3, &IID_IDirect3DHALDevice, enum_available_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D3_Release(d3d3); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16134,4 +16177,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_available_fmt(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5f066a6257..83c6671c54 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15893,6 +15893,49 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static HRESULT CALLBACK enum_available_fmt(DDPIXELFORMAT *format, void *ctx) +{ + DDPIXELFORMAT *z_fmt = ctx; + + if (U1(*format).dwZBufferBitDepth > U1(*z_fmt).dwZBufferBitDepth) + *z_fmt = *format; + + ok(U3(*format).dwZBitMask != 0xffffffff, "Got unexpected depth format: %#x.\n", U3(*format).dwZBitMask); + + return DDENUMRET_OK; +} + +static void test_available_fmt(void) +{ + DDPIXELFORMAT z_fmt; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d7; + HWND window; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + window = create_window(); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_QueryInterface(ddraw, &IID_IDirect3D7, (void **)&d3d7); + IDirectDraw7_Release(ddraw); + if (FAILED(hr)) + { + skip("D3D interface is not available, skipping test.\n"); + return; + } + + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DHALDevice, enum_available_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) + skip("No depth buffer formats available, skipping test.\n"); + + IDirect3D7_Release(d3d7); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16038,4 +16081,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_available_fmt(); } -- 2.20.1

4 4

[PATCH v2 3/4] d3d9/tests: Test IDirect3D9::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng 16 Jun '19

16 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c89723cb..73ecae9804 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); } -- 2.20.1

1 0

[PATCH v2 2/4] d3d8/tests: Test IDirect3D8::CheckDepthStencilMatch() with D3DFMT_D32.
by Jactry Zeng 16 Jun '19

16 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b11b..bab08e38bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_A8R8G8B8, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, D3DFMT_D32); + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL), /* Win10 */ + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); } -- 2.20.1

1 0

[PATCH v2 1/4] wined3d: Drop support for WINED3DFMT_D32_UNORM.
by Jactry Zeng 16 Jun '19

16 Jun '19

Superseded patch 165301~165304. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wined3d/utils.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 44b6c48e67..b48de3afb9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1275,6 +1275,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers * These are never supported on native. * WINED3DFMT_B8G8R8_UNORM * WINED3DFMT_B2G3R3_UNORM + * WINED3DFMT_D32_UNORM * WINED3DFMT_L4A4_UNORM * WINED3DFMT_S1_UINT_D15_UNORM * WINED3DFMT_S4X4_UINT_D24_UNORM @@ -1777,14 +1778,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, -- 2.20.1

1 0

[PATCH v4] ddraw: Set dwZBufferBitDepth in ddraw_GetCaps
by David Adam 16 Jun '19

16 Jun '19

This patch is from Michael Muller.

2 1

[PATCH] dinput: Ensure buffer doesn't overflow. (Coverity)
by Alistair Leslie-Hughes 16 Jun '19

16 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 433348cd04..a5308b6cc4 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -700,7 +700,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); - strcpy(pdidi->tszProductName, This->name); + lstrcpynA(pdidi->tszProductName, This->name, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; pdidi->wUsagePage = 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e3371b9f44..1e8c542f21 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -411,8 +411,8 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->guidInstance = lpddiW.guidInstance; lpddi->guidProduct = lpddiW.guidProduct; lpddi->dwDevType = lpddiW.dwDevType; - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + lstrcpynA(lpddi->tszInstanceName, joydevs[id].name, MAX_PATH); + lstrcpynA(lpddi->tszProductName, joydevs[id].name, MAX_PATH); lpddi->guidFFDriver = lpddiW.guidFFDriver; lpddi->wUsagePage = lpddiW.wUsagePage; lpddi->wUsage = lpddiW.wUsage; -- 2.20.1

1 0

[PATCH] dpnet: Remove dead code. (Coverity)
by Alistair Leslie-Hughes 16 Jun '19

16 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/tests/server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 698082d382..ec7b76698f 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -326,8 +326,6 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplications_Add( apps, app ); else if (op == APP_REMOVE) hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; done: if (app) INetFwAuthorizedApplication_Release( app ); -- 2.20.1

1 0

[PATCH vkd3d 2/2] vkd3d/tests: Add tests for predicated rendering.
by Henri Verbeet 15 Jun '19

15 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166618. tests/d3d12.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 81fb26a..0c70d5f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30470,6 +30470,371 @@ static void test_early_depth_stencil_tests(void) destroy_test_context(&context); } +static void prepare_instanced_draw(struct test_context *context) +{ + ID3D12GraphicsCommandList *command_list = context->list; + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); +} + +static void test_conditional_rendering(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12CommandSignature *command_signature; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + ID3D12Resource *texture, *texture_copy; + ID3D12PipelineState *pipeline_state; + ID3D12RootSignature *root_signature; + struct test_context context; + ID3D12Resource *buffer, *cb; + struct resource_readback rb; + ID3D12Resource *conditions; + ID3D12CommandQueue *queue; + unsigned int i; + uint32_t value; + HRESULT hr; + + static const uint64_t predicate_args[] = {0, 1, (uint64_t)1 << 32}; + static const uint32_t r8g8b8a8_data[] = {0x28384858, 0x39495969}; + static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const uint32_t init_value = 0xdeadbeef; + static const D3D12_SUBRESOURCE_DATA copy_data[] = + { + {&r8g8b8a8_data[0], sizeof(r8g8b8a8_data[0]), sizeof(r8g8b8a8_data[0])}, + {&r8g8b8a8_data[1], sizeof(r8g8b8a8_data[1]), sizeof(r8g8b8a8_data[1])} + }; + static const DWORD cs_code[] = + { +#if 0 + cbuffer cb + { + unsigned int offset; + unsigned int value; + }; + + RWByteAddressBuffer b; + + [numthreads(1, 1, 1)] + void main() + { + b.Store(4 * offset, value); + } +#endif + 0x43425844, 0xaadc5460, 0x88c27e90, 0x2acacf4e, 0x4e06019a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000084, 0x00050050, 0x00000021, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x02000068, + 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x08000029, 0x00100012, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x080000a6, 0x0011e012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct + { + uint32_t offset; + uint32_t value; + uint32_t uav_offset; + } + input = {0, 4, 0}; + + if (!init_test_context(&context, NULL)) + return; + command_list = context.list; + queue = context.queue; + + conditions = create_default_buffer(context.device, sizeof(predicate_args), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, conditions, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + /* Skip draw on zero. */ + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Skip draw on non-zero. */ + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + /* Don't reset predication to test automatic reset on next SetPredication() call. */ + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Skip clear on zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Draw on zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* Draw on non-zero. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* 64-bit conditional 0x100000000 - fails due to Vulkan 32-bit values. */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + 2 * sizeof(uint64_t), D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + /* ExecuteIndirect(). */ + buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); + + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + prepare_instanced_draw(&context); + /* Draw. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(buffer); + ID3D12CommandSignature_Release(command_signature); + reset_command_list(command_list, context.allocator); + + /* CopyResource(). */ + texture = create_default_texture(context.device, + 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, &copy_data[0], 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + texture_copy = create_default_texture(context.device, + 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); + reset_command_list(command_list, context.allocator); + + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + + /* Copy. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_CopyResource(command_list, texture_copy, texture); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + + /* ResolveSubresource(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + + /* Resolve. */ + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + texture_copy, 0, texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, texture_copy, + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + + reset_command_list(command_list, context.allocator); + + /* Dispatch(). */ + cb = create_upload_buffer(context.device, sizeof(input), &input); + + buffer = create_default_buffer(context.device, 512, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(buffer, 0, sizeof(uint32_t), &init_value, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; + root_parameters[1].Descriptor.ShaderRegister = 0; + root_parameters[1].Descriptor.RegisterSpace = 0; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = 2; + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(context.device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + pipeline_state = create_compute_pipeline_state(context.device, root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + + for (i = 0; i < 2; ++i) + { + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); + ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list, + 0, ID3D12Resource_GetGPUVirtualAddress(cb)); + ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, + 1, ID3D12Resource_GetGPUVirtualAddress(buffer)); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, i * sizeof(uint64_t), + D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + value = get_readback_uint(&rb, 0, 0, 0); + ok(value == (!i ? init_value : input.value), "Got %#x, expected %#x.\n", value, input.value); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(texture_copy); + ID3D12Resource_Release(conditions); + ID3D12Resource_Release(cb); + ID3D12Resource_Release(buffer); + ID3D12RootSignature_Release(root_signature); + ID3D12PipelineState_Release(pipeline_state); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -30629,4 +30994,5 @@ START_TEST(d3d12) run_test(test_queue_wait); run_test(test_graphics_compute_queue_synchronization); run_test(test_early_depth_stencil_tests); + run_test(test_conditional_rendering); } -- 2.11.0

1 0

[PATCH vkd3d 1/2] vkd3d: Implement d3d12_command_list_SetPredication().
by Henri Verbeet 15 Jun '19

15 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Predicate arguments which are only non-zero in bit 32 or higher are not supported. Predicates will not be applied to clear and copy commands because Vulkan does not support predication of these command classes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 166617. libs/vkd3d/command.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/device.c | 12 +++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ libs/vkd3d/vulkan_procs.h | 4 +++ 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5..4723e79 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2288,6 +2288,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->xfb_enabled = false; + list->is_predicated = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -4910,8 +4912,70 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { - FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer); + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n", iface, buffer, aligned_buffer_offset, operation); + + if (!vk_info->EXT_conditional_rendering) + { + FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n"); + return; + } + + vk_procs = &list->device->vk_procs; + + if (resource) + { + VkConditionalRenderingBeginInfoEXT cond_info; + + if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + { + WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); + return; + } + + if (!d3d12_resource_is_buffer(resource)) + { + WARN("Predicate arguments must be stored in a buffer resource.\n"); + return; + } + + FIXME("Predication doesn't support clear and copy commands, " + "and predication values are treated as 32-bit values.\n"); + + cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; + cond_info.pNext = NULL; + cond_info.buffer = resource->u.vk_buffer; + cond_info.offset = aligned_buffer_offset; + switch (operation) + { + case D3D12_PREDICATION_OP_EQUAL_ZERO: + cond_info.flags = 0; + break; + + case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO: + cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT; + break; + + default: + FIXME("Unhandled predication operation %#x.\n", operation); + return; + } + + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info)); + list->is_predicated = true; + } + else if (list->is_predicated) + { + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + list->is_predicated = false; + } } static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8..217c1c8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -142,6 +142,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ + {VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_conditional_rendering)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, @@ -673,6 +674,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceProperties2KHR properties2; /* features */ + VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -684,6 +686,7 @@ struct vkd3d_physical_device_info static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; @@ -696,6 +699,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); + conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; @@ -705,7 +709,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -999,6 +1005,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; @@ -1109,6 +1116,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" runtimeDescriptorArray: %#x.\n", descriptor_indexing->runtimeDescriptorArray); + conditional_rendering_features = &info->conditional_rendering_features; + TRACE(" VkPhysicalDeviceConditionalRenderingFeaturesEXT:\n"); + TRACE(" conditionalRendering: %#x.\n", conditional_rendering_features->conditionalRendering); + depth_clip_features = &info->depth_clip_features; TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); @@ -1337,6 +1348,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + vulkan_info->EXT_conditional_rendering = physical_device_info->conditional_rendering_features.conditionalRendering; vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a95..e0d563f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -97,6 +97,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; /* EXT device extensions */ + bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; @@ -907,6 +908,8 @@ struct d3d12_command_list bool xfb_enabled; + bool is_predicated; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index a55fb07..702cfd2 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -192,6 +192,10 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_conditional_rendering */ +VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) +VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) + /* VK_EXT_debug_marker */ VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) -- 2.11.0

1 0

libunwind and windows call stack determination, wine's dbghelp...
by Tarmo Pikaro 15 Jun '19

15 Jun '19

Hi ! I've managed to compile libunwind on Visual Studio 2017 with linux subsystem, made my own fork from libunwind here: https://github.com/tapika/libunwind For now I have "hardcoded" into git some of autogenerated files, just not to play aroundwith bash / shell / tools. Can push my solution / project to your git if necessary, but I think Visual studio is still bit immaturewhat concerns linux, but debugging & compilation seems to work on some level. Would it be possible to permanently rename "aux" folder, as it's name of windows device drive, andyou just cannot do checkout on windows, no matter which tool you use. At the moment I want to recombine windows stack walking with linux stack walking, something similar seems to be implemented in https://github.com/Magnusnorrby/MolyRift/blob/master/Kernel/OVR_DebugHelp.c… I'll probably try to recombine or create something similar. Need to analyze bit deeperhow can do it. I've also tried to rip off dbghelp.dll from wine linux emulator, conversation on this can be found here: http://wine.1045685.n8.nabble.com/dbghelp-detached-from-wine-into-standalon… Basically at the moment what concerns stack walking - I see couple of alternatives 1. make something similar to OVR_DebugHelp.cpp, so API would be coombination of all 3 stack walk apis. 2. create new platform support under libunwind library, but need to analyze this alternative deeperif it's feasible. (use libunwind API, but provide windows API implementation for that one). 3. create fully platform independent solution, like rip off dbghelp wired to multiple platforms.(Separate library from libunwind) I'm thinking about 2,1,3 with focus on 3 when possible (fully platform / os neutral), but priority order as specified. But despite of call stack approaches - I would like to discuss if anyone can commentof idea of having c++ compiled dll / so so that it would be platform neutral ? Original question resides in here: https://www.reddit.com/r/cpp/comments/bjgt0j/make_portable_dll_without_seco… Does libunwind provides only parsing capabilities over dwarf / elf, would it be possible to modify dwarf file format to have so / dll file format to be fully OS / platform neutral ? -- Have a nice day! Tarmo.

1 0

[PATCH v2 1/3] dmusic/tests: Add some tests for the master clock.
by Zebediah Figura 15 Jun '19

15 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Remove tests for the clock name. dlls/dmusic/tests/dmusic.c | 123 ++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a4fbd4af717..d071e1cdef6 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -38,20 +38,10 @@ static void test_dmusic(void) DMUS_PORTCAPS port_caps; DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; - DMUS_CLOCKINFO clock_info; - GUID guid_clock; - IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); - hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); - ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); - ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); - if (clock) - IReferenceClock_Release(clock); - port_params.dwSize = sizeof(port_params); port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; port_params.dwChannelGroups = 1; @@ -96,18 +86,6 @@ static void test_dmusic(void) index++; } - index = 0; - clock_info.dwSize = sizeof(clock_info); - while (IDirectMusic_EnumMasterClock(dmusic, index, &clock_info) == S_OK) - { - ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); - trace("Clock %u:\n", index); - trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); - trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); - index++; - } - if (port) IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); @@ -776,6 +754,106 @@ static void test_parsedescriptor(void) IDirectMusicObject_Release(dmo); } +static void test_master_clock(void) +{ + static const GUID guid_system_clock = {0x58d58419, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + static const GUID guid_dsound_clock = {0x58d58420, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + IReferenceClock *clock, *clock2; + REFERENCE_TIME time1, time2; + LARGE_INTEGER counter, freq; + DMUS_CLOCKINFO clock_info; + IDirectMusic *dmusic; + DWORD cookie; + HRESULT hr; + ULONG ref; + GUID guid; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)&dmusic); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + + clock = (IReferenceClock *)0xdeadbeef; + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock && clock != (IReferenceClock *)0xdeadbeef, "Got clock %p.\n", clock); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&counter); + hr = IReferenceClock_GetTime(clock, &time1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; + todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + hr = IReferenceClock_GetTime(clock, &time2); + todo_wine ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + + Sleep(100); + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2)); + + hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_Unadvise(clock, 0); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IReferenceClock_Release(clock); + + hr = IDirectMusic_EnumMasterClock(dmusic, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 0, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_system_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 1, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_dsound_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 2, &clock_info); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IDirectMusic_Release(dmusic); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -794,6 +872,7 @@ START_TEST(dmusic) test_dmbuffer(); test_dmcoll(); test_parsedescriptor(); + test_master_clock(); CoUninitialize(); } -- 2.20.1

2 5

[PATCH] wininet: Hide GetCookie flag fixme for HTTPONLY cookies
by Tim Schumacher 15 Jun '19

15 Jun '19

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- HTTPONLY cookies have been added ages ago in commit db441cf58f0. This flag warning is just a remnant that was forgotten. --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 30a9e2545b..2af752110c 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -733,7 +733,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); - if (flags) + if (flags & ~INTERNET_COOKIE_HTTPONLY) FIXME("flags 0x%08x not supported\n", flags); if (!lpszUrl) -- 2.22.0

1 0

[PATCH v2 1/4] ddraw/tests: Add some tests for transform state and stateblock interaction.
by Zebediah Figura 15 Jun '19

15 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 316 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b0fc634eef7..49a40a7840a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16289,6 +16289,321 @@ static void test_caps(void) IDirectDraw7_Release(ddraw); } +static void test_transform_state(void) +{ + D3DMATRIX mat1, mat2, ret_mat; + IDirect3DDevice7 *device; + DWORD stateblock; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static const D3DTRANSFORMSTATETYPE tests[] = + { + D3DTRANSFORMSTATE_WORLD, + D3DTRANSFORMSTATE_VIEW, + D3DTRANSFORMSTATE_PROJECTION, + D3DTRANSFORMSTATE_WORLD1, + D3DTRANSFORMSTATE_WORLD2, + D3DTRANSFORMSTATE_WORLD3, + D3DTRANSFORMSTATE_TEXTURE0, + D3DTRANSFORMSTATE_TEXTURE1, + D3DTRANSFORMSTATE_TEXTURE2, + D3DTRANSFORMSTATE_TEXTURE3, + D3DTRANSFORMSTATE_TEXTURE4, + D3DTRANSFORMSTATE_TEXTURE5, + D3DTRANSFORMSTATE_TEXTURE6, + D3DTRANSFORMSTATE_TEXTURE7, + }; + + static const D3DMATRIX identity = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + memset(&mat1, 0x11, sizeof(mat1)); + memset(&mat2, 0x22, sizeof(mat2)); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &identity, sizeof(identity)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + /* Recorded stateblock, even states. */ + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (i % 2) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + } + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat2 : &mat1, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat1 : &mat2, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Recorded stateblock, odd states. */ + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!(i % 2)) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + } + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat1 : &mat2, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, (i % 2) ? &mat2 : &mat1, sizeof(mat1)), + "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Predefined stateblock, D3DSBT_ALL. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + /* Predefined stateblock, D3DSBT_VERTEXSTATE. The documentation incorrectly + * states that transform matrices are included. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_VERTEXSTATE, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + /* Predefined stateblock, D3DSBT_PIXELSTATE. */ + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_PIXELSTATE, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat2); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat2, sizeof(mat2)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetTransform(device, tests[i], &mat1); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + } + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_GetTransform(device, tests[i], &ret_mat); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", tests[i], hr); + ok(!memcmp(&ret_mat, &mat1, sizeof(mat1)), "Test %u: Got unexpected transform matrix.\n", tests[i]); + } + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16436,4 +16751,5 @@ START_TEST(ddraw7) test_clipper_refcount(); test_begin_end_state_block(); test_caps(); + test_transform_state(); } -- 2.20.1

2 7

[PATCH 01/12] d3drm: Implement frame Transform
by Jeff Smith 15 Jun '19

15 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/frame.c | 38 +++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 8bed50b57e..14a524ea7d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2416,23 +2416,49 @@ static HRESULT WINAPI d3drm_frame1_SetZbufferMode(IDirect3DRMFrame *iface, D3DRM static HRESULT WINAPI d3drm_frame3_Transform(IDirect3DRMFrame3 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + d->u1.x = s->u1.x * frame->transform[0][0] + s->u2.y * frame->transform[1][0] + + s->u3.z * frame->transform[2][0] + frame->transform[3][0]; + d->u2.y = s->u1.x * frame->transform[0][1] + s->u2.y * frame->transform[1][1] + + s->u3.z * frame->transform[2][1] + frame->transform[3][1]; + d->u3.z = s->u1.x * frame->transform[0][2] + s->u2.y * frame->transform[1][2] + + s->u3.z * frame->transform[2][2] + frame->transform[3][2]; + + while ((frame = frame->parent)) + { + D3DVALUE x = d->u1.x; + D3DVALUE y = d->u2.y; + D3DVALUE z = d->u3.z; + d->u1.x = x * frame->transform[0][0] + y * frame->transform[1][0] + + z * frame->transform[2][0] + frame->transform[3][0]; + d->u2.y = x * frame->transform[0][1] + y * frame->transform[1][1] + + z * frame->transform[2][1] + frame->transform[3][1]; + d->u3.z = x * frame->transform[0][2] + y * frame->transform[1][2] + + z * frame->transform[2][2] + frame->transform[3][2]; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_Transform(IDirect3DRMFrame2 *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame1_Transform(IDirect3DRMFrame *iface, D3DVECTOR *d, D3DVECTOR *s) { - FIXME("iface %p, d %p, s %p stub!\n", iface, d, s); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, d %p, s %p.\n", iface, d, s); + + return d3drm_frame3_Transform(&frame->IDirect3DRMFrame3_iface, d, s); } static HRESULT WINAPI d3drm_frame2_AddMoveCallback2(IDirect3DRMFrame2 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cc4f8fe16a..76e0ec19fb 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -20,6 +20,7 @@ */ #include <limits.h> +#include <math.h> #define COBJMACROS #include <d3d.h> @@ -2709,12 +2710,75 @@ cleanup: DestroyWindow(window); } +#define SET_TRANSFORM(frame, m11,m12,m13, m21,m22,m23, m31,m32,m33, m41,m42,m43) \ + { \ + D3DRMMATRIX4D matrix; \ + matrix[0][0] = D3DVAL(m11); \ + matrix[0][1] = D3DVAL(m12); \ + matrix[0][2] = D3DVAL(m13); \ + matrix[0][3] = D3DVAL(0); \ + matrix[1][0] = D3DVAL(m21); \ + matrix[1][1] = D3DVAL(m22); \ + matrix[1][2] = D3DVAL(m23); \ + matrix[1][3] = D3DVAL(0); \ + matrix[2][0] = D3DVAL(m31); \ + matrix[2][1] = D3DVAL(m32); \ + matrix[2][2] = D3DVAL(m33); \ + matrix[2][3] = D3DVAL(0); \ + matrix[3][0] = D3DVAL(m41); \ + matrix[3][1] = D3DVAL(m42); \ + matrix[3][2] = D3DVAL(m43); \ + matrix[3][3] = D3DVAL(1); \ + IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, matrix); \ + } + +#define SET_VECTOR(vector, vx,vy,vz) \ + { \ + (vector).x = D3DVAL(vx); \ + (vector).y = D3DVAL(vy); \ + (vector).z = D3DVAL(vz); \ + } + +#define MAXERROR_ABS 0.000001 +#define MAXERROR_REL 0.000001 +#define CHECK(a, b) \ + { \ + if (pass) \ + { \ + if ((a < 1 && a > -1) || (b < 1 && b > -1)) \ + { \ + if (fabs((a) - (b)) > MAXERROR_ABS) \ + { \ + pass = 0; \ + } \ + } \ + else \ + { \ + if (fabs((a) - (b)) > fabs(MAXERROR_REL * (b))) \ + { \ + pass = 0; \ + } \ + } \ + } \ + } + +#define EXPECT_VECTOR(test_description, vector, vx,vy,vz) \ + { \ + int pass = 1; \ + ok(hr == D3DRM_OK, test_description ": returned hr = %x\n", hr); \ + CHECK((vector).x, vx); \ + CHECK((vector).y, vy); \ + CHECK((vector).z, vz); \ + ok(pass, test_description ": vector result is not correct\n"); \ + } + static void test_frame_transform(void) { HRESULT hr; IDirect3DRM *d3drm; - IDirect3DRMFrame *frame; + IDirect3DRMFrame *frame, *subframe; D3DRMMATRIX4D matrix; + D3DVECTOR v1, v2; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -2726,6 +2790,19 @@ static void test_frame_transform(void) ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + + IDirect3DRM_CreateFrame(d3drm, frame, &subframe); + + SET_TRANSFORM(frame, 2,0,0, 0,4,0, 0,0,8, 64,64,64); + SET_TRANSFORM(subframe, 1,0,0, 0,1,0, 0,0,1, 11,11,11); + SET_VECTOR(v1, 3,5,7); + hr = IDirect3DRMFrame_Transform(frame, &v2, &v1); + EXPECT_VECTOR("Transform", v2, 70,84,120); + hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1); + EXPECT_VECTOR("Transform (subframe)", v2, 92,128,208); + + + IDirect3DRMFrame_Release(subframe); IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); } -- 2.14.3

2 13

[PATCH 1/3] dmusic/tests: Add some tests for the master clock.
by Zebediah Figura 14 Jun '19

14 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmusic/tests/dmusic.c | 129 ++++++++++++++++++++++++++++++------- 1 file changed, 107 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a4fbd4af717..cb436ed0cdd 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -38,20 +38,10 @@ static void test_dmusic(void) DMUS_PORTCAPS port_caps; DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; - DMUS_CLOCKINFO clock_info; - GUID guid_clock; - IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); - hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); - ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); - ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); - if (clock) - IReferenceClock_Release(clock); - port_params.dwSize = sizeof(port_params); port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; port_params.dwChannelGroups = 1; @@ -96,18 +86,6 @@ static void test_dmusic(void) index++; } - index = 0; - clock_info.dwSize = sizeof(clock_info); - while (IDirectMusic_EnumMasterClock(dmusic, index, &clock_info) == S_OK) - { - ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); - trace("Clock %u:\n", index); - trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); - trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); - index++; - } - if (port) IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); @@ -776,6 +754,112 @@ static void test_parsedescriptor(void) IDirectMusicObject_Release(dmo); } +static void test_master_clock(void) +{ + static const GUID guid_system_clock = {0x58d58419, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + static const GUID guid_dsound_clock = {0x58d58420, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + static const WCHAR name_dsound_clock[] = {'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0}; + static const WCHAR name_system_clock[] = {'S','y','s','t','e','m',' ','C','l','o','c','k',0}; + IReferenceClock *clock, *clock2; + REFERENCE_TIME time1, time2; + LARGE_INTEGER counter, freq; + DMUS_CLOCKINFO clock_info; + IDirectMusic *dmusic; + DWORD cookie; + HRESULT hr; + ULONG ref; + GUID guid; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)&dmusic); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + + clock = (IReferenceClock *)0xdeadbeef; + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock && clock != (IReferenceClock *)0xdeadbeef, "Got clock %p.\n", clock); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&counter); + hr = IReferenceClock_GetTime(clock, &time1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; + todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + hr = IReferenceClock_GetTime(clock, &time2); + todo_wine ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + + Sleep(100); + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2)); + + hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_Unadvise(clock, 0); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IReferenceClock_Release(clock); + + hr = IDirectMusic_EnumMasterClock(dmusic, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 0, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_system_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(!lstrcmpW(clock_info.wszDescription, name_system_clock), "Got name %s.\n", + wine_dbgstr_w(clock_info.wszDescription)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 1, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_dsound_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(!lstrcmpW(clock_info.wszDescription, name_dsound_clock), "Got name %s.\n", + wine_dbgstr_w(clock_info.wszDescription)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 2, &clock_info); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IDirectMusic_Release(dmusic); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -794,6 +878,7 @@ START_TEST(dmusic) test_dmbuffer(); test_dmcoll(); test_parsedescriptor(); + test_master_clock(); CoUninitialize(); } -- 2.20.1

2 4

[PATCH v3 1/3] ntdll: Implement RtlCreateUserStack() and RtlFreeUserStack().
by Zebediah Figura 14 Jun '19

14 Jun '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/loader.c | 7 ++++++- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 7 ++++++- dlls/ntdll/virtual.c | 46 +++++++++++++++++++++++++++++++++++++---- include/winternl.h | 12 ++++++----- 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f422a9c0bee..3d747edaba3b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3787,6 +3787,7 @@ void __wine_process_init(void) ANSI_STRING func_name; UNICODE_STRING nt_name; void * (CDECL *init_func)(void); + INITIAL_TEB stack; thread_init(); @@ -3838,11 +3839,15 @@ void __wine_process_init(void) RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) + if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) { ERR( "Main exe initialization for %s failed, status %x\n", debugstr_w(wm->ldr.FullDllName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } + NtCurrentTeb()->Tib.StackBase = stack.StackBase; + NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; + NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + server_init_process_done(); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aeb9735ba100..e0def228de07 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr long long long long ptr) @ stub RtlCreateUserSecurityObject +@ stdcall RtlCreateUserStack(long long long long long ptr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) @ stub RtlCustomCPToUnicodeN @ stub RtlCutoverTimeToSystemTime @@ -644,7 +645,7 @@ @ stdcall RtlFreeSid (ptr) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) -@ stub RtlFreeUserThreadStack +@ stdcall RtlFreeUserStack(ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stub RtlGenerate8dot3Name @ stdcall RtlGetAce(ptr long ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38adc..d1b895cd364a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -173,7 +173,7 @@ extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_ pe_image_info_t *image_info ) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, +extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack( void *stack_end ) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400d2..f612d135273f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -416,6 +416,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, SIZE_T extra_stack = PTHREAD_STACK_MIN; data_size_t len = 0; struct object_attributes *objattr = NULL; + INITIAL_TEB stack; if (process != NtCurrentProcess()) { @@ -507,9 +508,13 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, info->entry_point = start; info->entry_arg = param; - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, &extra_stack ))) + if ((status = virtual_alloc_thread_stack( &stack, stack_reserve, stack_commit, &extra_stack ))) goto error; + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda43..a3ea195c917b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1924,7 +1924,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) +NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { struct file_view *view; NTSTATUS status; @@ -1978,9 +1978,11 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi } /* note: limit is lower than base since the stack grows down */ - teb->DeallocationStack = view->base; - teb->Tib.StackBase = (char *)view->base + view->size; - teb->Tib.StackLimit = (char *)view->base + 2 * page_size; + stack->OldStackBase = 0; + stack->OldStackLimit = 0; + stack->DeallocationStack = view->base; + stack->StackBase = (char *)view->base + view->size; + stack->StackLimit = (char *)view->base + 2 * page_size; done: server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; @@ -2001,6 +2003,42 @@ void virtual_clear_thread_stack( void *stack_end ) if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); } +/********************************************************************** + * RtlCreateUserStack (NTDLL.@) + */ +NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bits, + SIZE_T commit_align, SIZE_T reserve_align, INITIAL_TEB *stack ) +{ + TRACE("commit %#lx, reserve %#lx, zero_bits %u, commit_align %#lx, reserve_align %#lx, stack %p\n", + commit, reserve, zero_bits, commit_align, reserve_align, stack); + + if (!commit_align || !reserve_align) + return STATUS_INVALID_PARAMETER; + + if (!commit || !reserve) + { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (!reserve) reserve = nt->OptionalHeader.SizeOfStackReserve; + if (!commit) commit = nt->OptionalHeader.SizeOfStackCommit; + } + + reserve = (reserve + reserve_align - 1) & ~(reserve_align - 1); + commit = (commit + commit_align - 1) & ~(commit_align - 1); + + return virtual_alloc_thread_stack( stack, reserve, commit, NULL ); +} + +/********************************************************************** + * RtlFreeUserStack (NTDLL.@) + */ +void WINAPI RtlFreeUserStack( void *stack ) +{ + SIZE_T size = 0; + + TRACE("stack %p\n", stack); + + NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); +} /*********************************************************************** * virtual_handle_fault diff --git a/include/winternl.h b/include/winternl.h index e7f89b005922..b87aa2298c6b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2104,11 +2104,11 @@ typedef struct _DIRECTORY_BASIC_INFORMATION { } DIRECTORY_BASIC_INFORMATION, *PDIRECTORY_BASIC_INFORMATION; typedef struct _INITIAL_TEB { - PVOID StackBase; - PVOID StackLimit; - PVOID StackCommit; - PVOID StackCommitMax; - PVOID StackReserved; + void *OldStackBase; + void *OldStackLimit; + void *StackBase; + void *StackLimit; + void *DeallocationStack; } INITIAL_TEB, *PINITIAL_TEB; typedef enum _PORT_INFORMATION_CLASS { @@ -2618,6 +2618,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserStack(SIZE_T,SIZE_T,ULONG,SIZE_T,SIZE_T,INITIAL_TEB*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); @@ -2691,6 +2692,7 @@ NTSYSAPI void WINAPI RtlFreeOemString(POEM_STRING); NTSYSAPI DWORD WINAPI RtlFreeSid(PSID); NTSYSAPI void WINAPI RtlFreeThreadActivationContextStack(void); NTSYSAPI void WINAPI RtlFreeUnicodeString(PUNICODE_STRING); +NTSYSAPI void WINAPI RtlFreeUserStack(void*); NTSYSAPI NTSTATUS WINAPI RtlGetAce(PACL,DWORD,LPVOID *); NTSYSAPI NTSTATUS WINAPI RtlGetActiveActivationContext(HANDLE*); NTSYSAPI NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG); -- 2.20.1

2 4

[PATCH v5] d3d9/tests: Add test for 'nrm' opcode.
by Paul Gofman 14 Jun '19

14 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v5: - deleted broken tests. dlls/d3d9/tests/visual.c | 229 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1991c0a519..811dacd1c2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -34,6 +34,7 @@ #define COBJMACROS #include <d3d9.h> #include "wine/test.h" +#include "wine/heap.h" struct vec2 { @@ -25982,6 +25983,233 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_nrm_instruction(void) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *vertex_shader; + IDirect3DPixelShader9 *pixel_shader; + IDirect3DDevice9 *device; + unsigned int body_size; + IDirect3D9 *d3d; + D3DCOLOR colour; + unsigned int i; + DWORD *ps_code; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, + D3DDECL_END() + }; + static const struct + { + struct vec3 position; + struct vec2 t0; + struct vec4 t1; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, {1.0f, 1.0f}, {0.0f, 1.0f, 0.3f, 0.5f}}, + {{ 1.0f, -1.0f, 0.1f}, {1.0f, 1.0f}, {0.0f, 1.0f, 0.3f, 0.5f}}, + {{-1.0f, 1.0f, 0.1f}, {1.0f, 1.0f}, {0.0f, 1.0f, 0.3f, 0.5f}}, + {{ 1.0f, 1.0f, 0.1f}, {1.0f, 1.0f}, {0.0f, 1.0f, 0.3f, 0.5f}}, + }; + + static const DWORD vs_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ + 0x0200001f, 0x80010005, 0x900f0002, /* dcl_texcoord1 v2 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x80000005, 0xe00f0001, /* dcl_texcoord0 o1 */ + 0x0200001f, 0x80010005, 0xe00f0002, /* dcl_texcoord1 o2 */ + 0x0200001f, 0x80020005, 0xe00f0003, /* dcl_texcoord2 o3 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x02000001, 0xe00f0001, 0x90e40001, /* mov o1, v1 */ + 0x02000001, 0xe00f0002, 0x90e40002, /* mov o2, v2 */ + 0x02000024, 0x800f0000, 0x90e40002, /* nrm r0, v2 */ + 0x02000001, 0xe00f0003, 0x80e40000, /* mov o3, r0 */ + 0x0000ffff, + }; + static const DWORD ps_header[] = + { + 0xffff0300, /* ps_3_0 */ + }; + static const DWORD ps_footer[] = + { + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD nrm_t0[] = + { + 0x0200001f, 0x80000005, 0x90070001, /* dcl_texcoord0 v0.xyz */ + 0x02000024, 0x800f0000, 0x90e40001, /* nrm r0, v0 */ + }; + static const DWORD nrm_xyz_t0[] = + { + 0x0200001f, 0x80000005, 0x90070000, /* dcl_texcoord0 v0.xyz */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000024, 0x80070000, 0x90e40000, /* nrm r0.xyz, v0 */ + 0x02000001, 0x80040000, 0x80ff0000, /* mov r0.z, r0.w */ + }; + static const DWORD nrm_t1[] = + { + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1 v0.xyzw */ + 0x02000024, 0x800f0000, 0x90e40000, /* nrm r0, v0 */ + }; + static const DWORD nrm_vs_t1[] = + { + 0x0200001f, 0x80020005, 0x900f0000, /* dcl_texcoord2 v0.xyzw */ + 0x02000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + }; + static const DWORD nrm_t1_xyz[] = + { + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1 v0.xyzw */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000024, 0x80070000, 0x90e40000, /* nrm r0.xyz, t1 */ + 0x02000001, 0x80040000, 0x80ff0000, /* mov r0.z, r0.w */ + }; + static const DWORD nrm_t1_xy[] = + { + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1 v0.xyzw */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000024, 0x800f0000, 0x90540000, /* nrm r0, v0.xy */ + }; + static const DWORD nrm_xyz_t1_yw[] = + { + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1 v0.xyzw */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000024, 0x80070000, 0x90fd0000, /* nrm r0.xyz, v0.yw */ + }; + static const DWORD nrm_t1_dcl_xy[] = + { + 0x0200001f, 0x80010005, 0x90030000, /* dcl_texcoord1 v0.xy */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000024, 0x800f0000, 0x90540000, /* nrm r0, v0 */ + }; + static const DWORD nrm_c0[] = + { + 0x02000024, 0x800f0000, 0xa0e40000, /* nrm r0, c0 */ + 0x02000001, 0x80040000, 0x80ff0000, /* mov r0.z, r0.w */ + }; + static const DWORD nrm_c0_swizzle[] = + { + 0x02000024, 0x800f0000, 0xa0390000, /* nrm r0, c0.yzwx */ + }; + + static const struct + { + const char *name; + const DWORD *ops; + DWORD body_size; + struct vec4 c0; + D3DCOLOR expected_colour; + } + tests[] = + { + {"nrm_t0", nrm_t0, ARRAY_SIZE(nrm_t0), {0.0f}, 0x00b4b400}, + {"nrm_xyz_t0", nrm_xyz_t0, ARRAY_SIZE(nrm_xyz_t0), {0.1f, 0.1f, 0.1f, 0.1f}, 0x00b4b419}, + {"nrm_t1", nrm_t1, ARRAY_SIZE(nrm_t1), {0.0f}, 0x0000f449}, + {"nrm_vs_t1", nrm_vs_t1, ARRAY_SIZE(nrm_vs_t1), {0.0f}, 0x0000f449}, + {"nrm_t1_xyz", nrm_t1_xyz, ARRAY_SIZE(nrm_t1_xyz), {0.1f, 0.1f, 0.1f, 0.1f}, 0x0000f419}, + {"nrm_t1_xy", nrm_t1_xy, ARRAY_SIZE(nrm_t1_xy), {0.1f, 0.1f, 0.1f, 0.1f}, 0x0000b4b4}, + {"nrm_xyz_t1_yw", nrm_xyz_t1_yw, ARRAY_SIZE(nrm_xyz_t1_yw), {0.1f, 0.1f, 0.1f, 0.1f}, 0x00d06868}, + {"nrm_t1_dcl_xy", nrm_t1_dcl_xy, ARRAY_SIZE(nrm_t1_dcl_xy), {0.1f, 0.1f, 0.1f, 0.1f}, 0x0000b4b4}, + {"nrm_vec4(0.0, 0.0, 0.0, 0.0)", nrm_c0, ARRAY_SIZE(nrm_c0), {0.0f, 0.0f, 0.0f, 0.0f}, 0x00000000}, + {"nrm_vec4(2.0, 0.0, 0.0, 0.5)", nrm_c0, ARRAY_SIZE(nrm_c0), {2.0f, 0.0f, 0.0f, 0.5f}, 0x00ff0040}, + {"nrm_vec4(1.0)", nrm_c0, ARRAY_SIZE(nrm_c0), {1.0f, 1.0f, 1.0f, 1.0f}, 0x00939393}, + {"nrm_c0_swizzle", nrm_c0_swizzle, ARRAY_SIZE(nrm_c0_swizzle), {1.0f, 1.0f, 0.0f, 2.0f}, 0x007200e4}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + body_size = 0; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + body_size = max(body_size, tests[i].body_size); + + ps_code = heap_alloc(sizeof(ps_header) + body_size * sizeof(*ps_code) + sizeof(ps_footer)); + memcpy(ps_code, ps_header, sizeof(ps_header)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vertex_shader); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vertex_shader); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memcpy(ps_code + ARRAY_SIZE(ps_header), tests[i].ops, sizeof(*ps_code) * tests[i].body_size); + memcpy(ps_code + ARRAY_SIZE(ps_header) + tests[i].body_size, ps_footer, sizeof(ps_footer)); + + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &pixel_shader); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %s.\n", hr, tests[i].name); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x80808080, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, pixel_shader); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 0, &tests[i].c0.x, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].expected_colour, 1), + "test %s, expected 0x%08x, got 0x%08x.\n", + tests[i].name, tests[i].expected_colour, colour); + + IDirect3DPixelShader9_Release(pixel_shader); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + heap_free(ps_code); + IDirect3DVertexShader9_Release(vertex_shader); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -26124,4 +26352,5 @@ START_TEST(visual) test_map_synchronisation(); test_color_vertex(); test_sysmem_draw(); + test_nrm_instruction(); } -- 2.21.0

3 2

What features with vulkan without vkd3d?
by Olivier F. R. Dierick 14 Jun '19

14 Jun '19

Hello, I'm compiling Wine with vulkan but without vkd3d and was wondering: What features do get with vulkan? What features do I miss without vkd3d? Regards. -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 1

[PATCH 1/2] vkd3d: Implement ID3D12GraphicsCommandList::SetPredication().
by Conor McCarthy 14 Jun '19

14 Jun '19

Predicate arguments which are only non-zero in bit 32 or higher are not supported. Predicates will not be applied to clear and copy commands because Vulkan does not support predication of these command classes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 63 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/device.c | 12 ++++++++ libs/vkd3d/vkd3d_private.h | 3 ++ libs/vkd3d/vulkan_procs.h | 4 +++ 4 files changed, 81 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5..32534e5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2288,6 +2288,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->xfb_enabled = false; + list->is_predicated = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -4910,8 +4912,67 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { - FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; + struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer); + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n", iface, buffer, aligned_buffer_offset, operation); + + if (!vk_info->EXT_conditional_rendering) + { + FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n"); + return; + } + + vk_procs = &list->device->vk_procs; + + if (resource) + { + VkConditionalRenderingBeginInfoEXT cond_info; + if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + { + WARN("Unaligned predicate argument buffer offset.\n"); + return; + } + if (!d3d12_resource_is_buffer(resource)) + { + WARN("Predicate arguments must be stored in a buffer.\n"); + return; + } + + FIXME("Predication doesn't support clear and copy commands, and predication " + "values are treated as 32-bit values.\n"); + cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; + cond_info.pNext = NULL; + cond_info.buffer = resource->u.vk_buffer; + cond_info.offset = aligned_buffer_offset; + switch (operation) + { + case D3D12_PREDICATION_OP_EQUAL_ZERO: + cond_info.flags = 0; + break; + case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO: + cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT; + break; + default: + WARN("Unknown predication op %#x.\n", operation); + return; + } + + /* Must end any current predication before beginning a new one */ + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + + VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info)); + list->is_predicated = true; + } + else + { + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + list->is_predicated = false; + } } static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8..217c1c8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -142,6 +142,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ + {VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_conditional_rendering)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, @@ -673,6 +674,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceProperties2KHR properties2; /* features */ + VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -684,6 +686,7 @@ struct vkd3d_physical_device_info static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; @@ -696,6 +699,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); + conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; @@ -705,7 +709,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -999,6 +1005,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; @@ -1109,6 +1116,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" runtimeDescriptorArray: %#x.\n", descriptor_indexing->runtimeDescriptorArray); + conditional_rendering_features = &info->conditional_rendering_features; + TRACE(" VkPhysicalDeviceConditionalRenderingFeaturesEXT:\n"); + TRACE(" conditionalRendering: %#x.\n", conditional_rendering_features->conditionalRendering); + depth_clip_features = &info->depth_clip_features; TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); @@ -1337,6 +1348,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + vulkan_info->EXT_conditional_rendering = physical_device_info->conditional_rendering_features.conditionalRendering; vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a95..e0d563f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -97,6 +97,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; /* EXT device extensions */ + bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; @@ -907,6 +908,8 @@ struct d3d12_command_list bool xfb_enabled; + bool is_predicated; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index a55fb07..702cfd2 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -192,6 +192,10 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_conditional_rendering */ +VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) +VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) + /* VK_EXT_debug_marker */ VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) -- 2.21.0

1 1

[PATCH 1/2] vkd3d: Implement ID3D12GraphicsCommandList::SetPredication().
by Conor McCarthy 14 Jun '19

14 Jun '19

Predicate arguments which are only non-zero in bit 32 or higher are not supported. Predicates will not be applied to clear and copy commands because Vulkan does not support predication of these command classes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 63 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/device.c | 12 ++++++++ libs/vkd3d/vkd3d_private.h | 3 ++ libs/vkd3d/vulkan_procs.h | 4 +++ 4 files changed, 81 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5..32534e5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2288,6 +2288,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->xfb_enabled = false; + list->is_predicated = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -4910,8 +4912,67 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { - FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; + struct d3d12_resource *resource = unsafe_impl_from_ID3D12Resource(buffer); + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x.\n", iface, buffer, aligned_buffer_offset, operation); + + if (!vk_info->EXT_conditional_rendering) + { + FIXME("Vulkan conditional rendering extension not present. Conditional rendering not supported.\n"); + return; + } + + vk_procs = &list->device->vk_procs; + + if (resource) + { + VkConditionalRenderingBeginInfoEXT cond_info; + if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + { + WARN("Unaligned predicate argument buffer offset.\n"); + return; + } + if (!d3d12_resource_is_buffer(resource)) + { + WARN("Predicate arguments must be stored in a buffer.\n"); + return; + } + + FIXME("Predication doesn't support clear and copy commands, and predication " + "values are treated as 32-bit values.\n"); + cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; + cond_info.pNext = NULL; + cond_info.buffer = resource->u.vk_buffer; + cond_info.offset = aligned_buffer_offset; + switch (operation) + { + case D3D12_PREDICATION_OP_EQUAL_ZERO: + cond_info.flags = 0; + break; + case D3D12_PREDICATION_OP_NOT_EQUAL_ZERO: + cond_info.flags = VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT; + break; + default: + WARN("Unknown predication op %#x.\n", operation); + return; + } + + /* Must end any current predication before beginning a new one */ + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + + VK_CALL(vkCmdBeginConditionalRenderingEXT(list->vk_command_buffer, &cond_info)); + list->is_predicated = true; + } + else + { + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); + list->is_predicated = false; + } } static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8..217c1c8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -142,6 +142,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ + {VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_conditional_rendering)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, @@ -673,6 +674,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceProperties2KHR properties2; /* features */ + VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -684,6 +686,7 @@ struct vkd3d_physical_device_info static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; @@ -696,6 +699,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; memset(info, 0, sizeof(*info)); + conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; @@ -705,7 +709,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -999,6 +1005,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; @@ -1109,6 +1116,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" runtimeDescriptorArray: %#x.\n", descriptor_indexing->runtimeDescriptorArray); + conditional_rendering_features = &info->conditional_rendering_features; + TRACE(" VkPhysicalDeviceConditionalRenderingFeaturesEXT:\n"); + TRACE(" conditionalRendering: %#x.\n", conditional_rendering_features->conditionalRendering); + depth_clip_features = &info->depth_clip_features; TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); @@ -1337,6 +1348,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + vulkan_info->EXT_conditional_rendering = physical_device_info->conditional_rendering_features.conditionalRendering; vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a95..e0d563f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -97,6 +97,7 @@ struct vkd3d_vulkan_info bool KHR_maintenance3; bool KHR_push_descriptor; /* EXT device extensions */ + bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; @@ -907,6 +908,8 @@ struct d3d12_command_list bool xfb_enabled; + bool is_predicated; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index a55fb07..702cfd2 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -192,6 +192,10 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_conditional_rendering */ +VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) +VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) + /* VK_EXT_debug_marker */ VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) -- 2.21.0

1 1

[PATCH 1/5] kernel32/tests: Fix NtMapViewOfSection tests results for w1064v1809
by Rémi Bernon 14 Jun '19

14 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0b718606d0e..0387e157ac7 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1265,8 +1265,8 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1288,7 +1288,8 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1328,25 +1329,29 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || broken(status == STATUS_MAPPED_ALIGNMENT) /* w1064v1809 */, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1001; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 1; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) @@ -1409,7 +1414,8 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); todo_wine - ok( status == STATUS_INVALID_PARAMETER_9, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); } status = pNtUnmapViewOfSection( hProcess, ptr ); -- 2.20.1

2 8

[PATCH] wtsapi32: add semi-stub for WTSDomainName case in WTSQuerySessionInformation
by Louis Lenders 14 Jun '19

14 Jun '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47310 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wtsapi32/tests/wtsapi.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..49ff9a8c5a 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -102,6 +102,15 @@ static void test_WTSQuerySessionInformationW(void) ok(ret, "got %u\n", GetLastError()); ok(buf != NULL, "buf not set\n"); ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); + + count = 0; + buf = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); + trace("domain name: %s\n", wine_dbgstr_w(buf)); + WTSFreeMemory(buf); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf9215fd..41e3e3eab4 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -246,6 +246,20 @@ BOOL WINAPI WTSQuerySessionInformationW( *BytesReturned = count * sizeof(WCHAR); return TRUE; } + + if (WTSInfoClass == WTSDomainName) + { + WCHAR *computername; + DWORD count = MAX_COMPUTERNAME_LENGTH + 1; + + if (!(computername = heap_alloc(count * sizeof(WCHAR)))) return FALSE; + GetComputerNameW(computername, &count); + count++; /* include NULL terminator */ + *Buffer = computername; + *BytesReturned = count * sizeof(WCHAR); + return TRUE; + } + return FALSE; } -- 2.20.1

1 0

[PATCH] po: Update on Brazilian Portuguese translation
by Roberto Pungartnik 14 Jun '19

14 Jun '19

1 0

[PATCH 5/5] wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 87 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 +++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71bec04ed11..16f0a56875f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2494,10 +2494,74 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); } +static void wined3d_texture_gl_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + unsigned int src_level, src_width, src_height, src_depth; + unsigned int src_row_pitch, src_slice_pitch; + BOOL srgb = FALSE; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) + { + FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", + dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), srgb); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2881,6 +2945,7 @@ static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3297,6 +3362,7 @@ static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3870,17 +3936,30 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) { + unsigned int src_level, dst_level, dst_row_pitch, dst_slice_pitch; + unsigned int dst_location = dst_texture->resource.map_binding; struct wined3d_context *context; struct wined3d_bo_address data; - DWORD dst_location = dst_texture->resource.map_binding; + struct wined3d_box src_box; + unsigned int src_location; context = context_acquire(src_texture->resource.device, NULL, 0); wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), - !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + if (src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + src_level = src_sub_resource_idx % src_texture->level_count; + wined3d_texture_get_level_box(src_texture, src_level, &src_box); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + wined3d_texture_get_pitch(dst_texture, dst_level, &dst_row_pitch, &dst_slice_pitch); + + src_texture->texture_ops->texture_download_data(context, src_texture, src_sub_resource_idx, src_location, + &src_box, &data, dst_texture->resource.format, 0, 0, 0, dst_row_pitch, dst_slice_pitch); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31eb31a52f8..bbcc6acf164 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3386,6 +3386,11 @@ struct wined3d_texture_ops const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + void (*texture_download_data)(struct wined3d_context *context, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, unsigned int src_location, const struct wined3d_box *src_box, + const struct wined3d_bo_address *dst_bo_addr, const struct wined3d_format *dst_format, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_generate_fbo_key().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 15ee0314daf..6258771976a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -498,12 +498,11 @@ static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct } } -static void context_generate_fbo_key(const struct wined3d_context *context, +static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - unsigned int buffers = context->gl_info->limits.buffers; + unsigned int buffers = context_gl->c.gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; @@ -519,11 +518,13 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; entry = heap_alloc(sizeof(*entry)); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -550,7 +551,8 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, + render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -618,7 +620,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } } - context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + wined3d_context_gl_generate_fbo_key(context_gl, &fbo_key, + render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) { -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_set_fbo_key_for_render_target().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ed1e48dfdd..15ee0314daf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -428,7 +428,7 @@ static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resour return (1u << 31) | wined3d_texture_get_gl_buffer(texture_from_resource(resource)); } -static inline void context_set_fbo_key_for_render_target(const struct wined3d_context *context, +static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct wined3d_context_gl *context_gl, struct wined3d_fbo_entry_key *key, unsigned int idx, const struct wined3d_rendertarget_info *render_target, DWORD location) { @@ -475,11 +475,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); break; case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, context, TRUE); + key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, TRUE); break; case WINED3D_LOCATION_RB_MULTISAMPLE: @@ -502,14 +502,15 @@ static void context_generate_fbo_key(const struct wined3d_context *context, struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); unsigned int buffers = context->gl_info->limits.buffers; unsigned int i; key->rb_namespace = 0; - context_set_fbo_key_for_render_target(context, key, 0, depth_stencil, ds_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, 0, depth_stencil, ds_location); for (i = 0; i < buffers; ++i) - context_set_fbo_key_for_render_target(context, key, i + 1, &render_targets[i], color_location); + wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, i + 1, &render_targets[i], color_location); memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d1954692013..2ed1e48dfdd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -213,10 +213,9 @@ static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_g } /* Context activation is done by the caller. */ -static void context_attach_surface_fbo(struct wined3d_context *context, - GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) +static void wined3d_context_gl_attach_surface_fbo(struct wined3d_context_gl *context_gl, + GLenum fbo_target, unsigned int idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -735,8 +734,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], - entry->key.rb_namespace & (1 << (i + 1))); + wined3d_context_gl_attach_surface_fbo(context_gl, target, i, + &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo().
by Henri Verbeet 14 Jun '19

14 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be3461493d2..d1954692013 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -173,12 +173,11 @@ static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl * } /* Context activation is done by the caller. */ -static void context_attach_depth_stencil_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD flags) + uint32_t flags) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (resource->object) { @@ -740,8 +739,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, entry->flags); + wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, + &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ -- 2.11.0

1 0

[PATCH] kernel32/tests: Add a test for GetTickCount().
by Huw Davies 14 Jun '19

14 Jun '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/time.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 536f23359b..5faabd36e1 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -32,6 +32,7 @@ static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); static BOOL (WINAPI *pGetTimeZoneInformationForYear)(USHORT, PDYNAMIC_TIME_ZONE_INFORMATION, LPTIME_ZONE_INFORMATION); +static ULONG (WINAPI *pNtGetTickCount)(void); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -1004,9 +1005,32 @@ static void test_GetTimeZoneInformationForYear(void) "GetTimeZoneInformationForYear err %u\n", GetLastError()); } +static void test_GetTickCount(void) +{ + DWORD t1, t2, t3; + int i = 0; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount not implemented\n"); + return; + } + + do + { + t1 = pNtGetTickCount(); + t2 = GetTickCount(); + t3 = pNtGetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "out of order %d %d\n", t1, t2); + ok(t2 <= t3, "out of order %d %d\n", t2, t3); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); + HMODULE hntdll = GetModuleHandleA("ntdll"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes"); @@ -1015,6 +1039,7 @@ START_TEST(time) pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); + pNtGetTickCount = (void *)GetProcAddress(hntdll, "NtGetTickCount"); test_conversions(); test_invalid_arg(); @@ -1029,4 +1054,5 @@ START_TEST(time) test_GetSystemTimeAsFileTime(); test_GetSystemTimePreciseAsFileTime(); test_GetTimeZoneInformationForYear(); + test_GetTickCount(); } -- 2.18.0

1 0

[PATCH v6] ntdll: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 14 Jun '19

14 Jun '19

This adds support for checking the case-insensitive attribute on ext4 with newer kernels so that Wine can rely on it for performance. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/directory.c | 53 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..b18f56b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,32 +1173,33 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = TRUE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; - /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; - if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) return TRUE; - /* Normally, we'd have to parse the mtab to find out exactly what - * kind of FUSE FS this is. But, someone on wine-devel suggested - * a shortcut. We'll stat a special file in the directory. If it's - * there, we'll assume it's a CIOPFS, else not. - * This will break if somebody puts a file named ".ciopfs" in a non- - * CIOPFS directory. - */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; + sens = FALSE; } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + else + { + /* Assume CIOPFS is case insensitive. Normally, we'd have to parse + * the mtab to find out exactly what kind of FUSE FS this is. But, + * someone on wine-devel suggested a shortcut. We'll stat a special + * file in the directory. If it's there, we'll assume it's a CIOPFS, + * else not. This will break if somebody puts a file named ".ciopfs" + * in a non-CIOPFS directory. + */ + if (fstatfs( fd, &stfs ) != -1 && stfs.f_type == 0x65735546 /* FUSE_SUPER_MAGIC */ && + fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + sens = FALSE; + } + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1210,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { -- 2.21.0

2 1

[PATCH v7] ntdll: Add support for EXT4 per directory case folding.
by Huw Davies 14 Jun '19

14 Jun '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/directory.c | 47 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 6605999b82..dd0062d6e8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,32 +1173,27 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = TRUE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; - /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; - if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) return TRUE; - /* Normally, we'd have to parse the mtab to find out exactly what - * kind of FUSE FS this is. But, someone on wine-devel suggested - * a shortcut. We'll stat a special file in the directory. If it's - * there, we'll assume it's a CIOPFS, else not. - * This will break if somebody puts a file named ".ciopfs" in a non- - * CIOPFS directory. - */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; + sens = FALSE; } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + else if (fstatfs( fd, &stfs ) == 0 && /* CIOPFS is case insensitive. Instead of */ + stfs.f_type == 0x65735546 /* FUSE_SUPER_MAGIC */ && /* parsing mtab to discover if the FUSE FS */ + fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) /* is CIOPFS, look for .ciopfs in the dir. */ + { + sens = FALSE; + } + + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1204,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { -- 2.17.1

1 0

[PATCH v3] ddraw: Set dwZBufferBitDepth in ddraw7_GetCaps
by David Adam 14 Jun '19

14 Jun '19

This patch was written by Michael Muller.

2 1

[PATCH v2] ddraw: Set dwZBufferBitDepth in ddraw_GetCaps
by David Adam 14 Jun '19

14 Jun '19

This patch was written by Michael Muller.

2 1

[PATCH 1/6] qcap/avimux: Use strmbase_sink_init() and heap_alloc_zero() in create_input_pin().
by Zebediah Figura 13 Jun '19

13 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index d289d2b9fed..9dcff5074e6 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -139,7 +139,8 @@ static void avi_mux_destroy(BaseFilter *iface) IPin_Disconnect(&filter->in[i]->pin.pin.IPin_iface); IMemAllocator_Release(filter->in[i]->samples_allocator); filter->in[i]->samples_allocator = NULL; - BaseInputPinImpl_Release(&filter->in[i]->pin.pin.IPin_iface); + strmbase_sink_cleanup(&filter->in[i]->pin); + heap_free(filter->in[i]); } heap_free(filter->idx1); @@ -2214,6 +2215,7 @@ static const IQualityControlVtbl AviMuxIn_QualityControlVtbl = { static HRESULT create_input_pin(AviMux *avimux) { static const WCHAR name[] = {'I','n','p','u','t',' ','0','0',0}; + AviMuxIn *object; PIN_INFO info; HRESULT hr; @@ -2226,40 +2228,39 @@ static HRESULT create_input_pin(AviMux *avimux) info.achName[7] = '0' + (avimux->input_pin_no+1) % 10; info.achName[6] = '0' + (avimux->input_pin_no+1) / 10; - hr = BaseInputPin_Construct(&AviMuxIn_PinVtbl, sizeof(AviMuxIn), &info, - &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL, (IPin**)&avimux->in[avimux->input_pin_no]); - if(FAILED(hr)) - return hr; - avimux->in[avimux->input_pin_no]->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; - avimux->in[avimux->input_pin_no]->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; - avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; - avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_sink_init(&object->pin, &AviMuxIn_PinVtbl, &info, + &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL); + object->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; + object->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; + object->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; + object->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; - avimux->in[avimux->input_pin_no]->samples_head = NULL; hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->samples_allocator); + if (FAILED(hr)) + { + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->pin.pAllocator); - if(FAILED(hr)) { - IMemAllocator_Release(avimux->in[avimux->input_pin_no]->samples_allocator); - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->pin.pAllocator); + if (FAILED(hr)) + { + IMemAllocator_Release(object->samples_allocator); + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } - avimux->in[avimux->input_pin_no]->stream_time = 0; - memset(&avimux->in[avimux->input_pin_no]->strh, 0, sizeof(avimux->in[avimux->input_pin_no]->strh)); - avimux->in[avimux->input_pin_no]->strf = NULL; - memset(&avimux->in[avimux->input_pin_no]->indx_data, 0, sizeof(avimux->in[avimux->input_pin_no]->indx_data)); - memset(&avimux->in[avimux->input_pin_no]->ix_data, 0, sizeof(avimux->in[avimux->input_pin_no]->ix_data)); - avimux->in[avimux->input_pin_no]->indx = (AVISUPERINDEX*)&avimux->in[avimux->input_pin_no]->indx_data; - avimux->in[avimux->input_pin_no]->ix = (AVISTDINDEX*)avimux->in[avimux->input_pin_no]->ix_data; + object->indx = (AVISUPERINDEX *)&object->indx_data; + object->ix = (AVISTDINDEX *)object->ix_data; - avimux->input_pin_no++; + avimux->in[avimux->input_pin_no++] = object; return S_OK; } -- 2.20.1

1 5

[PATCH 1/2] widl: Mark unions, user types, and ranges as IsSimpleRef.
by Zebediah Figura 13 Jun '19

13 Jun '19

This fixes a regression introduced by 02976b655a5d9ad8ee25dbfb2051acb5b7431381. That patch should only have affected arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f320f57789a..fbc9f3cc5bd 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1064,7 +1064,8 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: - *flags |= MustFree; + *flags |= MustFree | IsSimpleRef; + *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_ARRAY: -- 2.20.1

1 1

[PATCH v2 1/3] ntdll: Implement RtlCreateUserStack() and RtlFreeUserStack().
by Zebediah Figura 13 Jun '19

13 Jun '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/loader.c | 7 ++++++- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 7 ++++++- dlls/ntdll/virtual.c | 46 +++++++++++++++++++++++++++++++++++++---- include/winternl.h | 12 ++++++----- 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f422a9c0bee..3d747edaba3b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3787,6 +3787,7 @@ void __wine_process_init(void) ANSI_STRING func_name; UNICODE_STRING nt_name; void * (CDECL *init_func)(void); + INITIAL_TEB stack; thread_init(); @@ -3838,11 +3839,15 @@ void __wine_process_init(void) RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) + if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) { ERR( "Main exe initialization for %s failed, status %x\n", debugstr_w(wm->ldr.FullDllName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } + NtCurrentTeb()->Tib.StackBase = stack.StackBase; + NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; + NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + server_init_process_done(); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aeb9735ba100..e0def228de07 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr long long long long ptr) @ stub RtlCreateUserSecurityObject +@ stdcall RtlCreateUserStack(long long long long long ptr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) @ stub RtlCustomCPToUnicodeN @ stub RtlCutoverTimeToSystemTime @@ -644,7 +645,7 @@ @ stdcall RtlFreeSid (ptr) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) -@ stub RtlFreeUserThreadStack +@ stdcall RtlFreeUserStack(ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stub RtlGenerate8dot3Name @ stdcall RtlGetAce(ptr long ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38adc..d1b895cd364a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -173,7 +173,7 @@ extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_ pe_image_info_t *image_info ) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, +extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack( void *stack_end ) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400d2..f612d135273f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -416,6 +416,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, SIZE_T extra_stack = PTHREAD_STACK_MIN; data_size_t len = 0; struct object_attributes *objattr = NULL; + INITIAL_TEB stack; if (process != NtCurrentProcess()) { @@ -507,9 +508,13 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, info->entry_point = start; info->entry_arg = param; - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, &extra_stack ))) + if ((status = virtual_alloc_thread_stack( &stack, stack_reserve, stack_commit, &extra_stack ))) goto error; + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda43..a3ea195c917b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1924,7 +1924,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) +NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { struct file_view *view; NTSTATUS status; @@ -1978,9 +1978,11 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi } /* note: limit is lower than base since the stack grows down */ - teb->DeallocationStack = view->base; - teb->Tib.StackBase = (char *)view->base + view->size; - teb->Tib.StackLimit = (char *)view->base + 2 * page_size; + stack->OldStackBase = 0; + stack->OldStackLimit = 0; + stack->DeallocationStack = view->base; + stack->StackBase = (char *)view->base + view->size; + stack->StackLimit = (char *)view->base + 2 * page_size; done: server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; @@ -2001,6 +2003,42 @@ void virtual_clear_thread_stack( void *stack_end ) if (force_exec_prot) mprotect( stack, size, PROT_READ | PROT_WRITE | PROT_EXEC ); } +/********************************************************************** + * RtlCreateUserStack (NTDLL.@) + */ +NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bits, + SIZE_T commit_align, SIZE_T reserve_align, INITIAL_TEB *stack ) +{ + TRACE("commit %#lx, reserve %#lx, zero_bits %u, commit_align %#lx, reserve_align %#lx, stack %p\n", + commit, reserve, zero_bits, commit_align, reserve_align, stack); + + if (!commit_align || !reserve_align) + return STATUS_INVALID_PARAMETER; + + if (!commit || !reserve) + { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (!reserve) reserve = nt->OptionalHeader.SizeOfStackReserve; + if (!commit) commit = nt->OptionalHeader.SizeOfStackCommit; + } + + reserve = (reserve + reserve_align - 1) & ~(reserve_align - 1); + commit = (commit + commit_align - 1) & ~(commit_align - 1); + + return virtual_alloc_thread_stack( stack, reserve, commit, NULL ); +} + +/********************************************************************** + * RtlFreeUserStack (NTDLL.@) + */ +void WINAPI RtlFreeUserStack( void *stack ) +{ + SIZE_T size = 0; + + TRACE("stack %p\n", stack); + + NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); +} /*********************************************************************** * virtual_handle_fault diff --git a/include/winternl.h b/include/winternl.h index e7f89b005922..b87aa2298c6b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2104,11 +2104,11 @@ typedef struct _DIRECTORY_BASIC_INFORMATION { } DIRECTORY_BASIC_INFORMATION, *PDIRECTORY_BASIC_INFORMATION; typedef struct _INITIAL_TEB { - PVOID StackBase; - PVOID StackLimit; - PVOID StackCommit; - PVOID StackCommitMax; - PVOID StackReserved; + void *OldStackBase; + void *OldStackLimit; + void *StackBase; + void *StackLimit; + void *DeallocationStack; } INITIAL_TEB, *PINITIAL_TEB; typedef enum _PORT_INFORMATION_CLASS { @@ -2618,6 +2618,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserStack(SIZE_T,SIZE_T,ULONG,SIZE_T,SIZE_T,INITIAL_TEB*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); @@ -2691,6 +2692,7 @@ NTSYSAPI void WINAPI RtlFreeOemString(POEM_STRING); NTSYSAPI DWORD WINAPI RtlFreeSid(PSID); NTSYSAPI void WINAPI RtlFreeThreadActivationContextStack(void); NTSYSAPI void WINAPI RtlFreeUnicodeString(PUNICODE_STRING); +NTSYSAPI void WINAPI RtlFreeUserStack(void*); NTSYSAPI NTSTATUS WINAPI RtlGetAce(PACL,DWORD,LPVOID *); NTSYSAPI NTSTATUS WINAPI RtlGetActiveActivationContext(HANDLE*); NTSYSAPI NTSTATUS WINAPI RtlGetCompressionWorkSpaceSize(USHORT,PULONG,PULONG); -- 2.20.1

2 3

[PATCH v5] ntdll/directory: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 13 Jun '19

13 Jun '19

This adds support for checking the case-insensitive attribute on ext4 with newer kernels so that Wine can rely on it for performance. Checking for the EXT4_CASEFOLD_FL attribute involves an ioctl, which operates on file descriptors, while all the former checks operated directly on the dir pathname (e.g. statfs). Obviously, it's best to avoid looking up the directory multiple times (also for correctness, so it refers to the same dir). So in the case that we *do* have a file descriptor, then use it everywhere, with e.g. fstatfs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v5: Only use the file descriptor on Linux. The second patch is not resent since it's in staging for users to test out first before going upstream. dlls/ntdll/directory.c | 44 +++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..9b4e61b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,14 +1173,23 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = FALSE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; + + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) + return FALSE; + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) + goto end; /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; + if (fstatfs( fd, &stfs ) == -1) goto end; + + sens = TRUE; if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) - return TRUE; + goto end; /* Normally, we'd have to parse the mtab to find out exactly what * kind of FUSE FS this is. But, someone on wine-devel suggested * a shortcut. We'll stat a special file in the directory. If it's @@ -1180,17 +1197,12 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * This will break if somebody puts a file named ".ciopfs" in a non- * CIOPFS directory. */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) - { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; - } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + if (fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + sens = FALSE; + +end: + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1213,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { -- 2.21.0

2 2

[PATCH v4 1/3] wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Paul Gofman 13 Jun '19

13 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: no changes v3: - Split off w component handling for zero norm in a separate patch. v4: no changes dlls/wined3d/glsl_shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c934528981..f2fa18dba8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4260,8 +4260,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); if (mask_size > 1) -- 2.21.0

3 6

[PATCH vkd3d 4/4] vkd3d: Use FIXME_ONCE() for AntialiasedLineEnable.
by Józef Kucia 13 Jun '19

13 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 64be72d5af9c..794668041fa2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1722,7 +1722,7 @@ static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, if (d3d12_desc->MultisampleEnable) FIXME_ONCE("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); if (d3d12_desc->AntialiasedLineEnable) - FIXME("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); + FIXME_ONCE("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); if (d3d12_desc->ForcedSampleCount) FIXME("Ignoring ForcedSampleCount %#x.\n", d3d12_desc->ForcedSampleCount); if (d3d12_desc->ConservativeRaster) -- 2.21.0

2 1

[PATCH vkd3d 3/4] vkd3d: Avoid busy-waiting in fence worker thread.
by Józef Kucia 13 Jun '19

13 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> This might delay updating a d3d12_fence when a fence enqueued later than other fences is signaled before them. On the other hand, it significantly reduces CPU usage. I haven't found a program negatively impacted by this change so far. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7634e71b32ee..75556f5335e3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -362,7 +362,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) return; vr = VK_CALL(vkWaitForFences(device->vk_device, - worker->fence_count, worker->vk_fences, VK_FALSE, 0)); + worker->fence_count, worker->vk_fences, VK_FALSE, ~(uint64_t)0)); if (vr == VK_TIMEOUT) return; if (vr != VK_SUCCESS) -- 2.21.0

2 1

[PATCH vkd3d 2/4] vkd3d: Avoid holding mutex while waiting for fences.
by Józef Kucia 13 Jun '19

13 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> We maintain separate arrays for enqueued fences and fences owned by the fence worker thread. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 10 +- libs/vkd3d/command.c | 164 +++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 15 +++ 3 files changed, 137 insertions(+), 52 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 244209243594..16c31e633ab1 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -118,7 +118,7 @@ static inline LONG InterlockedIncrement(LONG volatile *x) return __sync_add_and_fetch(x, 1); } # else -# error "InterlockedIncrement not implemented for this platform" +# error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ # if HAVE_SYNC_SUB_AND_FETCH @@ -127,8 +127,14 @@ static inline LONG InterlockedDecrement(LONG volatile *x) return __sync_sub_and_fetch(x, 1); } # else -# error "InterlockedDecrement not implemented for this platform" +# error "InterlockedDecrement() not implemented for this platform" # endif #endif /* _WIN32 */ +#if HAVE_SYNC_ADD_AND_FETCH +# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) +#else +# error "atomic_add_fetch() not implemented for this platform" +#endif /* HAVE_SYNC_ADD_AND_FETCH */ + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 25c8005dc445..7634e71b32ee 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -257,27 +257,22 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if (!vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, - worker->fence_count + 1, sizeof(*worker->vk_fences))) - { - ERR("Failed to add GPU fence.\n"); - pthread_mutex_unlock(&worker->mutex); - return E_OUTOFMEMORY; - } - if (!vkd3d_array_reserve((void **)&worker->fences, &worker->fences_size, - worker->fence_count + 1, sizeof(*worker->fences))) + if (!vkd3d_array_reserve((void **)&worker->enqueued_fences, &worker->enqueued_fences_size, + worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences))) { ERR("Failed to add GPU fence.\n"); pthread_mutex_unlock(&worker->mutex); return E_OUTOFMEMORY; } - worker->vk_fences[worker->fence_count] = vk_fence; - worker->fences[worker->fence_count].fence = fence; - worker->fences[worker->fence_count].value = value; - worker->fences[worker->fence_count].queue = queue; - worker->fences[worker->fence_count].queue_sequence_number = queue_sequence_number; - ++worker->fence_count; + worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence; + worker->enqueued_fences[worker->enqueued_fence_count].fence = fence; + worker->enqueued_fences[worker->enqueued_fence_count].value = value; + worker->enqueued_fences[worker->enqueued_fence_count].queue = queue; + worker->enqueued_fences[worker->enqueued_fence_count].queue_sequence_number = queue_sequence_number; + ++worker->enqueued_fence_count; + + InterlockedIncrement(&fence->pending_worker_operation_count); pthread_cond_signal(&worker->cond); pthread_mutex_unlock(&worker->mutex); @@ -287,37 +282,73 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) { - struct d3d12_device *device = worker->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - unsigned int i, j; + LONG count; int rc; + if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + return; + + WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); + if ((rc = pthread_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return; } - for (i = 0, j = 0; i < worker->fence_count; ++i) + while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) { - if (worker->fences[i].fence == fence) - { - VK_CALL(vkDestroyFence(device->vk_device, worker->vk_fences[i], NULL)); - continue; - } + TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); - if (i != j) - { - worker->vk_fences[j] = worker->vk_fences[i]; - worker->fences[j] = worker->fences[i]; - } - ++j; + worker->pending_fence_destruction = true; + pthread_cond_signal(&worker->cond); + + pthread_cond_wait(&worker->fence_destruction_cond, &worker->mutex); } - worker->fence_count = j; + + TRACE("Removed fence %p.\n", fence); pthread_mutex_unlock(&worker->mutex); } +static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker) +{ + unsigned int i; + size_t count; + bool ret; + + if (!worker->enqueued_fence_count) + return; + + count = worker->fence_count + worker->enqueued_fence_count; + + ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, + count, sizeof(*worker->vk_fences)); + ret &= vkd3d_array_reserve((void **)&worker->fences, &worker->fences_size, + count, sizeof(*worker->fences)); + if (!ret) + { + ERR("Failed to reserve memory.\n"); + return; + } + + for (i = 0; i < worker->enqueued_fence_count; ++i) + { + struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i]; + + worker->vk_fences[worker->fence_count] = current->vk_fence; + + worker->fences[worker->fence_count].fence = current->fence; + worker->fences[worker->fence_count].value = current->value; + worker->fences[worker->fence_count].queue = current->queue; + worker->fences[worker->fence_count].queue_sequence_number = current->queue_sequence_number; + + ++worker->fence_count; + } + assert(worker->fence_count == count); + worker->enqueued_fence_count = 0; +} + static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) { struct d3d12_device *device = worker->device; @@ -351,6 +382,8 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); + InterlockedDecrement(&current->fence->pending_worker_operation_count); + vkd3d_queue_update_sequence_number(current->queue, current->queue_sequence_number, device); continue; } @@ -373,35 +406,48 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; - vkd3d_set_thread_name("vkd3d_worker"); + vkd3d_set_thread_name("vkd3d_fence"); for (;;) { - if ((rc = pthread_mutex_lock(&worker->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return NULL; - } + vkd3d_wait_for_gpu_fences(worker); - if (worker->should_exit && !worker->fence_count) + if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) { - pthread_mutex_unlock(&worker->mutex); - break; - } + if ((rc = pthread_mutex_lock(&worker->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + break; + } - if (!worker->fence_count) - { - if ((rc = pthread_cond_wait(&worker->cond, &worker->mutex))) + if (worker->pending_fence_destruction) { - ERR("Failed to wait on condition variable, error %d.\n", rc); - pthread_mutex_unlock(&worker->mutex); - return NULL; + pthread_cond_broadcast(&worker->fence_destruction_cond); + worker->pending_fence_destruction = false; } - } - vkd3d_wait_for_gpu_fences(worker); + if (worker->enqueued_fence_count) + { + vkd3d_fence_worker_move_enqueued_fences_locked(worker); + } + else + { + if (worker->should_exit) + { + pthread_mutex_unlock(&worker->mutex); + break; + } - pthread_mutex_unlock(&worker->mutex); + if ((rc = pthread_cond_wait(&worker->cond, &worker->mutex))) + { + ERR("Failed to wait on condition variable, error %d.\n", rc); + pthread_mutex_unlock(&worker->mutex); + break; + } + } + + pthread_mutex_unlock(&worker->mutex); + } } return NULL; @@ -416,8 +462,13 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, TRACE("worker %p.\n", worker); worker->should_exit = false; + worker->pending_fence_destruction = false; worker->device = device; + worker->enqueued_fence_count = 0; + worker->enqueued_fences = NULL; + worker->enqueued_fences_size = 0; + worker->fence_count = 0; worker->vk_fences = NULL; @@ -438,11 +489,20 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } + if ((rc = pthread_cond_init(&worker->fence_destruction_cond, NULL))) + { + ERR("Failed to initialize condition variable, error %d.\n", rc); + pthread_mutex_destroy(&worker->mutex); + pthread_cond_destroy(&worker->cond); + return hresult_from_errno(rc); + } + if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, vkd3d_fence_worker_main, worker, &worker->thread))) { pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); + pthread_cond_destroy(&worker->fence_destruction_cond); } return hr; @@ -472,7 +532,9 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); + pthread_cond_destroy(&worker->fence_destruction_cond); + vkd3d_free(worker->enqueued_fences); vkd3d_free(worker->vk_fences); vkd3d_free(worker->fences); @@ -1047,6 +1109,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); + fence->pending_worker_operation_count = 0; + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9f00d327b73b..3af8a9594a5e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -156,7 +156,20 @@ struct vkd3d_fence_worker union vkd3d_thread_handle thread; pthread_mutex_t mutex; pthread_cond_t cond; + pthread_cond_t fence_destruction_cond; bool should_exit; + bool pending_fence_destruction; + + size_t enqueued_fence_count; + struct vkd3d_enqueued_fence + { + VkFence vk_fence; + struct d3d12_fence *fence; + uint64_t value; + struct vkd3d_queue *queue; + uint64_t queue_sequence_number; + } *enqueued_fences; + size_t enqueued_fences_size; size_t fence_count; VkFence *vk_fences; @@ -317,6 +330,8 @@ struct d3d12_fence struct list semaphores; unsigned int semaphore_count; + LONG pending_worker_operation_count; + VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS]; struct d3d12_device *device; -- 2.21.0

2 1

[PATCH vkd3d 1/4] tests: Add bug_if() for Nvidia tessellation shader bugs.
by Józef Kucia 13 Jun '19

13 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Those are fixed but the fixes are not released yet. --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a57a0453123f..81fb26ad7d60 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27042,6 +27042,7 @@ static void test_line_tessellation(void) data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 1]; + bug_if(is_nvidia_device(context.device)) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); -- 2.21.0

2 1

[PATCH v3 1/3] wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Paul Gofman 13 Jun '19

13 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: no changes v3: - Split off w component handling for zero norm in a separate patch. dlls/wined3d/glsl_shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c934528981..f2fa18dba8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4260,8 +4260,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); if (mask_size > 1) -- 2.21.0

2 3

[PATCH] winegstreamer: Add stub Video Processor MFT.
by Nikolay Sivov 13 Jun '19

13 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 25 +- dlls/winegstreamer/Makefile.in | 7 +- dlls/winegstreamer/gst_private.h | 3 + dlls/winegstreamer/main.c | 14 +- dlls/winegstreamer/mfplat.c | 444 +++++++++++++++++++++++++++++++ dlls/winegstreamer/mfplat.idl | 26 ++ 6 files changed, 513 insertions(+), 6 deletions(-) create mode 100644 dlls/winegstreamer/mfplat.c create mode 100644 dlls/winegstreamer/mfplat.idl diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 15aa58620a..8c1b0c294e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2079,7 +2079,6 @@ static void test_video_processor(void) hr = CoCreateInstance(&CLSID_VideoProcessorMFT, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); -todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "Failed to create video processor transform, hr %#x.\n", hr); if (FAILED(hr)) @@ -2120,12 +2119,14 @@ todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStatus(transform, 0, &flags); +todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStatus(transform, &flags); +todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputStreamAttributes(transform, 0, &attributes); @@ -2137,30 +2138,38 @@ todo_wine IMFAttributes_Release(attributes2); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); +todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); +todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 1, &media_type); +todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); +todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 1, &media_type); +todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); +todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + memset(&input_info, 0xcc, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); +todo_wine { ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); ok(input_info.cbSize == 0, "Unexpected size %u.\n", input_info.cbSize); ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); - +} hr = MFCreateMediaEvent(MEUnknown, &GUID_NULL, S_OK, NULL, &event); ok(hr == S_OK, "Failed to create event object, hr %#x.\n", hr); hr = IMFTransform_ProcessEvent(transform, 0, event); @@ -2174,6 +2183,7 @@ todo_wine { if (FAILED(hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type))) { + todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); break; } @@ -2254,17 +2264,22 @@ todo_wine ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); +todo_wine ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); +todo_wine ok(hr == S_OK, "Failed to set output type, hr %#x.\n", hr); + memset(&output_info, 0, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); +todo_wine ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); ok(output_info.dwFlags == 0, "Unexpected flags %#x.\n", output_info.dwFlags); +todo_wine ok(output_info.cbSize > 0, "Unexpected size %u.\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "Unexpected alignment %u.\n", output_info.cbAlignment); @@ -2278,20 +2293,24 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); +todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); +todo_wine ok(hr == S_OK, "Failed to push a sample, hr %#x.\n", hr); hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); +todo_wine ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); memset(&output_buffer, 0, sizeof(output_buffer)); output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); +todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -2302,6 +2321,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); +todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); @@ -2319,6 +2339,7 @@ todo_wine output_buffer.pSample = sample; flags = 0; hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); +todo_wine ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Failed to get output buffer, hr %#x.\n", hr); ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); ok(flags == 0, "Unexpected status %#x.\n", flags); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index fecabe8ba2..437915f6da 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) @@ -7,7 +7,10 @@ C_SRCS = \ gst_cbs.c \ gstdemux.c \ gsttffilter.c \ - main.c + main.c \ + mfplat.c + +IDL_SRCS = mfplat.idl RC_SRCS = \ rsrc.rc diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 85659c4bd9..06236e2636 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -53,4 +53,7 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN; extern const char *media_quark_string DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; +extern HRESULT mfplat_can_unload_now(void) DECLSPEC_HIDDEN; + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index f11e59a914..4419a6fde5 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -232,7 +232,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return STRMBASE_DllCanUnloadNow(); + HRESULT hr = STRMBASE_DllCanUnloadNow(); + + if (hr == S_OK) + hr = mfplat_can_unload_now(); + + return hr; } /*********************************************************************** @@ -240,7 +245,12 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - return STRMBASE_DllGetClassObject( rclsid, riid, ppv ); + HRESULT hr; + + if (FAILED(hr = mfplat_get_class_object(rclsid, riid, ppv))) + hr = STRMBASE_DllGetClassObject( rclsid, riid, ppv ); + + return hr; } /* GStreamer common functions */ diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c new file mode 100644 index 0000000000..2233bbe159 --- /dev/null +++ b/dlls/winegstreamer/mfplat.c @@ -0,0 +1,444 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "mfapi.h" +#include "mfidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static LONG object_locks; + +struct video_processor +{ + IMFTransform IMFTransform_iface; + LONG refcount; + IMFAttributes *attributes; + IMFAttributes *output_attributes; +}; + +static struct video_processor *impl_video_processor_from_IMFTransform(IMFTransform *iface) +{ + return CONTAINING_RECORD(iface, struct video_processor, IMFTransform_iface); +} + +static HRESULT WINAPI video_processor_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTransform) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTransform_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_processor_AddRef(IMFTransform *iface) +{ + struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); + ULONG refcount = InterlockedIncrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI video_processor_Release(IMFTransform *iface) +{ + struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); + ULONG refcount = InterlockedDecrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (transform->attributes) + IMFAttributes_Release(transform->attributes); + if (transform->output_attributes) + IMFAttributes_Release(transform->output_attributes); + heap_free(transform); + } + + return refcount; +} + +static HRESULT WINAPI video_processor_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, + DWORD *output_minimum, DWORD *output_maximum) +{ + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); + + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; + + return S_OK; +} + +static HRESULT WINAPI video_processor_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) +{ + TRACE("%p, %p, %p.\n", iface, inputs, outputs); + + *inputs = *outputs = 1; + + return S_OK; +} + +static HRESULT WINAPI video_processor_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, + DWORD output_size, DWORD *outputs) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) +{ + struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); + + TRACE("%p, %p.\n", iface, attributes); + + *attributes = transform->attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; +} + +static HRESULT WINAPI video_processor_GetInputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); + + TRACE("%p, %u, %p.\n", iface, id, attributes); + + *attributes = transform->output_attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; +} + +static HRESULT WINAPI video_processor_DeleteInputStream(IMFTransform *iface, DWORD id) +{ + TRACE("%p, %u.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) +{ + TRACE("%p, %u, %p.\n", iface, streams, ids); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) +{ + FIXME("%p, %u, %p.\n", iface, id, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_GetOutputStatus(IMFTransform *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) +{ + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) +{ + TRACE("%p, %u, %p.\n", iface, id, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) +{ + FIXME("%p, %u.\n", iface, message); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) +{ + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + + return E_NOTIMPL; +} + +static const IMFTransformVtbl video_processor_vtbl = +{ + video_processor_QueryInterface, + video_processor_AddRef, + video_processor_Release, + video_processor_GetStreamLimits, + video_processor_GetStreamCount, + video_processor_GetStreamIDs, + video_processor_GetInputStreamInfo, + video_processor_GetOutputStreamInfo, + video_processor_GetAttributes, + video_processor_GetInputStreamAttributes, + video_processor_GetOutputStreamAttributes, + video_processor_DeleteInputStream, + video_processor_AddInputStreams, + video_processor_GetInputAvailableType, + video_processor_GetOutputAvailableType, + video_processor_SetInputType, + video_processor_SetOutputType, + video_processor_GetInputCurrentType, + video_processor_GetOutputCurrentType, + video_processor_GetInputStatus, + video_processor_GetOutputStatus, + video_processor_SetOutputBounds, + video_processor_ProcessEvent, + video_processor_ProcessMessage, + video_processor_ProcessInput, + video_processor_ProcessOutput, +}; + +struct class_factory +{ + IClassFactory IClassFactory_iface; + LONG refcount; + HRESULT (*create_instance)(REFIID riid, void **obj); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("%s is not supported.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + return InterlockedIncrement(&factory->refcount); +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + ULONG refcount = InterlockedDecrement(&factory->refcount); + + if (!refcount) + heap_free(factory); + + return refcount; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + + TRACE("%p, %p, %s, %p.\n", iface, outer, debugstr_guid(riid), obj); + + if (outer) + { + *obj = NULL; + return CLASS_E_NOAGGREGATION; + } + + return factory->create_instance(riid, obj); +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p, %d.\n", iface, dolock); + + if (dolock) + InterlockedIncrement(&object_locks); + else + InterlockedDecrement(&object_locks); + + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static HRESULT video_processor_create(REFIID riid, void **ret) +{ + struct video_processor *object; + HRESULT hr; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFTransform_iface.lpVtbl = &video_processor_vtbl; + object->refcount = 1; + + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + goto failed; + + if (FAILED(hr = MFCreateAttributes(&object->output_attributes, 0))) + goto failed; + + *ret = &object->IMFTransform_iface; + return S_OK; + +failed: + + IMFTransform_Release(&object->IMFTransform_iface); + return hr; +} + +static const struct class_object +{ + const GUID *clsid; + HRESULT (*create_instance)(REFIID riid, void **obj); +} +class_objects[] = +{ + { &CLSID_VideoProcessorMFT, &video_processor_create }, +}; + +HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) +{ + struct class_factory *factory; + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(class_objects); ++i) + { + if (IsEqualGUID(class_objects[i].clsid, rclsid)) + { + if (!(factory = heap_alloc(sizeof(*factory)))) + return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &class_factory_vtbl; + factory->refcount = 1; + factory->create_instance = class_objects[i].create_instance; + + hr = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, obj); + IClassFactory_Release(&factory->IClassFactory_iface); + return hr; + } + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT mfplat_can_unload_now(void) +{ + return !object_locks ? S_OK : S_FALSE; +} diff --git a/dlls/winegstreamer/mfplat.idl b/dlls/winegstreamer/mfplat.idl new file mode 100644 index 0000000000..05a75bdb8e --- /dev/null +++ b/dlls/winegstreamer/mfplat.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + threading(both), + uuid(88753b26-5b24-49bd-b2e7-0c445c78c982) + +] +coclass VideoProcessorMFT { } -- 2.20.1

2 1

[PATCH 5/5] wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture().
by Henri Verbeet 13 Jun '19

13 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f6d620337c..71bec04ed11 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3850,15 +3850,15 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format, - src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), + src_texture->resource.format, src_box, src_row_pitch, src_slice_pitch, dst_texture, + dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, dst_x, dst_y, dst_z); context_release(context); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix().
by Henri Verbeet 13 Jun '19

13 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a83d444fba8..44b6c48e677 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5470,9 +5470,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w } /* Setup this textures matrix according to the texture flags. */ -static void compute_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, - DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, - BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) +static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, + BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; @@ -5586,13 +5585,12 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) { const struct wined3d_device *device = context->device; - const struct wined3d_gl_info *gl_info = context->gl_info; BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], WINED3D_MAX_TEXTURES - 1); - compute_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + tex], + compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], generated, context->last_was_rhw, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_attach_gl_texture_fbo().
by Henri Verbeet 13 Jun '19

13 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a56576d8973..be3461493d2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -127,10 +127,10 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf } } -static void context_attach_gl_texture_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!resource) { @@ -177,6 +177,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (resource->object) @@ -191,24 +192,24 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, resource); if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, resource); } if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } else { TRACE("Attach depth stencil 0.\n"); - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } } @@ -216,7 +217,8 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, static void context_attach_surface_fbo(struct wined3d_context *context, GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -230,12 +232,12 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); } } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); } } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_bind().
by Henri Verbeet 13 Jun '19

13 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/sampler.c | 5 ++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 8c3a94766a5..bfc3aec38eb 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -182,10 +182,9 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d87f6088ea6..06b30ba5e1e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3638,7 +3638,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } } - wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context); + wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context_gl); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 06e24fb8ebc..d74c36f36f3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -839,7 +839,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl if (view_gl->gl_view.name) { wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); - wined3d_sampler_bind(sampler, unit, NULL, context); + wined3d_sampler_bind(sampler, unit, NULL, context_gl); return; } @@ -851,7 +851,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); - wined3d_sampler_bind(sampler, unit, texture_gl, context); + wined3d_sampler_bind(sampler, unit, texture_gl, context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece1acae94a..31eb31a52f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3685,7 +3685,7 @@ struct wined3d_sampler }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration_element { -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer().
by Henri Verbeet 13 Jun '19

13 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 76b5858c0b6..a56576d8973 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -613,7 +613,7 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - &context_gl->c, ds_level, &render_targets[0]); + context_gl, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3c58cb875e..3f6d620337c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1452,9 +1452,9 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_renderbuffer_entry *entry; unsigned int src_width, src_height; unsigned int width, height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 91570ed79f4..ece1acae94a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3626,7 +3626,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; #define WINED3D_LOCATION_DISCARDED 0x00000001 -- 2.11.0

1 0

[PATCH v12 1/2] ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics
by Rémi Bernon 13 Jun '19

13 Jun '19

This parameter was misinterpreted as an alignment parameter for the lower bits of the allocated memory region, although it is a constraint on the higher bits. Add a new internal ntdll virtual_alloc_aligned function that has a separate alignment parameter which is now used instead of the zero_bits parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/directory.c | 4 +-- dlls/ntdll/heap.c | 5 ++-- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 12 ++++----- dlls/ntdll/signal_arm64.c | 16 ++++++------ dlls/ntdll/signal_i386.c | 16 ++++++------ dlls/ntdll/signal_powerpc.c | 12 ++++----- dlls/ntdll/signal_x86_64.c | 16 ++++++------ dlls/ntdll/tests/virtual.c | 4 +-- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 49 ++++++++++++++++++++++++++----------- 11 files changed, 79 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9781f..6605999b824 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1603,14 +1603,14 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) SIZE_T size = 2 * sizeof(*de) + page_size; void *addr = NULL; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_RESERVE, PAGE_READWRITE )) + if (virtual_alloc_aligned( &addr, 0, &size, MEM_RESERVE, PAGE_READWRITE, 1 )) return NULL; /* commit only the size needed for the dir entries */ /* this leaves an extra unaccessible page, which should make the kernel */ /* fail with -EFAULT before it stomps all over our memory */ de = addr; size = 2 * sizeof(*de); - NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_COMMIT, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 1 ); } /* set d_reclen to 65535 to work around an AFS kernel bug */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cccaaee1d45..2d2caf551e3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -726,8 +726,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, - &block_size, MEM_COMMIT, get_protection_type( flags ) )) + if (virtual_alloc_aligned( &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ), 5 )) { WARN("Could not allocate block for %08lx bytes\n", size ); return NULL; @@ -1521,7 +1520,7 @@ void heap_set_debug_flags( HANDLE handle ) void *ptr = NULL; SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); - if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + if (!virtual_alloc_aligned( &ptr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 4 )) { heap->pending_free = ptr; heap->pending_pos = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38ad..f371a0ab42d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,6 +168,8 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S UINT disposition ) DECLSPEC_HIDDEN; /* virtual memory */ +extern NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ); extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e01c8ce2193..cf7f2d13160 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -967,22 +967,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 94520c95ced..d2d43b34bc1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -871,24 +871,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b4e88d125f1..b2925062bf7 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2312,25 +2312,25 @@ static void ldt_unlock(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; struct x86_thread_data *thread_data; SIZE_T size; void *addr = NULL; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_mask = (1 << sigstack_zero_bits) - 1; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_mask = (1 << sigstack_alignment) - 1; + signal_stack_size = (1 << sigstack_alignment) - teb_size; } size = signal_stack_mask + 1; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { *teb = addr; (*teb)->Tib.Self = &(*teb)->Tib; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54f..f23265445df 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1018,22 +1018,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2633b988b62..b024de76421 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3263,24 +3263,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 195a54704fb..ff10508a604 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -55,7 +55,6 @@ static void test_AllocateVirtualMemory(void) addr2 = (char *)addr1 + 0x1000; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { @@ -141,12 +140,11 @@ static void test_AllocateVirtualMemory(void) } else { - todo_wine ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine + todo_wine_if((UINT_PTR)addr2 & ~zero_bits) ok(((UINT_PTR)addr2 & ~zero_bits) == 0, "NtAllocateVirtualMemory returned address %p\n", addr2); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400d..96aa6be7f2c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -184,8 +184,7 @@ void thread_init(void) addr = NULL; size = sizeof(*peb); - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 1, &size, - MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE, 1 ); peb = addr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda4..7a6e461ffaf 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1083,7 +1083,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) * The csVirtual section must be held by caller. */ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t mask, - int top_down, unsigned int vprot ) + int top_down, unsigned int vprot, size_t zero_bits ) { void *ptr; NTSTATUS status; @@ -1101,6 +1101,9 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t view_size = size + mask + 1; struct alloc_area alloc; + if (zero_bits) + FIXME("Unimplemented zero_bits parameter value\n"); + alloc.size = size; alloc.mask = mask; alloc.top_down = top_down; @@ -1284,7 +1287,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot if (addr != low_64k) { if (addr != (void *)-1) munmap( addr, dosmem_size - 0x10000 ); - return map_view( view, NULL, dosmem_size, 0xffff, 0, vprot ); + return map_view( view, NULL, dosmem_size, 0xffff, 0, vprot, 0 ); } } @@ -1388,11 +1391,11 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, SIZE_T m if (base >= (char *)address_space_start) /* make sure the DOS area remains free */ status = map_view( &view, base, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY, 0 ); if (status != STATUS_SUCCESS) status = map_view( &view, NULL, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY, 0 ); if (status != STATUS_SUCCESS) goto error; @@ -1713,7 +1716,7 @@ NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, S get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ); vprot |= sec_flags; if (!(sec_flags & SEC_RESERVE)) vprot |= VPROT_COMMITTED; - res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); + res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot, zero_bits ); if (res) { server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1946,7 +1949,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, 0xffff, 0, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 0 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -2461,19 +2464,16 @@ void virtual_set_large_address_space(void) NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect ) { - void *base; - unsigned int vprot; SIZE_T size = *size_ptr; - SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; - BOOL is_dos_memory = FALSE; - struct file_view *view; - sigset_t sigset; TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); if (!size) return STATUS_INVALID_PARAMETER; - if (!mask) return STATUS_INVALID_PARAMETER_3; + if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; +#ifndef _WIN64 + if (!is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#endif if (process != NtCurrentProcess()) { @@ -2499,6 +2499,27 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ return result.virtual_alloc.status; } + return virtual_alloc_aligned( ret, zero_bits, size_ptr, type, protect, 0 ); +} + + +/*********************************************************************** + * virtual_alloc_aligned (NTDLL.@) + * + * Same as NtAllocateVirtualMemory but with an alignment parameter + */ +NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ) +{ + void *base; + unsigned int vprot; + SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( alignment ); + NTSTATUS status = STATUS_SUCCESS; + BOOL is_dos_memory = FALSE; + struct file_view *view; + sigset_t sigset; + /* Round parameters to a page boundary */ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; @@ -2550,7 +2571,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); - else status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot ); + else status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot, zero_bits ); if (status == STATUS_SUCCESS) base = view->base; } -- 2.20.1

2 2

[PATCH v13] ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics
by Huw Davies 13 Jun '19

13 Jun '19

From: Rémi Bernon <rbernon(a)codeweavers.com> This parameter was misinterpreted as an alignment parameter for the lower bits of the allocated memory region, although it is a constraint on the higher bits. Add a new internal ntdll virtual_alloc_aligned function that has a separate alignment parameter which is now used instead of the zero_bits parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/directory.c | 4 +-- dlls/ntdll/heap.c | 5 ++-- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 12 ++++----- dlls/ntdll/signal_arm64.c | 16 ++++++------ dlls/ntdll/signal_i386.c | 16 ++++++------ dlls/ntdll/signal_powerpc.c | 12 ++++----- dlls/ntdll/signal_x86_64.c | 16 ++++++------ dlls/ntdll/tests/virtual.c | 4 +-- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 49 ++++++++++++++++++++++++++----------- 11 files changed, 79 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9781..6605999b82 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1603,14 +1603,14 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) SIZE_T size = 2 * sizeof(*de) + page_size; void *addr = NULL; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_RESERVE, PAGE_READWRITE )) + if (virtual_alloc_aligned( &addr, 0, &size, MEM_RESERVE, PAGE_READWRITE, 1 )) return NULL; /* commit only the size needed for the dir entries */ /* this leaves an extra unaccessible page, which should make the kernel */ /* fail with -EFAULT before it stomps all over our memory */ de = addr; size = 2 * sizeof(*de); - NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_COMMIT, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 1 ); } /* set d_reclen to 65535 to work around an AFS kernel bug */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cccaaee1d4..2d2caf551e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -726,8 +726,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, - &block_size, MEM_COMMIT, get_protection_type( flags ) )) + if (virtual_alloc_aligned( &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ), 5 )) { WARN("Could not allocate block for %08lx bytes\n", size ); return NULL; @@ -1521,7 +1520,7 @@ void heap_set_debug_flags( HANDLE handle ) void *ptr = NULL; SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); - if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + if (!virtual_alloc_aligned( &ptr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 4 )) { heap->pending_free = ptr; heap->pending_pos = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38a..f371a0ab42 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,6 +168,8 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S UINT disposition ) DECLSPEC_HIDDEN; /* virtual memory */ +extern NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ); extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e01c8ce219..cf7f2d1316 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -967,22 +967,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 94520c95ce..d2d43b34bc 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -871,24 +871,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b4e88d125f..b2925062bf 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2312,25 +2312,25 @@ static void ldt_unlock(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; struct x86_thread_data *thread_data; SIZE_T size; void *addr = NULL; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_mask = (1 << sigstack_zero_bits) - 1; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_mask = (1 << sigstack_alignment) - 1; + signal_stack_size = (1 << sigstack_alignment) - teb_size; } size = signal_stack_mask + 1; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { *teb = addr; (*teb)->Tib.Self = &(*teb)->Tib; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54..f23265445d 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1018,22 +1018,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2633b988b6..b024de7642 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3263,24 +3263,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 195a54704f..ff10508a60 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -55,7 +55,6 @@ static void test_AllocateVirtualMemory(void) addr2 = (char *)addr1 + 0x1000; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { @@ -141,12 +140,11 @@ static void test_AllocateVirtualMemory(void) } else { - todo_wine ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine + todo_wine_if((UINT_PTR)addr2 & ~zero_bits) ok(((UINT_PTR)addr2 & ~zero_bits) == 0, "NtAllocateVirtualMemory returned address %p\n", addr2); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400..96aa6be7f2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -184,8 +184,7 @@ void thread_init(void) addr = NULL; size = sizeof(*peb); - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 1, &size, - MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE, 1 ); peb = addr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda..fa1448f489 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1083,7 +1083,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) * The csVirtual section must be held by caller. */ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t mask, - int top_down, unsigned int vprot ) + int top_down, unsigned int vprot, size_t zero_bits ) { void *ptr; NTSTATUS status; @@ -1101,6 +1101,9 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t view_size = size + mask + 1; struct alloc_area alloc; + if (zero_bits) + FIXME("Unimplemented zero_bits parameter value\n"); + alloc.size = size; alloc.mask = mask; alloc.top_down = top_down; @@ -1284,7 +1287,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot if (addr != low_64k) { if (addr != (void *)-1) munmap( addr, dosmem_size - 0x10000 ); - return map_view( view, NULL, dosmem_size, 0xffff, 0, vprot ); + return map_view( view, NULL, dosmem_size, 0xffff, 0, vprot, 0 ); } } @@ -1388,11 +1391,11 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, SIZE_T m if (base >= (char *)address_space_start) /* make sure the DOS area remains free */ status = map_view( &view, base, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY, 0 ); if (status != STATUS_SUCCESS) status = map_view( &view, NULL, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY, 0 ); if (status != STATUS_SUCCESS) goto error; @@ -1713,7 +1716,7 @@ NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, S get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ); vprot |= sec_flags; if (!(sec_flags & SEC_RESERVE)) vprot |= VPROT_COMMITTED; - res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); + res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot, 0 ); if (res) { server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1946,7 +1949,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, 0xffff, 0, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 0 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -2461,19 +2464,16 @@ void virtual_set_large_address_space(void) NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect ) { - void *base; - unsigned int vprot; SIZE_T size = *size_ptr; - SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; - BOOL is_dos_memory = FALSE; - struct file_view *view; - sigset_t sigset; TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); if (!size) return STATUS_INVALID_PARAMETER; - if (!mask) return STATUS_INVALID_PARAMETER_3; + if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; +#ifndef _WIN64 + if (!is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#endif if (process != NtCurrentProcess()) { @@ -2499,6 +2499,27 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ return result.virtual_alloc.status; } + return virtual_alloc_aligned( ret, zero_bits, size_ptr, type, protect, 0 ); +} + + +/*********************************************************************** + * virtual_alloc_aligned (NTDLL.@) + * + * Same as NtAllocateVirtualMemory but with an alignment parameter + */ +NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ) +{ + void *base; + unsigned int vprot; + SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( alignment ); + NTSTATUS status = STATUS_SUCCESS; + BOOL is_dos_memory = FALSE; + struct file_view *view; + sigset_t sigset; + /* Round parameters to a page boundary */ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; @@ -2550,7 +2571,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); - else status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot ); + else status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot, zero_bits ); if (status == STATUS_SUCCESS) base = view->base; } -- 2.17.1

1 0

[PATCH 1/4] wined3d: Drop support for WINED3DFMT_D32_UNORM.
by Jactry Zeng 13 Jun '19

13 Jun '19

Based on idea from Matteo. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/wined3d/utils.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a83d444fba..e9eaf311ad 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1777,14 +1777,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, -- 2.20.1

3 3

[patch] ddraw: Set dwZBufferBitDepth in ddraw_GetCaps
by David Adam 13 Jun '19

13 Jun '19

This patch was written by Michael Muller.

2 1

[v2 PATCH] dbghelp: Return a dos path from SymGetLineFromAddr
by Alistair Leslie-Hughes 13 Jun '19

13 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34687 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 25169043b6..5500bece7f 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1478,7 +1478,25 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } if (found) { - line->FileName = (char*)source_get(module, dli->u.source_file); + if (dbghelp_opt_native) + { + /* Return native file paths when using winedbg */ + line->FileName = (char*)source_get(module, dli->u.source_file); + } + else + { + long len; + WCHAR *dospath = wine_get_dos_file_name((char*)source_get(module, dli->u.source_file)); + + len = WideCharToMultiByte(CP_ACP, 0, dospath, -1, NULL, 0, NULL, NULL); + if(len != -1) + { + line->FileName = fetch_buffer(module->process, len); + WideCharToMultiByte(CP_ACP, 0, dospath, -1, line->FileName, len, NULL, NULL); + } + + HeapFree( GetProcessHeap(), 0, dospath ); + } return TRUE; } } -- 2.17.1

1 0

[PATCH] dbghelp: Return a dos path from SymGetLineFromAddr
by Alistair Leslie-Hughes 13 Jun '19

13 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34687 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 25169043b6..5500bece7f 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1478,7 +1478,25 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } if (found) { - line->FileName = (char*)source_get(module, dli->u.source_file); + if (dbghelp_opt_native) + { + /* Return native file paths when using winedbg */ + line->FileName = (char*)source_get(module, dli->u.source_file); + } + else + { + long len; + WCHAR *dospath = wine_get_dos_file_name((char*)source_get(module, dli->u.source_file)); + + len = WideCharToMultiByte(CP_ACP, 0, dospath, -1, NULL, 0, NULL, NULL); + if(len -1) + { + line->FileName = fetch_buffer(module->process, len); + WideCharToMultiByte(CP_ACP, 0, dospath, -1, line->FileName, len, NULL, NULL); + } + + HeapFree( GetProcessHeap(), 0, dospath ); + } return TRUE; } } -- 2.17.1

1 0

[PATCH 1/5] strmbase: Factor out strmbase_pin_init().
by Zebediah Figura 12 Jun '19

12 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 68 +++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2fa0b9a4ec9..c60deede50e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -728,26 +728,24 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *This, IPin *pR return hr; } -static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, BaseOutputPin * pPinImpl) +static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, + const BasePinFuncTable *func_table, const PIN_INFO *info, CRITICAL_SECTION *cs) { - TRACE("(%p)\n", pPinImpl); + memset(pin, 0, sizeof(*pin)); + pin->IPin_iface.lpVtbl = vtbl; + pin->refCount = 1; + pin->pCritSec = cs; + pin->dRate = 1.0; + Copy_PinInfo(&pin->pinInfo, info); + pin->pFuncsTable = func_table; +} - /* Common attributes */ - pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl; - pPinImpl->pin.refCount = 1; - pPinImpl->pin.pConnectedTo = NULL; - pPinImpl->pin.pCritSec = pCritSec; - pPinImpl->pin.tStart = 0; - pPinImpl->pin.tStop = 0; - pPinImpl->pin.dRate = 1.0; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); - pPinImpl->pin.pFuncsTable = &vtbl->base; - ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); - - /* Output pin attributes */ - pPinImpl->pMemInputPin = NULL; - pPinImpl->pAllocator = NULL; - pPinImpl->pFuncsTable = vtbl; +static HRESULT OutputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs, BaseOutputPin *pin) +{ + memset(pin, 0, sizeof(*pin)); + strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); + pin->pFuncsTable = func_table; return S_OK; } @@ -1111,31 +1109,17 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = MemInputPin_ReceiveCanBlock }; -static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, - const BaseInputPinFuncTable* vtbl, - LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, BaseInputPin * pPinImpl) +static HRESULT InputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseInputPinFuncTable *func_table, CRITICAL_SECTION *cs, + IMemAllocator *allocator, BaseInputPin *pin) { - TRACE("(%p)\n", pPinImpl); - - /* Common attributes */ - pPinImpl->pin.refCount = 1; - pPinImpl->pin.pConnectedTo = NULL; - pPinImpl->pin.pCritSec = pCritSec; - pPinImpl->pin.tStart = 0; - pPinImpl->pin.tStop = 0; - pPinImpl->pin.dRate = 1.0; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); - ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); - pPinImpl->pin.pFuncsTable = &vtbl->base; - - /* Input pin attributes */ - pPinImpl->pFuncsTable = vtbl; - pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator; - if (pPinImpl->preferred_allocator) - IMemAllocator_AddRef(pPinImpl->preferred_allocator); - pPinImpl->pin.IPin_iface.lpVtbl = InputPin_Vtbl; - pPinImpl->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; - pPinImpl->flushing = pPinImpl->end_of_stream = FALSE; + memset(pin, 0, sizeof(*pin)); + strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); + pin->pFuncsTable = func_table; + pin->pAllocator = pin->preferred_allocator = allocator; + if (pin->preferred_allocator) + IMemAllocator_AddRef(pin->preferred_allocator); + pin->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; return S_OK; } -- 2.20.1

1 4

[PATCH v2 1/2] user32/edit: In EM_POSFROMCHAR return correct position for empty lines
by Fabian Maurer 12 Jun '19

12 Jun '19

Fix with permission from ROS Jira Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47305 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3c5331f9dc..6c758c3911 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1102,7 +1102,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else - x = es->x_offset; + x = (lw > 0 ? es->x_offset : -es->x_offset); if (es->style & ES_RIGHT) x = w - (lw - x); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d0374c02a3..b9ca2617c6 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1142,6 +1142,8 @@ static void test_edit_control_4(void) int lo, hi, mid; int ret; int i; + HDC dc; + SIZE size; trace("EDIT: Test EM_CHARFROMPOS and EM_POSFROMCHAR\n"); hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -1251,6 +1253,21 @@ static void test_edit_control_4(void) ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); + + /* Test newline when the edit control is scrolled to the right */ + + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\r\n\r\n"); + SendMessageA(hwEdit, EM_SETSEL, 40, 40); + + dc = GetDC(hwEdit); + GetTextExtentPoint32A(dc, "w", 1, &size); + ReleaseDC(hwEdit, dc); + lo = (short)LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 42, 0)); + ret = (short)LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 40, 0)); + ret += size.cx * (-40); /* Calculate expected position, 40 characters to the left */ + ok(ret == lo, "expected %d got %d\n", ret, lo); + DestroyWindow(hwEdit); } /* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL -- 2.22.0

1 1

[PATCH 1/2] kernel32: Allocate at least 1MB of stack space in CreateFiberEx().
by Zebediah Figura 12 Jun '19

12 Jun '19

Planet Coaster allocates 128KB of stack (both reserve and commit) but then tries to use at least one page more. Testing shows that native Windows always allocates at least 1MB of stack, for both 32-bit and 64-bit programs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/fiber.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index 151a6765a8bf..526ae57f2f42 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -97,7 +97,8 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl } /* FIXME: should use the thread stack allocation routines here */ - if (!stack_reserve) stack_reserve = 1024*1024; + /* some applications try to use more stack than they allocate */ + stack_reserve = max(stack_reserve, 1024 * 1024); if(!(fiber->stack_allocation = VirtualAlloc( 0, stack_reserve, MEM_COMMIT, PAGE_READWRITE ))) { HeapFree( GetProcessHeap(), 0, fiber ); -- 2.20.1

2 3

[PATCH vkd3d 3/6] vkd3d: Introduce FIXME_ONCE().
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> The debug log level is demoted to WARN after the FIXME is printed once. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 10 ++++++++++ libs/vkd3d/command.c | 10 +++++----- libs/vkd3d/device.c | 4 ++-- libs/vkd3d/state.c | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 2ef8a003519d..1a44cb9a97fe 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -59,6 +59,14 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; const enum vkd3d_dbg_level vkd3d_dbg_level = VKD3D_DBG_LEVEL_##level; \ VKD3D_DBG_PRINTF +#define VKD3D_DBG_LOG_ONCE(first_time_level, level) \ + do { \ + static bool vkd3d_dbg_next_time; \ + const enum vkd3d_dbg_level vkd3d_dbg_level = vkd3d_dbg_next_time \ + ? VKD3D_DBG_LEVEL_##level : VKD3D_DBG_LEVEL_##first_time_level; \ + vkd3d_dbg_next_time = true; \ + VKD3D_DBG_PRINTF + #define VKD3D_DBG_PRINTF(args...) \ vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) @@ -80,6 +88,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) #endif +#define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN) + #define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name static inline const char *debugstr_guid(const GUID *guid) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55a15d9546c5..25c8005dc445 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3538,7 +3538,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo if (!vk_viewports[i].width || !vk_viewports[i].height) { - FIXME("Invalid viewport %u, ignoring RSSetViewports().\n", i); + FIXME_ONCE("Invalid viewport %u, ignoring RSSetViewports().\n", i); return; } } @@ -3790,7 +3790,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC /* FIXME: Some formats in D3D12 are planar. Each plane is a separate sub-resource. */ if (sub_resource_idx >= d3d12_resource_desc_get_sub_resource_count(&resource->desc)) { - FIXME("Unhandled sub-resource idx %u.\n", sub_resource_idx); + FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx); continue; } @@ -3806,7 +3806,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } if (have_aliasing_barriers) - FIXME("Aliasing barriers not implemented yet.\n"); + FIXME_ONCE("Aliasing barriers not implemented yet.\n"); /* Vulkan doesn't support split barriers. */ if (have_split_barriers) @@ -4684,7 +4684,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *resource, const D3D12_DISCARD_REGION *region) { - FIXME("iface %p, resource %p, region %p stub!\n", iface, resource, region); + FIXME_ONCE("iface %p, resource %p, region %p stub!\n", iface, resource, region); } static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList1 *iface, @@ -4788,7 +4788,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics * count precisely, even when it was signalled that non-precise is enough. */ if (type == D3D12_QUERY_TYPE_BINARY_OCCLUSION) - FIXME("D3D12 guarantees binary occlusion queries result in only 0 and 1.\n"); + FIXME_ONCE("D3D12 guarantees binary occlusion queries result in only 0 and 1.\n"); if (!d3d12_resource_is_buffer(buffer)) { diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1da9e9c0e20..fa10bb8e096b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2838,7 +2838,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME("iface %p, object_count %u, objects %p stub!\n", + FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); return S_OK; @@ -2847,7 +2847,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME("iface %p, object_count %u, objects %p stub!\n", + FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); return S_OK; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index be2aa4f4bca4..64be72d5af9c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1720,7 +1720,7 @@ static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, vk_desc->lineWidth = 1.0f; if (d3d12_desc->MultisampleEnable) - FIXME("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); + FIXME_ONCE("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); if (d3d12_desc->AntialiasedLineEnable) FIXME("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); if (d3d12_desc->ForcedSampleCount) -- 2.21.0

2 1

[PATCH vkd3d 6/6] tests: Add test for line tessellation.
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 333 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 642d62584593..a57a0453123f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -26729,6 +26729,338 @@ static void test_hull_shader_fork_phase(void) destroy_test_context(&context); } +static void test_line_tessellation(void) +{ + ID3D12Resource *vb, *so_buffer, *readback_buffer; + D3D12_QUERY_DATA_SO_STATISTICS *so_statistics; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_QUERY_HEAP_DESC query_heap_desc; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct resource_readback rb; + ID3D12QueryHeap *query_heap; + struct test_context context; + const struct vec4 *expected; + ID3D12CommandQueue *queue; + struct vec4 *data; + bool broken_warp; + unsigned int i; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + float3 color : COLOR; + float line_density : LINE_DENSITY; + float line_detail : LINE_DETAIL; + }; + + data vs_main(data input) + { + return input; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + float3 color : COLOR; + uint prim_id : PRIMITIVE_ID; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = control_points[0].line_density; + output.tess_factor[1] = control_points[0].line_detail; + output.color = control_points[0].color; + output.prim_id = prim_id; + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(patch_constant_data input, + float tess_factor[2] : SV_TessFactor, + float2 tess_coord : SV_DomainLocation, + float3 color : COLOR, + uint prim_id : PRIMITIVE_ID, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position, + out float4 out_color : COLOR, + out float4 out_prim_id : PRIMITIVE_ID) + { + position = patch[0].position; + out_color = float4(color, 1.0); + out_prim_id = prim_id; + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0x43d2f821, 0xc4bcdf60, 0xadbf5ed0, 0xe55b715d, 0x00000001, 0x00000230, 0x00000003, + 0x0000002c, 0x000000c8, 0x00000164, 0x4e475349, 0x00000094, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000707, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49, + 0x41544544, 0xab004c49, 0x4e47534f, 0x00000094, 0x00000004, 0x00000008, 0x00000068, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x00000807, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000708, + 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49, 0x41544544, + 0xab004c49, 0x58454853, 0x000000c4, 0x00010050, 0x00000031, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x00101072, 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f, + 0x00101012, 0x00000003, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102072, + 0x00000001, 0x03000065, 0x00102082, 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102072, 0x00000001, 0x00101246, + 0x00000001, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102012, + 0x00000002, 0x0010100a, 0x00000003, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x130f1b8c, 0x02c24095, 0x18ab42ad, 0xbb861b50, 0x00000001, 0x00000448, 0x00000004, + 0x00000030, 0x000000cc, 0x00000168, 0x000001fc, 0x4e475349, 0x00000094, 0x00000004, 0x00000008, + 0x00000068, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000707, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x00000808, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000101, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, + 0x5f454e49, 0x41544544, 0xab004c49, 0x4e47534f, 0x00000094, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000807, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x00000708, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, 0x5f454e49, + 0x41544544, 0xab004c49, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, + 0x00000010, 0x00000003, 0x00000000, 0x00000e01, 0x00000076, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000010e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, + 0x0000007c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000d02, 0x545f5653, 0x46737365, + 0x6f746361, 0x4f430072, 0x00524f4c, 0x4d495250, 0x56495449, 0x44495f45, 0xababab00, 0x58454853, + 0x00000244, 0x00030050, 0x00000091, 0x01000071, 0x01000893, 0x01000894, 0x01000895, 0x01000896, + 0x01001097, 0x0100086a, 0x01000072, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x0400005f, + 0x00201072, 0x00000001, 0x00000001, 0x0400005f, 0x00201082, 0x00000001, 0x00000001, 0x0400005f, + 0x00201012, 0x00000001, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102072, + 0x00000001, 0x03000065, 0x00102082, 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, + 0x00201e46, 0x00000000, 0x00000001, 0x06000036, 0x00102012, 0x00000002, 0x0020100a, 0x00000000, + 0x00000002, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a082, 0x00000001, 0x00000001, 0x04000067, + 0x00102012, 0x00000000, 0x00000016, 0x06000036, 0x00102012, 0x00000000, 0x0021a03a, 0x00000000, + 0x00000001, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a012, 0x00000001, 0x00000002, 0x04000067, + 0x00102012, 0x00000001, 0x00000015, 0x06000036, 0x00102012, 0x00000001, 0x0021a00a, 0x00000000, + 0x00000002, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a012, 0x00000001, 0x00000001, 0x03000065, + 0x00102022, 0x00000000, 0x06000036, 0x00102022, 0x00000000, 0x0021a00a, 0x00000000, 0x00000001, + 0x0100003e, 0x01000073, 0x0400005f, 0x0021a022, 0x00000001, 0x00000001, 0x03000065, 0x00102042, + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0021a01a, 0x00000000, 0x00000001, 0x0100003e, + 0x01000073, 0x0400005f, 0x0021a042, 0x00000001, 0x00000001, 0x03000065, 0x00102082, 0x00000000, + 0x06000036, 0x00102082, 0x00000000, 0x0021a02a, 0x00000000, 0x00000001, 0x0100003e, 0x01000073, + 0x0200005f, 0x0000b000, 0x03000065, 0x00102022, 0x00000001, 0x04000036, 0x00102022, 0x00000001, + 0x0000b001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xc78d05dd, 0x4b270467, 0xb480a2fb, 0x02f0edc7, 0x00000001, 0x0000029c, 0x00000004, + 0x00000030, 0x000000cc, 0x00000160, 0x000001d8, 0x4e475349, 0x00000094, 0x00000004, 0x00000008, + 0x00000068, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000074, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000007, 0x0000007a, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x00000008, 0x00000087, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000001, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0x494c0052, 0x445f454e, 0x49534e45, 0x4c005954, + 0x5f454e49, 0x41544544, 0xab004c49, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000001, 0x00000076, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x00000e0e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, + 0x00000001, 0x0000007c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000202, 0x545f5653, + 0x46737365, 0x6f746361, 0x4f430072, 0x00524f4c, 0x4d495250, 0x56495449, 0x44495f45, 0xababab00, + 0x4e47534f, 0x00000070, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000062, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4f4c4f43, 0x52500052, 0x54494d49, 0x5f455649, 0xab004449, 0x58454853, 0x000000bc, + 0x00040050, 0x0000002f, 0x01000893, 0x01000895, 0x0100086a, 0x0300005f, 0x0011b0e2, 0x00000000, + 0x0300005f, 0x0011b022, 0x00000001, 0x0400005f, 0x002190f2, 0x00000001, 0x00000000, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, + 0x00000002, 0x06000036, 0x001020f2, 0x00000000, 0x00219e46, 0x00000000, 0x00000000, 0x05000036, + 0x00102072, 0x00000001, 0x0011b796, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x00004001, + 0x3f800000, 0x05000056, 0x001020f2, 0x00000002, 0x0011b556, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"LINE_DENSITY", 0, DXGI_FORMAT_R32_FLOAT, 0, 32, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"LINE_DETAIL", 0, DXGI_FORMAT_R32_FLOAT, 0, 36, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 0}, + {0, "PRIMITIVE_ID", 0, 0, 4, 0}, + }; + unsigned int strides[] = {48}; + static const struct + { + struct vec4 position; + struct vec4 color; + float line_density; + float line_detail; + } + vertices[] = + { + {{0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f}, 1.0f, 1.0f}, + {{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f}, 2.0f, 1.0f}, + {{2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f}, 1.0f, 2.0f}, + {{3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f}, 2.0f, 2.0f}, + }; + static const struct vec4 expected_data[] = + { + {0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}, + + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.5f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, + + {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f}, + {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f}, + {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f}, + {2.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}, {2.0f, 2.0f, 2.0f, 2.0f}, + + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + {3.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {3.0f, 3.0f, 3.0f, 3.0f}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_SO_STATISTICS; + query_heap_desc.Count = 2; + query_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateQueryHeap(context.device, &query_heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + DXGI_FORMAT_UNKNOWN, NULL, NULL, &input_layout); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + so_buffer = create_default_buffer(context.device, 4096, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); + + readback_buffer = create_readback_buffer(context.device, sizeof(*so_statistics)); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, + query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 1, readback_buffer, 0); + + get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics)); + broken_warp = broken_on_warp(so_statistics[0].NumPrimitivesWritten != 9); + ok(so_statistics[0].NumPrimitivesWritten == 9 || broken_warp, "Got unexpected primitives written %u.\n", + (unsigned int)so_statistics[0].NumPrimitivesWritten); + ok(so_statistics[0].PrimitivesStorageNeeded == 9 || broken_warp, "Got unexpected primitives storage needed %u.\n", + (unsigned int)so_statistics[0].PrimitivesStorageNeeded); + release_resource_readback(&rb); + + if (broken_warp) + { + skip("Broken on WARP.\n"); + goto done; + } + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i) + { + data = get_readback_data(&rb, i, 0, 0, 3 * sizeof(*data)); + expected = &expected_data[3 * i + 0]; + ok(compare_vec4(data, expected, 1), + "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); + ++data; + expected = &expected_data[3 * i + 1]; + ok(compare_vec4(data, expected, 1), + "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); + ++data; + expected = &expected_data[3 * i + 2]; + ok(compare_vec4(data, expected, 1), + "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); + } + release_resource_readback(&rb); + +done: + ID3D12QueryHeap_Release(query_heap); + ID3D12Resource_Release(readback_buffer); + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -30274,6 +30606,7 @@ START_TEST(d3d12) run_test(test_tessellation_dcl_index_range); run_test(test_hull_shader_control_point_phase); run_test(test_hull_shader_fork_phase); + run_test(test_line_tessellation); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.21.0

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Make sure that InvocationId is emitted once in hull shaders.
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 72 +++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a559da1b30d4..25e3f8ea6f52 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3630,6 +3630,29 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } +static uint32_t vkd3d_dxbc_compiler_get_invocation_id(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_shader_register r; + + assert(compiler->shader_type == VKD3D_SHADER_TYPE_HULL); + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_OUTPOINTID; + r.idx[0].offset = ~0u; + r.idx[1].offset = ~0u; + return vkd3d_dxbc_compiler_get_register_id(compiler, &r); +} + +static uint32_t vkd3d_dxbc_compiler_emit_load_invocation_id(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, id; + + id = vkd3d_dxbc_compiler_get_invocation_id(compiler); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); + return vkd3d_spirv_build_op_load(builder, type_id, id, SpvMemoryAccessMaskNone); +} + static void vkd3d_dxbc_compiler_emit_shader_phase_name(struct vkd3d_dxbc_compiler *compiler, uint32_t id, const struct vkd3d_shader_phase *phase, const char *suffix) { @@ -4055,7 +4078,6 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil case VKD3DSPR_INPUT: vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; - case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: vkd3d_dxbc_compiler_emit_input_register(compiler, dst); return; @@ -4063,8 +4085,8 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; - case VKD3DSPR_OUTCONTROLPOINT: - /* See vkd3d_dxbc_compiler_leave_shader_phase(). */ + case VKD3DSPR_OUTPOINTID: /* Emitted in vkd3d_dxbc_compiler_emit_initial_declarations(). */ + case VKD3DSPR_OUTCONTROLPOINT: /* See vkd3d_dxbc_compiler_leave_shader_phase(). */ return; default: FIXME("Unhandled shader phase input register %#x.\n", reg->type); @@ -4355,14 +4377,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; if (!use_private_variable && is_control_point_phase(phase)) { - struct vkd3d_shader_register r; - - memset(&r, 0, sizeof(r)); - r.type = VKD3DSPR_OUTPOINTID; - r.idx[0].offset = ~0u; - r.idx[1].offset = ~0u; - - reg_symbol.info.reg.member_idx = vkd3d_dxbc_compiler_get_register_id(compiler, &r); + reg_symbol.info.reg.member_idx = vkd3d_dxbc_compiler_get_invocation_id(compiler); reg_symbol.info.reg.is_dynamically_indexed = true; } vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4548,19 +4563,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ } if (is_control_point_phase(phase)) - { - struct vkd3d_shader_register r; - uint32_t invocation_id; - - memset(&r, 0, sizeof(r)); - r.type = VKD3DSPR_OUTPOINTID; - r.idx[0].offset = ~0u; - r.idx[1].offset = ~0u; - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - invocation_id = vkd3d_dxbc_compiler_get_register_id(compiler, &r); - output_index_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); - } + output_index_id = vkd3d_dxbc_compiler_emit_load_invocation_id(compiler); for (i = 0; i < signature->element_count; ++i) { @@ -4583,6 +4586,18 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ compiler->epilogue_function_id = 0; } +static void vkd3d_dxbc_compiler_emit_hull_shader_builtins(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_shader_dst_param dst; + + memset(&dst, 0, sizeof(dst)); + dst.reg.type = VKD3DSPR_OUTPOINTID; + dst.reg.idx[0].offset = ~0u; + dst.reg.idx[1].offset = ~0u; + dst.write_mask = VKD3DSP_WRITEMASK_0; + vkd3d_dxbc_compiler_emit_input_register(compiler, &dst); +} + static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; @@ -4595,6 +4610,7 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp break; case VKD3D_SHADER_TYPE_HULL: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelTessellationControl); + vkd3d_dxbc_compiler_emit_hull_shader_builtins(compiler); break; case VKD3D_SHADER_TYPE_DOMAIN: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelTessellationEvaluation); @@ -5643,19 +5659,15 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx const struct vkd3d_shader_signature *output_signature = compiler->output_signature; const struct vkd3d_shader_signature *input_signature = compiler->input_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_spirv_builtin *builtin, *input_builtin; uint32_t type_id, input_ptr_type_id, output_ptr_type_id; + const struct vkd3d_spirv_builtin *input_builtin; uint32_t input_id, output_id, dst_id, src_id; enum vkd3d_component_type component_type; unsigned int component_count; uint32_t invocation_id; unsigned int i; - builtin = get_spirv_builtin_for_register(VKD3DSPR_OUTPOINTID); - invocation_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); - - type_id = vkd3d_spirv_get_type_id(builder, builtin->component_type, builtin->component_count); - invocation_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); + invocation_id = vkd3d_dxbc_compiler_emit_load_invocation_id(compiler); assert(input_signature->element_count == output_signature->element_count); for (i = 0; i < output_signature->element_count; ++i) -- 2.21.0

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Assign unique locations for patch constants.
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e308ef3b43aa..a559da1b30d4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3937,10 +3937,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } else { + unsigned int location = reg_idx; + + if (reg->type == VKD3DSPR_PATCHCONST) + location += compiler->input_signature->element_count; + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, input_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, location); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); @@ -4301,6 +4306,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { + unsigned int location = reg->idx[0].offset; + + if (is_patch_constant) + location += compiler->output_signature->element_count; + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, id); @@ -4312,7 +4322,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, location); } if (component_idx) -- 2.21.0

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Forbid mixing samplers with CBVs/SRVs/UAVs in root signatures.
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 100 +++++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 34 +++++++++---- 2 files changed, 126 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a9cda49162d8..98c51e420950 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3007,6 +3007,103 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } +static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +{ + bool have_srv_uav_cbv = false; + bool have_sampler = false; + unsigned int i; + + for (i = 0; i < descriptor_table->descriptor_range_count; ++i) + { + const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + + if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + { + have_srv_uav_cbv = true; + } + else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + { + have_sampler = true; + } + else + { + WARN("Invalid descriptor range type %#x.\n", r->range_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + } + + if (have_srv_uav_cbv && have_sampler) + { + WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + return VKD3D_OK; +} + +static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) +{ + bool have_srv_uav_cbv = false; + bool have_sampler = false; + unsigned int i; + + for (i = 0; i < descriptor_table->descriptor_range_count; ++i) + { + const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; + + if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SRV + || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_UAV + || r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_CBV) + { + have_srv_uav_cbv = true; + } + else if (r->range_type == VKD3D_DESCRIPTOR_RANGE_TYPE_SAMPLER) + { + have_sampler = true; + } + else + { + WARN("Invalid descriptor range type %#x.\n", r->range_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + } + + if (have_srv_uav_cbv && have_sampler) + { + WARN("Samplers cannot be mixed with CBVs/SRVs/UAVs in descriptor tables.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + return VKD3D_OK; +} + +static int validate_root_signature_desc(const struct vkd3d_versioned_root_signature_desc *desc) +{ + int ret = VKD3D_OK; + unsigned int i; + + for (i = 0; i < versioned_root_signature_get_parameter_count(desc); ++i) + { + enum vkd3d_root_parameter_type type; + + type = versioned_root_signature_get_parameter_type(desc, i); + if (type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + { + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + ret = validate_descriptor_table_v_1_0(&desc->u.v_1_0.parameters[i].u.descriptor_table); + else + ret = validate_descriptor_table_v_1_1(&desc->u.v_1_1.parameters[i].u.descriptor_table); + } + + if (ret < 0) + break; + } + + return ret; +} + int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc) { @@ -3024,6 +3121,9 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign return VKD3D_ERROR_INVALID_ARGUMENT; } + if ((ret = validate_root_signature_desc(root_signature)) < 0) + return ret; + memset(dxbc, 0, sizeof(*dxbc)); memset(&context, 0, sizeof(context)); if ((ret = shader_write_root_signature_header(&context)) < 0) diff --git a/tests/d3d12.c b/tests/d3d12.c index 903c42396b60..642d62584593 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2488,7 +2488,7 @@ static void test_create_unordered_access_view(void) static void test_create_root_signature(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12RootSignature *root_signature; ID3D12Device *device, *tmp_device; @@ -2517,12 +2517,12 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12RootSignature_GetDevice(root_signature, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2536,14 +2536,32 @@ static void test_create_root_signature(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); - /* empty */ + /* sampler and SRV in the same descriptor table */ + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER; + descriptor_ranges[1].NumDescriptors = 1; + descriptor_ranges[1].BaseShaderRegister = 2; + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 10; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == E_INVALIDARG, "Failed to create root signature, hr %#x.\n", hr); + + /* empty root signature */ root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = NULL; root_signature_desc.NumStaticSamplers = 0; root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2569,7 +2587,7 @@ static void test_create_root_signature(void) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2580,7 +2598,7 @@ static void test_create_root_signature(void) root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; root_signature_desc.NumParameters = 3; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2604,7 +2622,7 @@ static void test_create_root_signature(void) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); -- 2.21.0

2 1

[PATCH vkd3d 1/6] vkd3d: Clarify DSV attachment mask handling.
by Józef Kucia 12 Jun '19

12 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> It isn't immediately obvious what "1u << graphics->rt_count" means. Use dsv_attachment_mask() helper instead. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 15 ++------------- libs/vkd3d/state.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fcb7a4899091..55a15d9546c5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2278,17 +2278,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCom return E_NOTIMPL; } -static bool d3d12_command_list_has_unknown_dsv_format(struct d3d12_command_list *list) -{ - struct d3d12_graphics_pipeline_state *graphics; - - if (!d3d12_pipeline_state_is_graphics(list->state)) - return false; - - graphics = &list->state->u.graphics; - return graphics->null_attachment_mask & (1u << graphics->rt_count); -} - static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) { struct d3d12_graphics_pipeline_state *graphics; @@ -2296,7 +2285,7 @@ static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list assert(d3d12_pipeline_state_is_graphics(list->state)); graphics = &list->state->u.graphics; - return graphics->dsv_format || (d3d12_command_list_has_unknown_dsv_format(list) && list->dsv_format); + return graphics->dsv_format || (d3d12_pipeline_state_has_unknown_dsv_format(list->state) && list->dsv_format); } static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, @@ -4386,7 +4375,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } } - if (prev_dsv_format != list->dsv_format && d3d12_command_list_has_unknown_dsv_format(list)) + if (prev_dsv_format != list->dsv_format && d3d12_pipeline_state_has_unknown_dsv_format(list->state)) d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_current_framebuffer(list); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 514fdc3a74f2..be2aa4f4bca4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2038,7 +2038,7 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( memcpy(key.vk_formats, graphics->rtv_formats, sizeof(graphics->rtv_formats)); key.attachment_count = graphics->rt_count; - if (!(dsv_format = graphics->dsv_format) && (graphics->null_attachment_mask & (1u << graphics->rt_count))) + if (!(dsv_format = graphics->dsv_format) && (graphics->null_attachment_mask & dsv_attachment_mask(graphics))) dsv_format = dynamic_dsv_format; if (dsv_format) @@ -2220,7 +2220,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s { WARN("DSV format is DXGI_FORMAT_UNKNOWN.\n"); graphics->dsv_format = VK_FORMAT_UNDEFINED; - graphics->null_attachment_mask |= 1u << graphics->rt_count; + graphics->null_attachment_mask |= dsv_attachment_mask(graphics); } else if ((format = vkd3d_get_format(device, desc->DSVFormat, true))) { @@ -2503,7 +2503,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - is_dsv_format_unknown = graphics->null_attachment_mask & (1u << graphics->rt_count); + is_dsv_format_unknown = graphics->null_attachment_mask & dsv_attachment_mask(graphics); rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; @@ -2855,7 +2855,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta /* Create a render pass for pipelines with DXGI_FORMAT_UNKNOWN. */ if (!(pipeline_desc.renderPass = graphics->render_pass)) { - if (graphics->null_attachment_mask & (1u << graphics->rt_count)) + if (graphics->null_attachment_mask & dsv_attachment_mask(graphics)) TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, dsv_format, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4118d5d170e0..9f00d327b73b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -706,6 +706,11 @@ struct d3d12_graphics_pipeline_state bool xfb_enabled; }; +static inline unsigned int dsv_attachment_mask(const struct d3d12_graphics_pipeline_state *graphics) +{ + return 1u << graphics->rt_count; +} + struct d3d12_compute_pipeline_state { VkPipeline vk_pipeline; @@ -746,6 +751,18 @@ static inline bool d3d12_pipeline_state_is_graphics(const struct d3d12_pipeline_ return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS; } +static inline bool d3d12_pipeline_state_has_unknown_dsv_format(struct d3d12_pipeline_state *state) +{ + if (d3d12_pipeline_state_is_graphics(state)) + { + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + + return graphics->null_attachment_mask & dsv_attachment_mask(graphics); + } + + return false; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, -- 2.21.0

2 1

[PATCH v2 1/2] wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Paul Gofman 12 Jun '19

12 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: no changes. dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9d4f6057c3..6239467741 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4265,11 +4265,24 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); - if (mask_size > 1) + if (mask_size == 4) + { + static const float max_float = FLT_MAX; + + shader_addline(buffer, "tmp0.x == 0.0 ? vec4(vec3(0.0), sign(%s[3]) * ", + src_param.param_str); + shader_glsl_append_imm_vec(buffer, &max_float, 1, ins->ctx->gl_info); + shader_addline(buffer, ") : (%s * inversesqrt(tmp0.x)));\n", src_param.param_str); + } + else if (mask_size > 1) { shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s * inversesqrt(tmp0.x)));\n", mask_size, src_param.param_str); -- 2.21.0

3 3

[PATCH v4 1/5] server: Added support for tracking registered device notifications
by Micah N Gorrell 12 Jun '19

12 Jun '19

Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> --- server/protocol.def | 23 +++++++++ server/user.h | 3 +- server/window.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index e450388c17..1645d09d5f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3692,6 +3692,29 @@ struct handle_info @END +/* Register a handle for device notifications */ +@REQ(register_device_notification) + user_handle_t recipient; /* handle to a window or service that will receive device events */ +@REPLY + user_handle_t handle; /* handle associated with the registration */ +@END + + +/* Unregister device notifications for a handle */ +@REQ(unregister_device_notification) + user_handle_t notification; /* handle that was previously returned by register_device_notification */ +@END + + +/* Return a list of handles that have registered for device notifications */ +@REQ(get_device_notifications) +@REPLY + int count; /* total count of registered handles */ + VARARG(handles,user_handles); /* registered handles */ +@END + + + /* Make the current process a system process */ @REQ(make_process_system) @REPLY diff --git a/server/user.h b/server/user.h index eb1b7ce1e4..282cb63339 100644 --- a/server/user.h +++ b/server/user.h @@ -36,7 +36,8 @@ enum user_object { USER_WINDOW = 1, USER_HOOK, - USER_CLIENT /* arbitrary client handle */ + USER_CLIENT, /* arbitrary client handle */ + USER_DEVNOTIFY }; #define DESKTOP_ATOM ((atom_t)32769) diff --git a/server/window.c b/server/window.c index c9b131cba5..80ac897ea6 100644 --- a/server/window.c +++ b/server/window.c @@ -129,6 +129,19 @@ static struct window *taskman_window; #define WINPTR_TOPMOST ((struct window *)3L) #define WINPTR_NOTOPMOST ((struct window *)4L) +struct device_notification +{ + user_handle_t recipient; /* the window handle to send notifications to */ + user_handle_t handle; /* full handle for this window */ + struct process *process; /* process that owns this notification handle */ + struct list entry; /* entry in global notifications list */ + + /* FIXME: Add support for notification filters */ +}; + +/* global list of handles that have registered for device notifications */ +static struct list device_notifications = LIST_INIT(device_notifications); + /* retrieve a pointer to a window from its handle */ static inline struct window *get_window( user_handle_t handle ) { @@ -2880,3 +2893,102 @@ DECL_HANDLER(set_window_layered_info) } else set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); } + +/* retrieve a pointer to a device_notification from its handle */ +static inline struct device_notification *get_device_notification( user_handle_t handle ) +{ + struct device_notification *ret = get_user_object( handle, USER_DEVNOTIFY ); + if (!ret) set_win32_error( ERROR_INVALID_HANDLE ); + return ret; +} + +/* create a new device notification structure and link it into the global list */ +static struct device_notification *register_device_notification( struct window *recipient ) +{ + struct device_notification *notification; + + if (!recipient) + { + return NULL; + } + + if (!(notification = mem_alloc( sizeof(*notification) ))) goto failed; + if (!(notification->handle = alloc_user_handle( notification, USER_DEVNOTIFY ))) goto failed; + + notification->recipient = recipient->handle; + notification->process = current->process; + /* FIXME: Add support for notification filters */ + + list_add_tail( &device_notifications, &notification->entry ); + + return notification; +failed: + if (notification) + { + if (notification->handle) free_user_handle( notification->handle ); + free( notification ); + } + + return NULL; +} + +static void unregister_device_notification( struct device_notification *notification) +{ + list_remove( &notification->entry ); + free_user_handle( notification->handle ); + memset( notification, 0x55, sizeof(*notification) ); + free( notification ); +} + +static int get_device_notifications( struct user_handle_array *array ) +{ + struct device_notification *notification; + + LIST_FOR_EACH_ENTRY( notification, &device_notifications, struct device_notification, entry ) + { + /* FIXME: Implement notification filtering */ + if (!add_handle_to_array( array, notification->recipient )) return 0; + } + + return 1; +} + +/* register for device notifications */ +DECL_HANDLER(register_device_notification) +{ + struct device_notification *notification = NULL; + struct window *recipient = get_window( req->recipient ); + + reply->handle = 0; + if (!recipient) return; + + if (!(notification = register_device_notification( recipient ))) return; + + reply->handle = notification->handle; +} + +DECL_HANDLER(unregister_device_notification) +{ + struct device_notification *notification = get_device_notification( req->notification ); + if (notification) { + if (notification->process == current->process) unregister_device_notification(notification); + else set_error( STATUS_ACCESS_DENIED ); + } +} + +DECL_HANDLER(get_device_notifications) +{ + struct user_handle_array array; + data_size_t len; + + array.handles = NULL; + array.count = 0; + array.total = 0; + + if (!get_device_notifications( &array )) return; + + reply->count = array.count; + len = min( get_reply_max_size(), array.count * sizeof(user_handle_t) ); + if (len) set_reply_data_ptr( array.handles, len ); + else free( array.handles ); +} -- 2.21.0

3 7

[PATCH] mf/tests: Add sample processing tests for Video Processor.
by Nikolay Sivov 12 Jun '19

12 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 122 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f55104c039..15aa58620a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2063,8 +2063,14 @@ static void test_video_processor(void) DWORD input_min, input_max, output_min, output_max, i, count; IMFAttributes *attributes, *attributes2; IMFMediaType *media_type, *media_type2; + MFT_OUTPUT_DATA_BUFFER output_buffer; + MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + IMFSample *sample, *sample2; IMFTransform *transform; + IMFMediaBuffer *buffer; + IMFMediaEvent *event; + IUnknown *unk; HRESULT hr; GUID guid; @@ -2079,6 +2085,12 @@ todo_wine if (FAILED(hr)) goto failed; + hr = IMFTransform_QueryInterface(transform, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFShutdown, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + /* Transform global attributes. */ hr = IMFTransform_GetAttributes(transform, &attributes); ok(hr == S_OK, "Failed to get attributes, hr %#x.\n", hr); @@ -2149,6 +2161,14 @@ todo_wine ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); + hr = MFCreateMediaEvent(MEUnknown, &GUID_NULL, S_OK, NULL, &event); + ok(hr == S_OK, "Failed to create event object, hr %#x.\n", hr); + hr = IMFTransform_ProcessEvent(transform, 0, event); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_ProcessEvent(transform, 1, event); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFMediaEvent_Release(event); + /* Configure stream types. */ for (i = 0;;++i) { @@ -2213,13 +2233,113 @@ todo_wine hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); - ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); + ok(input_info.dwFlags == 0, "Unexpected flags %#x.\n", input_info.dwFlags); ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); IMFMediaType_Release(media_type); } + /* IYUV -> RGB32 */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, ((UINT64)16 << 32) | 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "Failed to set input type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "Failed to set output type, hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); + ok(output_info.dwFlags == 0, "Unexpected flags %#x.\n", output_info.dwFlags); + ok(output_info.cbSize > 0, "Unexpected size %u.\n", output_info.cbSize); + ok(output_info.cbAlignment == 0, "Unexpected alignment %u.\n", output_info.cbAlignment); + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = MFCreateSample(&sample2); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + memset(&output_buffer, 0, sizeof(output_buffer)); + output_buffer.pSample = sample; + flags = 0; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); + ok(flags == 0, "Unexpected status %#x.\n", flags); + + hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); + ok(hr == S_OK, "Failed to push a sample, hr %#x.\n", hr); + + hr = IMFTransform_ProcessInput(transform, 0, sample2, 0); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + + memset(&output_buffer, 0, sizeof(output_buffer)); + output_buffer.pSample = sample; + flags = 0; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); + ok(flags == 0, "Unexpected status %#x.\n", flags); + + hr = IMFSample_SetSampleTime(sample2, 0); + ok(hr == S_OK, "Failed to set sample time, hr %#x.\n", hr); + memset(&output_buffer, 0, sizeof(output_buffer)); + output_buffer.pSample = sample; + flags = 0; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); + ok(flags == 0, "Unexpected status %#x.\n", flags); + + hr = MFCreateMemoryBuffer(1024 * 1024, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample2, buffer); + ok(hr == S_OK, "Failed to add a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add a buffer, hr %#x.\n", hr); + + memset(&output_buffer, 0, sizeof(output_buffer)); + output_buffer.pSample = sample; + flags = 0; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Failed to get output buffer, hr %#x.\n", hr); + ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); + ok(flags == 0, "Unexpected status %#x.\n", flags); + + if (SUCCEEDED(hr)) + { + memset(&output_buffer, 0, sizeof(output_buffer)); + output_buffer.pSample = sample; + flags = 0; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output_buffer, &flags); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + ok(output_buffer.dwStatus == 0, "Unexpected buffer status, %#x.\n", output_buffer.dwStatus); + ok(flags == 0, "Unexpected status %#x.\n", flags); + } + + IMFSample_Release(sample2); + IMFSample_Release(sample); + IMFMediaBuffer_Release(buffer); + + IMFMediaType_Release(media_type); + IMFTransform_Release(transform); failed: -- 2.20.1

1 0

[PATCH v4 1/2] ntdll/directory: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 12 Jun '19

12 Jun '19

This adds support for checking the case-insensitive attribute on ext4 with newer kernels so that Wine can rely on it for performance. It has some conditional processing for perf reasons. Checking for the EXT4_CASEFOLD_FL attribute involves an ioctl, which operates on file descriptors, while all the former checks operated directly on the dir pathname (e.g. statfs). Obviously, it's best to avoid looking up the directory multiple times (also for correctness, so it refers to the same dir). So in the case that we *do* have a file descriptor, then use it everywhere, with e.g. fstatfs. However, to avoid a perf regression or downgrade on systems that don't support the EXT2_IOC_GETFLAGS ioctl (e.g. MacOS, FreeBSD), we continue using statfs and the like directly, this shaves off two syscalls (open/close). But in the case the EXT4_CASEFOLD_FL is not supported on Linux (i.e. on current kernels) or the directory doesn't have it, this will unfortunately involve a bit more syscalls now, because it has to open() and close() the fd, but it shouldn't be too much of a problem. (the fstatfs and fstatat make it less impactful somewhat, so they won't have to lookup the directory again, hopefully mitigating some of it) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Simplify the #if checks and get rid of the GET_DIR_CASE_SENSITIVITY_USE_FD constant. Huw, I know you wanted to #include the header that defines EXT4_CASEFOLD_FL and others. I resent it without that so that Alexandre can see how the patch looks like, if he doesn't want to add another dependency. I know he's away today so his reply will have to wait probably after 4.10, I'll make sure to remind him if he doesn't, though ;-) That, plus the fact I'm really bad at autotools so I'll end up copy-pasting some similar check. Also, in case we do add a configure check for it, should we display a warning if it's not found? Like "ext2_fs.h not available, case-folding per directory will be unsupported." dlls/ntdll/directory.c | 69 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..2d6563e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1109,18 +1117,36 @@ static int get_dir_case_sensitivity_attr( const char *dir ) } #endif +#ifdef EXT4_CASEFOLD_FL + +/*********************************************************************** + * get_dir_case_sensitivity_ioctl + * + * Checks if the specified directory is case sensitive or not. Uses ioctl(2). + */ +static int get_dir_case_sensitivity_ioctl(int fd) +{ + int flags; + if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) != -1 && (flags & EXT4_CASEFOLD_FL)) + return FALSE; + return -1; +} +#endif + /*********************************************************************** * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), (f)statvfs(2), or fstatat(2). */ -static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) +static BOOLEAN get_dir_case_sensitivity_stat( const char *dir, int fd ) { #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - if (statfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statfs( dir, &stfs ) == -1) return FALSE; + /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1157,7 +1183,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - if (statvfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatvfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statvfs( dir, &stfs ) == -1) return FALSE; + /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -1170,7 +1198,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statfs( dir, &stfs ) == -1) return FALSE; + if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -1180,6 +1210,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * This will break if somebody puts a file named ".ciopfs" in a non- * CIOPFS directory. */ + if (fd != -1) + { + if (fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + return FALSE; + return TRUE; + } + cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); if (!cifile) return TRUE; strcpy( cifile, dir ); @@ -1201,16 +1238,32 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { + int case_sensitive, fd = -1; + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) - int case_sensitive = get_dir_case_sensitivity_attr( dir ); + case_sensitive = get_dir_case_sensitivity_attr( dir ); if (case_sensitive != -1) return case_sensitive; #endif - return get_dir_case_sensitivity_stat( dir ); + +#ifdef EXT4_CASEFOLD_FL + if ((fd = open(dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE)) == -1) + return TRUE; + if ((case_sensitive = get_dir_case_sensitivity_ioctl(fd)) != -1) + { + close(fd); + return case_sensitive; + } +#endif + + case_sensitive = get_dir_case_sensitivity_stat(dir, fd); + + if (fd != -1) close(fd); + return case_sensitive; } -- 2.21.0

3 5

[PATCH v3 3/3] dxgi: Return DXGI_STATUS_OCCLUDED for minimized window in d3d11_swapchain_Present.
by Zhiyi Zhang 12 Jun '19

12 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 3 +++ dlls/dxgi/tests/dxgi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d..179e61b233 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + if (IsIconic(d3d11_swapchain_get_hwnd(swapchain))) + return DXGI_STATUS_OCCLUDED; + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3d6e7f99b2..207d7782d5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4072,7 +4072,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Minimized window */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window */ -- 2.20.1

2 1

[PATCH v3 2/3] dxgi/tests: Add more IDXGISwapChain_Present tests.
by Zhiyi Zhang 12 Jun '19

12 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 201 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8d987eacc..3d6e7f99b2 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -476,6 +476,25 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } +#define wait_fullscreen_state(a, b, c) wait_fullscreen_state_(__LINE__, a, b, c) +static void wait_fullscreen_state_(INT line, IDXGISwapChain *swapchain, BOOL expected, BOOL todo) +{ + static const DWORD wait_timeout = 2000; + static const DWORD wait_step = 100; + DWORD total_time = 0; + BOOL got; + do + { + got = !expected; + IDXGISwapChain_GetFullscreenState(swapchain, &got, NULL); + if (got == expected) + break; + Sleep(wait_step); + total_time += wait_step; + } while (total_time < wait_timeout); + todo_wine_if(todo) ok_(__FILE__, line)(got == expected, "Expect %#x, got %#x.\n", expected, got); +} + static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -4002,9 +4021,12 @@ static void test_swapchain_parameters(void) static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { + static const DWORD flags[] = {0, DXGI_PRESENT_TEST}; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; + IDXGIOutput *output; + BOOL fullscreen; unsigned int i; ULONG refcount; HRESULT hr; @@ -4039,6 +4061,185 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + HWND occluding_hwnd = CreateWindowA("static", "occluding_window", WS_POPUP | WS_VISIBLE, 0, 0, 400, 200, 0, 0, 0, 0); + + /* Another window covers the swapchain window, doesn't report as occluded */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Minimized window */ + ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); + + /* Hidden window */ + ShowWindow(swapchain_desc.OutputWindow, SW_HIDE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ShowWindow(swapchain_desc.OutputWindow, SW_SHOW); + DestroyWindow(occluding_hwnd); + + /* Test IDXGIOutput_ReleaseOwnership makes the swapchain exit fullscreen */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. DXGI_ERROR_UNSUPPORTED on Win 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Could not change fullscreen state.\n"); + continue; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + output = NULL; + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + todo_wine_if(is_d3d12) ok(output != NULL, "Expect output not null.\n"); + + if (output) IDXGIOutput_ReleaseOwnership(output); + /* Still in fullscreen */ + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + /* Now calling IDXGISwapChain_Present will exit the fullscreen */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Now fullscreen mode is exited */ + if (flags[i] == 0 && !is_d3d12) + { + /* Still on fullscreen on vista and 2008 */ + todo_wine ok(!fullscreen || broken(fullscreen), "Unexpected fullscreen status.\n"); + } + else + { + ok(fullscreen, "Unexpected fullscreen status.\n"); + } + if (output) + { + IDXGIOutput_Release(output); + } + + /* Test creating a window when swapchain is in fullscreen. + * The window should break the swapchain out of fullscreen mode on d3d10/11. + * d3d12 is different, new occluding window doesn't break swapchain out of fullscreen because d3d12 swapchain + * fullscreen mode doesn't take exclusive ownership over output, nor does it disable compositing. + * d3d12 fullscreen mode acts just like borderless fullscreen window mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + occluding_hwnd = CreateWindowA("static", "occluding_window", WS_POPUP, 0, 0, 400, 200, 0, 0, 0, 0); + /* Invisible window doesn't cause fullscreen mode to exit */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + /* Visible but with bottom z-order window still cause fullscreen mode to exit for d3d11 */ + SetWindowPos(occluding_hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + ShowWindow(occluding_hwnd, SW_SHOW); + /* Fullscreen mode takes a while to exit */ + if (!is_d3d12) + { + wait_fullscreen_state(swapchain, FALSE, TRUE); + } + + /* No longer fullscreen before calling IDXGISwapChain_Present except for d3d12 */ + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Unexpected fullscreen status.\n"); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Got unexpected hr %#x.\n", hr); + + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (flags[i] == DXGI_PRESENT_TEST) + { + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Unexpected fullscreen status.\n"); + } + else + { + todo_wine ok(!fullscreen, "Unexpected fullscreen status.\n"); + } + + /* Even though d3d12 doesn't exit fullscreen, a IDXGISwapChain_ResizeBuffers is still needed for subsequent + * IDXGISwapChain_Present calls to work, otherwise they will return DXGI_ERROR_INVALID_CALL */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + { + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Got unexpected hr %#x.\n", hr); + } + else + { + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + /* Trying break out of fullscreen mode again. This time, don't call IDXGISwapChain_GetFullscreenState before + * IDXGISwapChain_Present */ + ShowWindow(occluding_hwnd, SW_HIDE); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ShowWindow(occluding_hwnd, SW_SHOW); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + /* hr == S_OK on vista and 2008 */ + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + { + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + /* IDXGISwapChain_Present without flags refresh the occlusion state */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!fullscreen, "Unexpected fullscreen status.\n"); + + DestroyWindow(occluding_hwnd); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + } + wait_device_idle(device); IDXGISwapChain_Release(swapchain); -- 2.20.1

2 1

[PATCH v3 1/3] dxgi/tests: Add IDXGIOutput ownership tests.
by Zhiyi Zhang 12 Jun '19

12 Jun '19

Mostly to show that IDXGIOutput_TakeOwnership and IDXGIOutput_ReleaseOwnership are based on VidPN ownership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Mostly style changes. Supersede 166262~166264 dlls/dxgi/tests/dxgi.c | 222 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..f8d987eacc 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -17,11 +17,15 @@ */ #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #define COBJMACROS #include "initguid.h" #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/heap.h" #include "wine/test.h" @@ -36,6 +40,10 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); +static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -658,6 +666,37 @@ static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDX } } +#define get_adapter(a, b) get_adapter_(__LINE__, a, b) +static IDXGIAdapter* get_adapter_(unsigned int line, IUnknown *device, BOOL is_d3d12) +{ + IDXGIAdapter *adapter = NULL; + ID3D12Device *d3d12_device; + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + LUID luid; + HRESULT hr; + + if (is_d3d12) + { + get_factory(device, is_d3d12, &factory); + hr = ID3D12CommandQueue_GetDevice((ID3D12CommandQueue *)device, &IID_ID3D12Device, (void **)&d3d12_device); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + luid = ID3D12Device_GetAdapterLuid(d3d12_device); + ID3D12Device_Release(d3d12_device); + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + IDXGIFactory_Release(factory); + } + else + { + IDXGIDevice_GetAdapter((IDXGIDevice *)device, &adapter); + } + + return adapter; +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -4985,6 +5024,180 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +/* D3DKMTCheckVidPnExclusiveOwnership returns different result if called too early */ +#define wait_vidpn_exclusive_ownership(a, b, c) wait_vidpn_exclusive_ownership_(__LINE__, a, b, c) +static void wait_vidpn_exclusive_ownership_(INT line, const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *arg, NTSTATUS expected, + BOOL todo) +{ + static const DWORD wait_timeout = 2000; + static const DWORD wait_step = 100; + DWORD total_time = 0; + NTSTATUS got; + do + { + got = pD3DKMTCheckVidPnExclusiveOwnership(arg); + if (got == expected) + break; + Sleep(wait_step); + total_time += wait_step; + } while (total_time < wait_timeout); + todo_wine_if(todo) ok_(__FILE__, line)(got == expected, "Expect %#x, got %#x.\n", expected, got); +} + +static void test_output_ownership(IUnknown *device, BOOL is_d3d12) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_ownership_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + BOOL fullscreen; + NTSTATUS status; + ULONG refcount; + HRESULT hr; + + if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + return; + } + + get_factory(device, is_d3d12, &factory); + adapter = get_adapter(device, is_d3d12); + if (!adapter) + { + skip("Failed to get adapter.\n"); + return; + } + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + IDXGIAdapter_Release(adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, output_desc.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + /* Swapchain in fullscreen mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. DXGI_ERROR_UNSUPPORTED on Win 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Failed to change fullscreen state.\n"); + goto done; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen state.\n"); + if (is_d3d12) + { + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + } + else + { + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + } + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + /* Calling IDXGIOutput_ReleaseOwnership makes it unoccluded. So we can be confident about IDXGIOutput_TakeOwnership + * was called in IDXGISwapChain_SetFullscreenState */ + IDXGIOutput_ReleaseOwnership(output); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + /* IDXGIOutput_TakeOwnership always return E_NOINTERFACE for d3d12. Tests finished */ + if (is_d3d12) + { + goto done; + } + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* The following results shows that IDXGIOutput_TakeOwnership(output, device, TRUE) is used in + * SetFullscreenState(swapchain, TRUE, NULL). This make me believe the MSDN documentation is saying the opposite + * about the last parameter 'exclusive'. It should be D3DKMTSetVidPnSourceOwner(D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE) + * when it's TRUE and D3DKMTSetVidPnSourceOwner(D3DKMT_VIDPNSOURCEOWNER_SHARED) when it's FALSE according to tests */ + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + /* Swapchain in windowed mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Unexpected fullscreen state.\n"); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + IDXGIOutput_ReleaseOwnership(output); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + +done: + IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + wait_device_idle(device); + + IDXGIOutput_Release(output); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5028,7 +5241,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module; + HMODULE dxgi_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -5038,6 +5251,11 @@ START_TEST(dxgi) pCreateDXGIFactory1 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory1"); pCreateDXGIFactory2 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory2"); + gdi32_module = GetModuleHandleA("gdi32.dll"); + pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32_module, "D3DKMTCheckVidPnExclusiveOwnership"); + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); @@ -5088,6 +5306,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); + run_on_d3d10(test_output_ownership); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -5108,6 +5327,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); + run_on_d3d12(test_output_ownership); FreeLibrary(d3d12_module); } -- 2.20.1

2 1

Experimenting with wine-pba
by Gabriel Ivăncescu 12 Jun '19

12 Jun '19

Hi all, Anyone have any experience with the wine-pba patchset? (Persistent Buffer Allocator) The one I know of hasn't been rebased for a long time and so won't apply on current wine, although I see Lutris does make use of it, but not sure if only on older wine versions. Is there some way to get it compiled into current wine so I can test it out? (or perhaps into wine-staging, if it requires that). If not, what's the last wine / wine-staging version that supported it? I'm interested in comparing the performance between it and DXVK on some games I'm testing, especially those where DXVK seems to provide almost no benefit (or sometimes even worse performance!) over wined3d, which is a bit odd. I've seen numerous claims that wine-pba provides even greater performance than DXVK on certain titles, so I'm curious. At this point, it might also be something on my end regarding Vulkan and why DXVK doesn't really shine. If PBA gives a large performance gain, then it would be interesting to see why DXVK is so slow (otherwise it could just be the game itself that's the problem). Overall I think it would be nice to experiment with it. Thanks, Gabriel

7 10

[PATCH v11 1/2] ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics
by Rémi Bernon 12 Jun '19

12 Jun '19

This parameter was misinterpreted as an alignment parameter for the lower bits of the allocated memory region, although it is a constraint on the higher bits. Add a new internal ntdll virtual_alloc_aligned function that has a separate alignment parameter which is now used instead of the zero_bits parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/heap.c | 5 ++--- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 12 ++++++------ dlls/ntdll/signal_arm64.c | 16 ++++++++-------- dlls/ntdll/signal_i386.c | 16 ++++++++-------- dlls/ntdll/signal_powerpc.c | 12 ++++++------ dlls/ntdll/signal_x86_64.c | 16 ++++++++-------- dlls/ntdll/tests/virtual.c | 4 +--- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 37 ++++++++++++++++++++++++++++++------- 11 files changed, 74 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9781f..6605999b824 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1603,14 +1603,14 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) SIZE_T size = 2 * sizeof(*de) + page_size; void *addr = NULL; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_RESERVE, PAGE_READWRITE )) + if (virtual_alloc_aligned( &addr, 0, &size, MEM_RESERVE, PAGE_READWRITE, 1 )) return NULL; /* commit only the size needed for the dir entries */ /* this leaves an extra unaccessible page, which should make the kernel */ /* fail with -EFAULT before it stomps all over our memory */ de = addr; size = 2 * sizeof(*de); - NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_COMMIT, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 1 ); } /* set d_reclen to 65535 to work around an AFS kernel bug */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cccaaee1d45..2d2caf551e3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -726,8 +726,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, - &block_size, MEM_COMMIT, get_protection_type( flags ) )) + if (virtual_alloc_aligned( &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ), 5 )) { WARN("Could not allocate block for %08lx bytes\n", size ); return NULL; @@ -1521,7 +1520,7 @@ void heap_set_debug_flags( HANDLE handle ) void *ptr = NULL; SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); - if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + if (!virtual_alloc_aligned( &ptr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 4 )) { heap->pending_free = ptr; heap->pending_pos = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38ad..f371a0ab42d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,6 +168,8 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S UINT disposition ) DECLSPEC_HIDDEN; /* virtual memory */ +extern NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ); extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e01c8ce2193..cf7f2d13160 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -967,22 +967,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 94520c95ced..d2d43b34bc1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -871,24 +871,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b4e88d125f1..b2925062bf7 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2312,25 +2312,25 @@ static void ldt_unlock(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; struct x86_thread_data *thread_data; SIZE_T size; void *addr = NULL; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_mask = (1 << sigstack_zero_bits) - 1; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_mask = (1 << sigstack_alignment) - 1; + signal_stack_size = (1 << sigstack_alignment) - teb_size; } size = signal_stack_mask + 1; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { *teb = addr; (*teb)->Tib.Self = &(*teb)->Tib; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54f..f23265445df 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1018,22 +1018,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2633b988b62..b024de76421 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3263,24 +3263,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 195a54704fb..ff10508a604 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -55,7 +55,6 @@ static void test_AllocateVirtualMemory(void) addr2 = (char *)addr1 + 0x1000; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { @@ -141,12 +140,11 @@ static void test_AllocateVirtualMemory(void) } else { - todo_wine ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine + todo_wine_if((UINT_PTR)addr2 & ~zero_bits) ok(((UINT_PTR)addr2 & ~zero_bits) == 0, "NtAllocateVirtualMemory returned address %p\n", addr2); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400d..96aa6be7f2c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -184,8 +184,7 @@ void thread_init(void) addr = NULL; size = sizeof(*peb); - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 1, &size, - MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE, 1 ); peb = addr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda4..20512d41835 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2461,19 +2461,16 @@ void virtual_set_large_address_space(void) NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect ) { - void *base; - unsigned int vprot; SIZE_T size = *size_ptr; - SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; - BOOL is_dos_memory = FALSE; - struct file_view *view; - sigset_t sigset; TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); if (!size) return STATUS_INVALID_PARAMETER; - if (!mask) return STATUS_INVALID_PARAMETER_3; + if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; +#ifndef _WIN64 + if (!is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#endif if (process != NtCurrentProcess()) { @@ -2499,6 +2496,32 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ return result.virtual_alloc.status; } + return virtual_alloc_aligned( ret, zero_bits, size_ptr, type, protect, 0 ); +} + + +/*********************************************************************** + * virtual_alloc_aligned (NTDLL.@) + * + * Same as NtAllocateVirtualMemory but with an alignment parameter + */ +NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ) +{ + void *base; + unsigned int vprot; + SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( alignment ); + NTSTATUS status = STATUS_SUCCESS; + BOOL is_dos_memory = FALSE; + struct file_view *view; + sigset_t sigset; + + if (zero_bits) + { + FIXME("Unimplemented zero_bits parameter value\n"); + } + /* Round parameters to a page boundary */ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; -- 2.20.1

2 4

[PATCH 5/5] wined3d: Upload texture data through the texture ops in surface_convert_format().
by Henri Verbeet 12 Jun '19

12 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 291ae845254..8d67e52afa2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -694,9 +694,9 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr TRACE("Using upload conversion.\n"); wined3d_texture_prepare_location(dst_texture, 0, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); - wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, - wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&src_data), + src_format, &src_box, src_row_pitch, src_slice_pitch, + dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB, 0, 0, 0); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind().
by Henri Verbeet 12 Jun '19

12 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/state.c | 2 +- dlls/wined3d/texture.c | 15 +++++++-------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e13557a98f..d87f6088ea6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3617,7 +3617,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture_gl); - wined3d_texture_gl_bind(texture_gl, context, srgb); + wined3d_texture_gl_bind(texture_gl, context_gl, srgb); if ((entry = wine_rb_get(&device->samplers, &desc))) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da646ceee4a..d3c58cb875e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -934,18 +934,17 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ /* Context activation is done by the caller. */ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) + struct wined3d_context_gl *context_gl, BOOL srgb) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_format *format = texture_gl->t.resource.format; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct color_fixup_desc fixup = format->color_fixup; - const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; GLenum target; - TRACE("texture_gl %p, context %p, srgb %#x.\n", texture_gl, context, srgb); + TRACE("texture_gl %p, context_gl %p, srgb %#x.\n", texture_gl, context_gl, srgb); - if (!needs_separate_srgb_gl_texture(context, &texture_gl->t)) + if (!needs_separate_srgb_gl_texture(&context_gl->c, &texture_gl->t)) srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ @@ -988,7 +987,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, gl_tex->sampler_desc.max_anisotropy = 1; gl_tex->sampler_desc.compare = FALSE; gl_tex->sampler_desc.comparison_func = WINED3D_CMP_LESSEQUAL; - if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_tex->sampler_desc.srgb_decode = TRUE; else gl_tex->sampler_desc.srgb_decode = srgb; @@ -1046,7 +1045,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } - if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context->d3d_info, format)) + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context_gl->c.d3d_info, format)) { GLint swizzle[4]; @@ -1080,7 +1079,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - wined3d_texture_gl_bind(texture_gl, &context_gl->c, srgb); + wined3d_texture_gl_bind(texture_gl, context_gl, srgb); } /* Context activation is done by the caller (state handler). */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e0ac57e761e..06e24fb8ebc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -850,7 +850,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl } texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); - wined3d_texture_gl_bind(texture_gl, context, FALSE); + wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); wined3d_sampler_bind(sampler, unit, texture_gl, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74ad31ee137..91570ed79f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3620,7 +3620,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; + struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_apply_sampler_desc().
by Henri Verbeet 12 Jun '19

12 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/sampler.c | 3 ++- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 6e45f0e4b4e..8c3a94766a5 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -184,6 +184,7 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -193,7 +194,7 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, } else if (texture_gl) { - wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context); + wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context_gl); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8b27e59bc30..da646ceee4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1086,14 +1086,14 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, /* Context activation is done by the caller (state handler). */ /* This function relies on the correct texture being bound and loaded. */ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum target = texture_gl->target; struct gl_texture *gl_tex; DWORD state; - TRACE("texture_gl %p, sampler_desc %p, context %p.\n", texture_gl, sampler_desc, context); + TRACE("texture_gl %p, sampler_desc %p, context_gl %p.\n", texture_gl, sampler_desc, context_gl); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); @@ -1156,7 +1156,7 @@ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl } if (!sampler_desc->srgb_decode != !gl_tex->sampler_desc.srgb_decode - && (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + && (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9617a44b32d..74ad31ee137 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3618,7 +3618,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win } void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture().
by Henri Verbeet 12 Jun '19

12 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 5 ++-- dlls/wined3d/surface.c | 11 +++++---- dlls/wined3d/texture.c | 54 +++++++++++++++++++++++------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 05d39038843..8413d0f3c05 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2228,7 +2228,8 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * && update_h == wined3d_texture_get_level_height(dst_texture, level) && update_d == wined3d_texture_get_level_depth(dst_texture, level)) { - wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_prepare_location(dst_texture, op->dst_sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB); } else if (!wined3d_texture_load_location(dst_texture, op->dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) @@ -2337,7 +2338,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) - wined3d_texture_prepare_texture(texture, context, FALSE); + wined3d_texture_prepare_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0b6104d475b..291ae845254 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -693,7 +693,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr TRACE("Using upload conversion.\n"); - wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_prepare_location(dst_texture, 0, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); @@ -868,7 +868,7 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); - wined3d_texture_prepare_texture(&texture_gl->t, context, srgb); + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, srgb); wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); TRACE("Reading back offscreen render target %p, %u.\n", texture_gl, sub_resource_idx); @@ -1529,6 +1529,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = texture->resource.device; @@ -1547,7 +1548,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - texture2d_load_fb_texture(wined3d_texture_gl(texture), sub_resource_idx, srgb, context); + texture2d_load_fb_texture(texture_gl, sub_resource_idx, srgb, context); return TRUE; } @@ -1621,8 +1622,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); } - wined3d_texture_prepare_texture(texture, context, srgb); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), srgb); + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = texture->resource.format; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5e84a82138a..8b27e59bc30 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1715,52 +1715,53 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } /* Context activation is done by the caller. */ -void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) +void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, + struct wined3d_context_gl *context_gl, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_resource *resource = &texture->resource; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + struct wined3d_resource *resource = &texture_gl->t.resource; const struct wined3d_device *device = resource->device; const struct wined3d_format *format = resource->format; const struct wined3d_color_key_conversion *conversion; const struct wined3d_format_gl *format_gl; GLenum internal; - TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); + TRACE("texture_gl %p, context_gl %p, format %s.\n", texture_gl, context_gl, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key - && !(texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) - != !(texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)) + && !(texture_gl->t.async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) + != !(texture_gl->t.async.color_key_flags & WINED3D_CKEY_SRC_BLT)) { - wined3d_texture_force_reload(texture); + wined3d_texture_force_reload(&texture_gl->t); - if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) - texture->async.flags |= WINED3D_TEXTURE_ASYNC_COLOR_KEY; + if (texture_gl->t.async.color_key_flags & WINED3D_CKEY_SRC_BLT) + texture_gl->t.async.flags |= WINED3D_TEXTURE_ASYNC_COLOR_KEY; } - if (texture->flags & alloc_flag) + if (texture_gl->t.flags & alloc_flag) return; if (resource->format_flags & WINED3DFMT_FLAG_DECOMPRESS) { TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); - texture->flags |= WINED3D_TEXTURE_CONVERTED; + texture_gl->t.flags |= WINED3D_TEXTURE_CONVERTED; format = wined3d_resource_get_decompress_format(resource); } else if (format->conv_byte_count) { - texture->flags |= WINED3D_TEXTURE_CONVERTED; + texture_gl->t.flags |= WINED3D_TEXTURE_CONVERTED; } - else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) + else if ((conversion = wined3d_format_get_color_key_conversion(&texture_gl->t, TRUE))) { - texture->flags |= WINED3D_TEXTURE_CONVERTED; + texture_gl->t.flags |= WINED3D_TEXTURE_CONVERTED; format = wined3d_get_format(device->adapter, conversion->dst_format, resource->bind_flags); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } format_gl = wined3d_format_gl(format); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); if (srgb) internal = format_gl->srgb_internal; @@ -1774,11 +1775,11 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win TRACE("internal %#x, format %#x, type %#x.\n", internal, format_gl->format, format_gl->type); - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_gl_allocate_immutable_storage(wined3d_texture_gl(texture), internal, gl_info); + if (wined3d_texture_use_immutable_storage(&texture_gl->t, gl_info)) + wined3d_texture_gl_allocate_immutable_storage(texture_gl, internal, gl_info); else - wined3d_texture_gl_allocate_mutable_storage(wined3d_texture_gl(texture), internal, format_gl, gl_info); - texture->flags |= alloc_flag; + wined3d_texture_gl_allocate_mutable_storage(texture_gl, internal, format_gl, gl_info); + texture_gl->t.flags |= alloc_flag; } static void wined3d_texture_gl_prepare_rb(struct wined3d_texture_gl *texture_gl, @@ -1822,6 +1823,9 @@ static void wined3d_texture_gl_prepare_rb(struct wined3d_texture_gl *texture_gl, BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + switch (location) { case WINED3D_LOCATION_SYSMEM: @@ -1842,11 +1846,11 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_TEXTURE_RGB: - wined3d_texture_prepare_texture(texture, context, FALSE); + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, FALSE); return TRUE; case WINED3D_LOCATION_TEXTURE_SRGB: - wined3d_texture_prepare_texture(texture, context, TRUE); + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, TRUE); return TRUE; case WINED3D_LOCATION_DRAWABLE: @@ -1855,11 +1859,11 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_RB_MULTISAMPLE: - wined3d_texture_gl_prepare_rb(wined3d_texture_gl(texture), context->gl_info, TRUE); + wined3d_texture_gl_prepare_rb(texture_gl, context->gl_info, TRUE); return TRUE; case WINED3D_LOCATION_RB_RESOLVED: - wined3d_texture_gl_prepare_rb(wined3d_texture_gl(texture), context->gl_info, FALSE); + wined3d_texture_gl_prepare_rb(texture_gl, context->gl_info, FALSE); return TRUE; default: @@ -3844,7 +3848,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un if (update_w == wined3d_texture_get_level_width(dst_texture, dst_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_level) && update_d == wined3d_texture_get_level_depth(dst_texture, dst_level)) - wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index bd32b88e0eb..e0ac57e761e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -190,7 +190,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target return; } - wined3d_texture_prepare_texture(&texture_gl->t, context, FALSE); + wined3d_texture_gl_prepare_texture(texture_gl, context_gl, FALSE); texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); level_idx = desc->u.texture.level_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04f160e9815..9617a44b32d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3550,8 +3550,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void wined3d_texture_prepare_texture(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3625,6 +3623,8 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, + struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address().
by Henri Verbeet 12 Jun '19

12 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/texture.c | 14 +++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be24baf3187..76b5858c0b6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2618,16 +2618,15 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void context_unmap_bo_address(struct wined3d_context *context, +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, GLenum binding) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); wined3d_context_gl_bind_bo(context_gl, binding, 0); @@ -2660,8 +2659,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, memcpy(dst_ptr, src_ptr, size); - context_unmap_bo_address(&context_gl->c, dst, dst_binding); - context_unmap_bo_address(&context_gl->c, src, src_binding); + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e28c46b114..0b6104d475b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -684,8 +684,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); } else { @@ -1660,7 +1660,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; data.addr = dst_mem; @@ -2932,9 +2932,9 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -3054,7 +3054,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(row, map.data, w * bpp); } - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2a8bff458e3..5e84a82138a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -774,6 +774,7 @@ static void wined3d_texture_create_dc(void *object) static void wined3d_texture_destroy_dc(void *object) { const struct wined3d_texture_idx *idx = object; + struct wined3d_context_gl *context_gl = NULL; D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; @@ -804,10 +805,13 @@ static void wined3d_texture_destroy_dc(void *object) dc_info->bitmap = NULL; if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); @@ -2008,7 +2012,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s else format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; bo.addr = converted_mem; @@ -2715,6 +2719,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso { struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -2734,10 +2739,13 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f0b91adaf1..04f160e9815 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2112,6 +2112,8 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2269,8 +2271,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light -- 2.11.0

1 0

[PATCH] libwine: Fix NORM_IGNORESYMBOLS flag handling in compare_weights.
by Piotr Caban 12 Jun '19

12 Jun '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- libs/port/sortkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Paul Gofman 12 Jun '19

12 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 81b237ecf5..cceef2b377 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4256,11 +4256,24 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); - if (mask_size > 1) + if (mask_size == 4) + { + static const float max_float = FLT_MAX; + + shader_addline(buffer, "tmp0.x == 0.0 ? vec4(vec3(0.0), sign(%s[3]) * ", + src_param.param_str); + shader_glsl_append_imm_vec(buffer, &max_float, 1, ins->ctx->gl_info); + shader_addline(buffer, ") : (%s * inversesqrt(tmp0.x)));\n", src_param.param_str); + } + else if (mask_size > 1) { shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s * inversesqrt(tmp0.x)));\n", mask_size, src_param.param_str); -- 2.21.0

2 2

[PATCH v10 1/2] ntdll: Clarify NtAllocateVirtualMemory zero_bits parameter semantics
by Rémi Bernon 12 Jun '19

12 Jun '19

This parameter was misinterpreted as an alignment parameter for the lower bits of the allocated memory region, although it is a constraint on the higher bits. Add a new internal ntdll virtual_alloc_aligned function that has a separate alignment parameter which is now used instead of the zero_bits parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/heap.c | 5 ++--- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_arm.c | 12 ++++++------ dlls/ntdll/signal_arm64.c | 16 ++++++++-------- dlls/ntdll/signal_i386.c | 16 ++++++++-------- dlls/ntdll/signal_powerpc.c | 12 ++++++------ dlls/ntdll/signal_x86_64.c | 16 ++++++++-------- dlls/ntdll/tests/virtual.c | 4 +--- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 34 +++++++++++++++++++++++++++------- 11 files changed, 71 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9781f..6605999b824 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1603,14 +1603,14 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) SIZE_T size = 2 * sizeof(*de) + page_size; void *addr = NULL; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_RESERVE, PAGE_READWRITE )) + if (virtual_alloc_aligned( &addr, 0, &size, MEM_RESERVE, PAGE_READWRITE, 1 )) return NULL; /* commit only the size needed for the dir entries */ /* this leaves an extra unaccessible page, which should make the kernel */ /* fail with -EFAULT before it stomps all over our memory */ de = addr; size = 2 * sizeof(*de); - NtAllocateVirtualMemory( GetCurrentProcess(), &addr, 1, &size, MEM_COMMIT, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 1 ); } /* set d_reclen to 65535 to work around an AFS kernel bug */ diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cccaaee1d45..2d2caf551e3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -726,8 +726,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, - &block_size, MEM_COMMIT, get_protection_type( flags ) )) + if (virtual_alloc_aligned( &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ), 5 )) { WARN("Could not allocate block for %08lx bytes\n", size ); return NULL; @@ -1521,7 +1520,7 @@ void heap_set_debug_flags( HANDLE handle ) void *ptr = NULL; SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); - if (!NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 4, &size, MEM_COMMIT, PAGE_READWRITE )) + if (!virtual_alloc_aligned( &ptr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 4 )) { heap->pending_free = ptr; heap->pending_pos = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd38ad..f371a0ab42d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,6 +168,8 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S UINT disposition ) DECLSPEC_HIDDEN; /* virtual memory */ +extern NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ); extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e01c8ce2193..cf7f2d13160 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -967,22 +967,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 94520c95ced..d2d43b34bc1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -871,24 +871,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b4e88d125f1..b2925062bf7 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2312,25 +2312,25 @@ static void ldt_unlock(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; struct x86_thread_data *thread_data; SIZE_T size; void *addr = NULL; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_mask = (1 << sigstack_zero_bits) - 1; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_mask = (1 << sigstack_alignment) - 1; + signal_stack_size = (1 << sigstack_alignment) - teb_size; } size = signal_stack_mask + 1; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { *teb = addr; (*teb)->Tib.Self = &(*teb)->Tib; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 86398d8f54f..f23265445df 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1018,22 +1018,22 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; assert( sizeof(TEB) <= min_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2633b988b62..b024de76421 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3263,24 +3263,24 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_zero_bits; + static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_zero_bits) + if (!sigstack_alignment) { size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ - sigstack_zero_bits = 12; - while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; - signal_stack_size = (1 << sigstack_zero_bits) - teb_size; + sigstack_alignment = 12; + while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; + signal_stack_size = (1 << sigstack_alignment) - teb_size; assert( sizeof(TEB) <= teb_size ); } - size = 1 << sigstack_zero_bits; + size = 1 << sigstack_alignment; *teb = NULL; - if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)teb, sigstack_zero_bits, - &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ))) + if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, + PAGE_READWRITE, sigstack_alignment ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 195a54704fb..ff10508a604 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -55,7 +55,6 @@ static void test_AllocateVirtualMemory(void) addr2 = (char *)addr1 + 0x1000; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { @@ -141,12 +140,11 @@ static void test_AllocateVirtualMemory(void) } else { - todo_wine ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine + todo_wine_if((UINT_PTR)addr2 & ~zero_bits) ok(((UINT_PTR)addr2 & ~zero_bits) == 0, "NtAllocateVirtualMemory returned address %p\n", addr2); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 46de839400d..96aa6be7f2c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -184,8 +184,7 @@ void thread_init(void) addr = NULL; size = sizeof(*peb); - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 1, &size, - MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); + virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE, 1 ); peb = addr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78973a8cda4..0d1c3c3e2c3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2461,19 +2461,13 @@ void virtual_set_large_address_space(void) NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect ) { - void *base; - unsigned int vprot; SIZE_T size = *size_ptr; - SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; - BOOL is_dos_memory = FALSE; - struct file_view *view; - sigset_t sigset; TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); if (!size) return STATUS_INVALID_PARAMETER; - if (!mask) return STATUS_INVALID_PARAMETER_3; + if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; if (process != NtCurrentProcess()) { @@ -2499,6 +2493,32 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ return result.virtual_alloc.status; } + return virtual_alloc_aligned( ret, zero_bits, size_ptr, type, protect, 0 ); +} + + +/*********************************************************************** + * virtual_alloc_aligned (NTDLL.@) + * + * Same as NtAllocateVirtualMemory but with an alignment parameter + */ +NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr, + ULONG type, ULONG protect, ULONG alignment ) +{ + void *base; + unsigned int vprot; + SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( alignment ); + NTSTATUS status = STATUS_SUCCESS; + BOOL is_dos_memory = FALSE; + struct file_view *view; + sigset_t sigset; + + if (zero_bits) + { + FIXME("Unimplemented zero_bits parameter value\n"); + } + /* Round parameters to a page boundary */ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; -- 2.20.1

2 3

[PATCH] Fix Block scope compound literal's lifetime issues.
by Martin Liška 12 Jun '19

12 Jun '19

Hi. I'm sending patch that addresses miscompilation seen with GCC 9. Martin

2 2

[PATCH 1/5] strmbase: Add default implementations of IUnknown methods for IBasicVideo.
by Zebediah Figura 11 Jun '19

11 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/video.c | 18 ++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 440adc43a83..8e26aaf20fe 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -70,6 +70,24 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_QueryInterface(video->pFilter->outer_unk, iid, out); +} + +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_AddRef(video->pFilter->outer_unk); +} + +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_Release(video->pFilter->outer_unk); +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { TRACE("iface %p, count %p.\n", iface, count); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9f686dc4cff..0b582b9d4de 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -517,6 +517,9 @@ typedef struct BaseControlVideoFuncTable { HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBasicVideoVtbl *lpVtbl, BaseFilter *owner, CRITICAL_SECTION *lock, BasePin* pPin, const BaseControlVideoFuncTable* pFuncsTable); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out); +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface); +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT*pctinfo); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo); HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId); -- 2.20.1

1 4

Wine staging 4.10 release
by Alistair Leslie-Hughes 11 Jun '19

11 Jun '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.10 (822 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. We have dropped the patch to support DirectX 10 with the legacy nVidia Driver, please use the nouveau driver. Upstreamed (Either directly from staging or fixed with a similar patch). * bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs. * bcrypt: Add BCryptDeriveKey stub. Added: * [47099] ntdll: Support for EXT4 case folding per directory. * [47326] dinput: Allow mapping of controls based of genre type. Updated: * libs-Debug_Channel * ntdll-Junction_Points * user32-msgbox-Support-WM_COPY-mesg * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ddraw: Factor out viewport_alloc_active_light_index() function.
by Paul Gofman 11 Jun '19

11 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/light.c | 6 ++-- dlls/ddraw/viewport.c | 66 ++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a5fce2a15e..22910d7cc4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,6 +66,8 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) +#define DDRAW_MAX_ACTIVE_LIGHTS 8 + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, @@ -446,7 +448,7 @@ struct d3d_light D3DLIGHT2 light; D3DLIGHT7 light7; - DWORD dwLightIndex; + DWORD active_light_index; struct list entry; }; @@ -500,7 +502,7 @@ struct d3d_viewport /* If this viewport is active for one device, put the device here */ struct d3d_device *active_device; - DWORD num_lights; + DWORD active_lights_count; DWORD map_lights; enum ddraw_viewport_version version; diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c6513ffe8a..a86f046b74 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -39,7 +39,7 @@ static void light_update(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->dwLightIndex, &light->light7); + IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->active_light_index, &light->light7); } /***************************************************************************** @@ -61,7 +61,7 @@ void light_activate(struct d3d_light *light) light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); } /***************************************************************************** @@ -83,7 +83,7 @@ void light_deactivate(struct d3d_light *light) device = light->active_viewport->active_device; if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index daa5ac8d5a..31724402b3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,6 +122,34 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } +static void viewport_alloc_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + unsigned int i; + DWORD map; + + TRACE("vp %p, light %p, index %u, active_lights_count %u.\n", + vp, light, light->active_light_index, vp->active_lights_count); + + if (light->active_light_index) + return; + + if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS) + return; + + map = vp->map_lights; + + i = 0; + while (map & 1) + { + map >>= 1; + ++i; + } + light->active_light_index = i + 1; + ++vp->active_lights_count; + vp->map_lights |= 1u << i; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -753,23 +781,15 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if there are 8 lights or more * *****************************************************************************/ -static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirect3DLight *light) { - struct d3d_viewport *This = impl_from_IDirect3DViewport3(iface); - struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); - DWORD i = 0; - DWORD map = This->map_lights; + struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(light); + struct d3d_viewport *vp = impl_from_IDirect3DViewport3(viewport); - TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); + TRACE("viewport %p, light %p.\n", viewport, light); wined3d_mutex_lock(); - if (This->num_lights >= 8) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - if (light_impl->active_viewport) { wined3d_mutex_unlock(); @@ -777,22 +797,20 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D return D3DERR_LIGHTHASVIEWPORT; } - /* Find a light number and update both light and viewports objects accordingly */ - while (map & 1) + light_impl->active_viewport = vp; + viewport_alloc_active_light_index(light_impl); + if (!light_impl->active_light_index) { - map >>= 1; - ++i; + light_impl->active_viewport = NULL; + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } - light_impl->dwLightIndex = i; - This->num_lights++; - This->map_lights |= 1<<i; /* Add the light in the 'linked' chain */ - list_add_head(&This->light_list, &light_impl->entry); - IDirect3DLight_AddRef(lpDirect3DLight); + list_add_head(&vp->light_list, &light_impl->entry); + IDirect3DLight_AddRef(light); /* Attach the light to the viewport */ - light_impl->active_viewport = This; light_activate(light_impl); wined3d_mutex_unlock(); @@ -833,8 +851,8 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->num_lights; - viewport->map_lights &= ~(1 << l->dwLightIndex); + --viewport->active_lights_count; + viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock(); -- 2.21.0

4 13

[PATCH v2 1/3] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura 11 Jun '19

11 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c66d46..c3d3b770b5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.20.1

2 3

[PATCH vkd3d 06/12] vkd3d: Allocate device memory when heap offset is misaligned.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> On radv with AMD Polaris GPUs, the alignment may be as high as 0x20000 or 0x40000. World of Warcraft seems to ignore the alignment returned from GetResourceAllocationInfo(), and simply aligns to 0x10000 (D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 15dac12abeb6..6bbd5afa2eea 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1492,7 +1492,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, - struct d3d12_resource *resource, struct d3d12_heap *heap, UINT64 heap_offset) + struct d3d12_resource *resource, struct d3d12_heap *heap, uint64_t heap_offset) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDevice vk_device = device->vk_device; @@ -1506,16 +1506,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, if (heap_offset % requirements.alignment) { - FIXME("Invalid heap offset %#"PRIx64".\n", heap_offset); - return E_INVALIDARG; + FIXME("Invalid heap offset %#"PRIx64" (alignment %#"PRIx64").\n", + heap_offset, requirements.alignment); + goto allocate_memory; } if (!(requirements.memoryTypeBits & (1u << heap->vk_memory_type))) { - FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x), " - "allocating device memory.\n", + FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x).\n", heap->vk_memory_type, resource, requirements.memoryTypeBits); - return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); + goto allocate_memory; } if (d3d12_resource_is_buffer(resource)) @@ -1534,6 +1534,10 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, } return hresult_from_vk_result(vr); + +allocate_memory: + FIXME("Allocating device memory.\n"); + return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, -- 2.21.0

2 1

[PATCH vkd3d 02/12] vkd3d: Invalidate current pipeline when DSV format is changed.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0cbf0fb410ce..560b6971e29e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2305,6 +2305,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCom return E_NOTIMPL; } +static bool d3d12_command_list_has_unknown_dsv_format(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics; + + if (!d3d12_pipeline_state_is_graphics(list->state)) + return false; + + graphics = &list->state->u.graphics; + return graphics->null_attachment_mask & (1u << graphics->rt_count); +} + static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) { struct d3d12_graphics_pipeline_state *graphics; @@ -2312,8 +2323,7 @@ static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list assert(d3d12_pipeline_state_is_graphics(list->state)); graphics = &list->state->u.graphics; - return graphics->dsv_format - || (graphics->null_attachment_mask & (1u << graphics->rt_count) && list->dsv_format); + return graphics->dsv_format || (d3d12_command_list_has_unknown_dsv_format(list) && list->dsv_format); } static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, @@ -4321,6 +4331,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + VkFormat prev_dsv_format; struct vkd3d_view *view; unsigned int i; @@ -4373,6 +4384,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + prev_dsv_format = list->dsv_format; list->dsv = VK_NULL_HANDLE; list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) @@ -4402,6 +4414,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } } + if (prev_dsv_format != list->dsv_format && d3d12_command_list_has_unknown_dsv_format(list)) + d3d12_command_list_invalidate_current_pipeline(list); + d3d12_command_list_invalidate_current_framebuffer(list); d3d12_command_list_invalidate_current_render_pass(list); } -- 2.21.0

2 1

[PATCH vkd3d 11/12] vkd3d: Factor out vkd3d_create_thread().
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 25 ++++++------------------- libs/vkd3d/device.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 97cc7de1c59e..0c2fd3ea7e1f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -410,6 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device) { + HRESULT hr; int rc; TRACE("worker %p.\n", worker); @@ -437,28 +438,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if (device->create_thread) - { - if (!(worker->u.handle = device->create_thread(vkd3d_fence_worker_main, worker))) - { - ERR("Failed to create fence worker thread.\n"); - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - return E_FAIL; - } - - return S_OK; - } - - if ((rc = pthread_create(&worker->u.thread, NULL, vkd3d_fence_worker_main, worker))) + if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, + vkd3d_fence_worker_main, worker, &worker->thread))) { - ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return hresult_from_errno(rc); } - return S_OK; + return hr; } HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, @@ -482,7 +469,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (device->join_thread) { - if (FAILED(hr = device->join_thread(worker->u.handle))) + if (FAILED(hr = device->join_thread(worker->thread.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); return hr; @@ -490,7 +477,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, } else { - if ((rc = pthread_join(worker->u.thread, NULL))) + if ((rc = pthread_join(worker->thread.pthread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); return hresult_from_errno(rc); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4df2462eed12..e88d3c2964e1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->create_thread = instance->create_thread; device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; @@ -3198,6 +3197,32 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->create_thread) + { + if (!(thread->handle = instance->create_thread(thread_main, data))) + { + ERR("Failed to create thread.\n"); + hr = E_FAIL; + } + } + else + { + if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) + { + ERR("Failed to create thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9191ae258956..2fbf6925098e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -141,13 +141,18 @@ struct vkd3d_instance LONG refcount; }; +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + struct vkd3d_fence_worker { - union - { - pthread_t thread; - void *handle; - } u; + union vkd3d_thread_handle thread; pthread_mutex_t mutex; pthread_cond_t cond; bool should_exit; @@ -1014,7 +1019,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_create_thread create_thread; PFN_vkd3d_join_thread join_thread; IUnknown *parent; -- 2.21.0

2 1

[PATCH vkd3d 12/12] vkd3d: Factor out vkd3d_join_thread().
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 18 ++---------------- libs/vkd3d/device.c | 23 ++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 +-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0c2fd3ea7e1f..fcb7a4899091 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -467,22 +467,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, pthread_mutex_unlock(&worker->mutex); - if (device->join_thread) - { - if (FAILED(hr = device->join_thread(worker->thread.handle))) - { - ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return hr; - } - } - else - { - if ((rc = pthread_join(worker->thread.pthread, NULL))) - { - ERR("Failed to join fence worker thread, error %d.\n", rc); - return hresult_from_errno(rc); - } - } + if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread))) + return hr; pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e88d3c2964e1..b1da9e9c0e20 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; device->adapter_luid = create_info->adapter_luid; @@ -3223,6 +3222,28 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, return hr; } +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->join_thread) + { + if (FAILED(hr = instance->join_thread(thread->handle))) + ERR("Failed to join thread, hr %#x.\n", hr); + } + else + { + if ((rc = pthread_join(thread->pthread, NULL))) + { + ERR("Failed to join thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fbf6925098e..4118d5d170e0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -149,6 +149,7 @@ union vkd3d_thread_handle HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; struct vkd3d_fence_worker { @@ -1019,8 +1020,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_join_thread join_thread; - IUnknown *parent; LUID adapter_luid; -- 2.21.0

2 1

[PATCH vkd3d 10/12] tests: Prefer uint64_t to UINT64.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 90 ++++++++++++++++++++--------------------- tests/d3d12_crosstest.h | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 358e78486ad8..903c42396b60 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -224,8 +224,8 @@ static void upload_texture_data_(unsigned int line, ID3D12Resource *texture, { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts; + uint64_t *row_sizes, required_size; D3D12_RESOURCE_DESC resource_desc; - UINT64 *row_sizes, required_size; ID3D12Resource *upload_buffer; D3D12_MEMCPY_DEST dst_data; ID3D12Device *device; @@ -388,9 +388,9 @@ static uint16_t get_readback_uint16(struct resource_readback *rb, unsigned int x return *(uint16_t *)get_readback_data(rb, x, y, 0, sizeof(uint16_t)); } -static UINT64 get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y) +static uint64_t get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(UINT64 *)get_readback_data(rb, x, y, 0, sizeof(UINT64)); + return *(uint64_t *)get_readback_data(rb, x, y, 0, sizeof(uint64_t)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) @@ -1900,7 +1900,7 @@ static void test_create_heap(void) static const struct { - UINT64 alignment; + uint64_t alignment; HRESULT expected_hr; } tests[] = @@ -2887,7 +2887,7 @@ static void test_create_fence(void) ID3D12Device *device, *tmp_device; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3491,7 +3491,7 @@ static void test_cpu_signal_fence(void) unsigned int i, ret; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3626,7 +3626,7 @@ static void test_cpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1); ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); - hr = ID3D12Fence_SetEventOnCompletion(fence, ~(UINT64)0, event2); + hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2); ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_Signal(fence, 50); @@ -3673,7 +3673,7 @@ static void test_cpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - hr = ID3D12Fence_Signal(fence, ~(UINT64)0); + hr = ID3D12Fence_Signal(fence, ~(uint64_t)0); ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3682,7 +3682,7 @@ static void test_cpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - hr = ID3D12Fence_Signal(fence, ~(UINT64)0); + hr = ID3D12Fence_Signal(fence, ~(uint64_t)0); ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3761,7 +3761,7 @@ static void test_gpu_signal_fence(void) unsigned int i, ret; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3869,7 +3869,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1); ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); - hr = ID3D12Fence_SetEventOnCompletion(fence, ~(UINT64)0, event2); + hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2); ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); queue_signal(queue, fence, 50); @@ -3916,7 +3916,7 @@ static void test_gpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - queue_signal(queue, fence, ~(UINT64)0); + queue_signal(queue, fence, ~(uint64_t)0); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3925,7 +3925,7 @@ static void test_gpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - queue_signal(queue, fence, ~(UINT64)0); + queue_signal(queue, fence, ~(uint64_t)0); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3980,7 +3980,7 @@ struct multithread_fence_wait_data { HANDLE event; ID3D12Fence *fence; - UINT64 value; + uint64_t value; }; static void fence_event_wait_main(void *untyped_data) @@ -4092,8 +4092,8 @@ static void test_multithread_fence_wait(void) static void test_fence_values(void) { + uint64_t value, next_value; ID3D12CommandQueue *queue; - UINT64 value, next_value; ID3D12Device *device; ID3D12Fence *fence; ULONG refcount; @@ -17668,12 +17668,12 @@ static void test_null_vbv(void) #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, - unsigned int sub_resource_idx, unsigned int sub_resource_count, UINT64 base_offset, + unsigned int sub_resource_idx, unsigned int sub_resource_count, uint64_t base_offset, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, const UINT *row_counts, - const UINT64 *row_sizes, UINT64 *total_size) + const uint64_t *row_sizes, uint64_t *total_size) { unsigned int miplevel, width, height, depth, row_count, row_size, row_pitch; - UINT64 offset, size, total; + uint64_t offset, size, total; unsigned int i; offset = total = 0; @@ -17722,8 +17722,8 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D static void test_get_copyable_footprints(void) { D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[10]; + uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; - UINT64 row_sizes[10], total_size; unsigned int sub_resource_count; unsigned int i, j, k, l; ID3D12Device *device; @@ -17779,9 +17779,9 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, }; - static const UINT64 base_offsets[] = + static const uint64_t base_offsets[] = { - 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(UINT64)0, + 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(uint64_t)0, }; static const struct { @@ -17953,7 +17953,7 @@ static void test_get_copyable_footprints(void) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[j]; - ok(l->Offset == ~(UINT64)0, "Got offset %"PRIu64".\n", l->Offset); + ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); @@ -17961,10 +17961,10 @@ static void test_get_copyable_footprints(void) ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); - ok(row_sizes[j] == ~(UINT64)0, "Got row size %"PRIu64".\n", row_sizes[j]); + ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); } - ok(total_size == ~(UINT64)0, "Got total size %"PRIu64".\n", total_size); + ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); } refcount = ID3D12Device_Release(device); @@ -21662,7 +21662,7 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + uint64_t timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC heap_desc; struct test_context_desc desc; @@ -21703,7 +21703,7 @@ static void test_query_timestamp(void) ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, - D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(uint64_t)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -21718,7 +21718,7 @@ static void test_query_timestamp(void) "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); } - time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; + time_diff = (uint64_t)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " @@ -21784,9 +21784,9 @@ static void test_query_pipeline_statistics(void) get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(UINT64); ++i) + for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(uint64_t); ++i) { - UINT64 value = get_readback_uint64(&rb, i, 0); + uint64_t value = get_readback_uint64(&rb, i, 0); ok(!value, "Element %d: Got %"PRIu64", expected 0.\n", i, value); } @@ -21914,7 +21914,7 @@ static void test_query_occlusion(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); - resource = create_readback_buffer(device, ARRAY_SIZE(tests) * sizeof(UINT64)); + resource = create_readback_buffer(device, ARRAY_SIZE(tests) * sizeof(uint64_t)); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21940,7 +21940,7 @@ static void test_query_occlusion(void) ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, tests[i].type, i); ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, tests[i].type, i, 1, - resource, i * sizeof(UINT64)); + resource, i * sizeof(uint64_t)); } vkd3d_test_set_context(NULL); @@ -21948,8 +21948,8 @@ static void test_query_occlusion(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { const bool samples_passed = tests[i].draw && tests[i].clear_depth > tests[i].depth; - const UINT64 result = get_readback_uint64(&rb, i, 0); - UINT64 expected_result; + const uint64_t result = get_readback_uint64(&rb, i, 0); + uint64_t expected_result; if (tests[i].type == D3D12_QUERY_TYPE_BINARY_OCCLUSION) expected_result = samples_passed ? 1 : 0; @@ -21969,7 +21969,7 @@ static void test_query_occlusion(void) static void test_resolve_non_issued_query_data(void) { - static const UINT64 initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef}; + static const uint64_t initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef}; ID3D12Resource *readback_buffer, *upload_buffer; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC heap_desc; @@ -21979,7 +21979,7 @@ static void test_resolve_non_issued_query_data(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; - UINT64 *timestamps; + uint64_t *timestamps; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -22049,7 +22049,7 @@ static void test_resolve_query_data_in_different_command_list(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr); - readback_buffer = create_readback_buffer(device, readback_buffer_capacity * sizeof(UINT64)); + readback_buffer = create_readback_buffer(device, readback_buffer_capacity * sizeof(uint64_t)); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -22072,7 +22072,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (i = 0; i < readback_buffer_capacity / 2; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t)); } hr = ID3D12GraphicsCommandList_Close(command_list); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -22083,14 +22083,14 @@ static void test_resolve_query_data_in_different_command_list(void) for (; i < readback_buffer_capacity; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t)); } get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < readback_buffer_capacity; ++i) { - UINT64 expected_result = context.render_target_desc.Width * context.render_target_desc.Height; - UINT64 result = get_readback_uint64(&rb, i, 0); + uint64_t expected_result = context.render_target_desc.Width * context.render_target_desc.Height; + uint64_t result = get_readback_uint64(&rb, i, 0); ok(result == expected_result, "Got unexpected result %"PRIu64" at %u.\n", result, i); } @@ -22112,7 +22112,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; - UINT64 result; + uint64_t result; HRESULT hr; if (!init_test_context(&context, NULL)) @@ -22134,7 +22134,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr); - readback_buffer = create_readback_buffer(device, sizeof(UINT64)); + readback_buffer = create_readback_buffer(device, sizeof(uint64_t)); /* Read query results in the second command list. */ ID3D12GraphicsCommandList_ResolveQueryData(command_lists[1], @@ -27749,7 +27749,7 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; - UINT64 size; + uint64_t size; static const unsigned int alignments[] = { @@ -27823,7 +27823,7 @@ static void test_resource_allocation_info(void) } else { - ok(info.SizeInBytes == ~(UINT64)0, + ok(info.SizeInBytes == ~(uint64_t)0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(info.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); @@ -27868,7 +27868,7 @@ static void test_resource_allocation_info(void) } else { - ok(info.SizeInBytes == ~(UINT64)0, + ok(info.SizeInBytes == ~(uint64_t)0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 5df0b3225d1c..4a490628e483 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -198,7 +198,7 @@ static inline bool join_thread(HANDLE untyped_thread) } #endif -static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) +static HRESULT wait_for_fence(ID3D12Fence *fence, uint64_t value) { unsigned int ret; HANDLE event; -- 2.21.0

2 1

[PATCH vkd3d 08/12] vkd3d: Avoid allocating memory in d3d12_command_list_update_uav_counter_descriptors().
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cb7f0862de6c..f4ad829063dc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2721,11 +2721,11 @@ done: static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { + VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_pipeline_state *state = list->state; VkDevice vk_device = list->device->vk_device; - VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; unsigned int uav_counter_count; unsigned int i; @@ -2734,14 +2734,12 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); if (!vk_descriptor_set) return; - if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) - return; - for (i = 0; i < uav_counter_count; ++i) { const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; @@ -2762,7 +2760,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - vkd3d_free(vk_descriptor_writes); VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); -- 2.21.0

2 1

[PATCH vkd3d 09/12] vkd3d: Prefer uint64_t to UINT64.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/device.c | 10 +++++----- libs/vkd3d/resource.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f4ad829063dc..97cc7de1c59e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -944,7 +944,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, REFII static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - UINT64 completed_value; + uint64_t completed_value; int rc; TRACE("iface %p.\n", iface); @@ -1086,7 +1086,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * } HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) { struct d3d12_fence *object; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 870b88af8282..4df2462eed12 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2623,8 +2623,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; - UINT64 requested_alignment; - UINT64 estimated_size; + uint64_t requested_alignment; + uint64_t estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2694,7 +2694,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour return info; invalid: - info->SizeInBytes = ~(UINT64)0; + info->SizeInBytes = ~(uint64_t)0; /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ if (desc->SampleDesc.Count != 1) @@ -2890,7 +2890,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; const struct vkd3d_format *format; - UINT64 offset, size, total; + uint64_t offset, size, total; TRACE("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", " "layouts %p, row_counts %p, row_sizes %p, total_bytes %p.\n", @@ -2904,7 +2904,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (row_sizes) memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count); if (total_bytes) - *total_bytes = ~(UINT64)0; + *total_bytes = ~(uint64_t)0; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6bbd5afa2eea..d005fa8865aa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -265,7 +265,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) return impl_from_ID3D12Heap(iface); } -static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) +static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **data) { struct d3d12_device *device = heap->device; HRESULT hr = S_OK; @@ -1540,7 +1540,7 @@ allocate_memory: return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) { @@ -3036,7 +3036,7 @@ static D3D12_GPU_DESCRIPTOR_HANDLE * STDMETHODCALLTYPE d3d12_descriptor_heap_Get TRACE("iface %p, descriptor %p.\n", iface, descriptor); - descriptor->ptr = (UINT64)(intptr_t)heap->descriptors; + descriptor->ptr = (uint64_t)(intptr_t)heap->descriptors; return descriptor; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e01e00503081..9191ae258956 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -319,7 +319,7 @@ struct d3d12_fence }; HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; /* ID3D12Heap */ struct d3d12_heap @@ -371,7 +371,7 @@ struct d3d12_resource void *map_ptr; struct d3d12_heap *heap; - UINT64 heap_offset; + uint64_t heap_offset; D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; @@ -399,7 +399,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, -- 2.21.0

2 1

[PATCH vkd3d 07/12] vkd3d: Avoid allocating memory in d3d12_command_list_RSSetScissorRects().
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ec9e25d09489..cb7f0862de6c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3562,7 +3562,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); - assert(viewport_count <= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE); + if (viewport_count > ARRAY_SIZE(vk_viewports)) + { + FIXME("Viewport count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", viewport_count); + viewport_count = ARRAY_SIZE(vk_viewports); + } for (i = 0; i < viewport_count; ++i) { @@ -3588,16 +3592,16 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + VkRect2D vk_rects[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE]; const struct vkd3d_vk_device_procs *vk_procs; - struct VkRect2D *vk_rects; unsigned int i; TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (!(vk_rects = vkd3d_calloc(rect_count, sizeof(*vk_rects)))) + if (rect_count > ARRAY_SIZE(vk_rects)) { - ERR("Failed to allocate Vulkan scissor rects.\n"); - return; + FIXME("Rect count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", rect_count); + rect_count = ARRAY_SIZE(vk_rects); } for (i = 0; i < rect_count; ++i) @@ -3610,8 +3614,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic vk_procs = &list->device->vk_procs; VK_CALL(vkCmdSetScissor(list->vk_command_buffer, 0, rect_count, vk_rects)); - - free(vk_rects); } static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList1 *iface, -- 2.21.0

2 1

[PATCH vkd3d 05/12] tests: Add test for early depth-stencil test.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dea7a63c99d9..358e78486ad8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29966,6 +29966,159 @@ static void test_graphics_compute_queue_synchronization(void) destroy_test_context(&context); } +static void test_early_depth_stencil_tests(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + D3D12_DESCRIPTOR_RANGE descriptor_range; + D3D12_ROOT_PARAMETER root_parameter; + struct depth_stencil_resource ds; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<int> u; + + [earlydepthstencil] + void main() + { + InterlockedAdd(u[uint2(0, 0)], 1); + } +#endif + 0x43425844, 0xd8c9f845, 0xadb9dbe2, 0x4e8aea86, 0x80f0b053, 0x00000001, 0x0000009c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000048, 0x00000050, 0x00000012, 0x0100286a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00003333, 0x0a0000ad, 0x0011e000, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const UINT values[4] = {0}; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 0; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameter.DescriptorTable.NumDescriptorRanges = 1; + root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = &root_parameter; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + init_depth_stencil(&ds, context.device, 1, 1, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + set_rect(&context.scissor_rect, 0, 0, 1, 1); + + texture = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_SINT, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + set_viewport(&context.viewport, 0.0f, 0.0f, 1.0f, 100.0f, 0.5f, 0.5f); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), texture, values, 0, NULL); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.6f, 1); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(texture, 0, queue, command_list, 2, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.3f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.55f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(texture, 0, queue, command_list, 4, 1); + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_depth_stencil(&ds); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -30123,4 +30276,5 @@ START_TEST(d3d12) run_test(test_read_write_subresource); run_test(test_queue_wait); run_test(test_graphics_compute_queue_synchronization); + run_test(test_early_depth_stencil_tests); } -- 2.21.0

2 1

[PATCH vkd3d 04/12] vkd3d: Emit barriers in ClearUnorderedAccessViewUint().
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> We use transfer operations instead of unordered access. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 560b6971e29e..ec9e25d09489 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4618,6 +4618,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkBufferMemoryBarrier buffer_barrier; + VkImageMemoryBarrier image_barrier; + VkPipelineStageFlags stage_mask; VkImageSubresourceRange range; VkClearColorValue color; @@ -4650,6 +4653,22 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); + + buffer_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + buffer_barrier.pNext = NULL; + buffer_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + buffer_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + buffer_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + buffer_barrier.buffer = resource_impl->u.vk_buffer; + buffer_barrier.offset = cpu_descriptor->uav.buffer.offset; + buffer_barrier.size = cpu_descriptor->uav.buffer.size; + + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + resource_impl, list->vk_queue_flags, &buffer_barrier.dstAccessMask, &stage_mask, NULL); + + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, + 0, NULL, 1, &buffer_barrier, 0, NULL)); } else { @@ -4666,6 +4685,23 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + + image_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + image_barrier.pNext = NULL; + image_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + image_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + image_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + image_barrier.image = resource_impl->u.vk_image; + image_barrier.subresourceRange = range; + + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + resource_impl, list->vk_queue_flags, &image_barrier.dstAccessMask, &stage_mask, NULL); + + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, + 0, NULL, 0, NULL, 1, &image_barrier)); } } -- 2.21.0

2 1

[PATCH vkd3d 03/12] tests: Add more tests for UNKNOWN format DSV.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3c1eec59857e..dea7a63c99d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5131,7 +5131,7 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); - set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.5f); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -5152,7 +5152,7 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -5164,7 +5164,43 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); - set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.6f); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + + /* DSVFormat = DXGI_FORMAT_UNKNOWN and depth write */ + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -5172,6 +5208,11 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 1.0f, 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH vkd3d 01/12] vkd3d: Fix unbinding depth-stencil views.
by Józef Kucia 11 Jun '19

11 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f66bbe90da40..0cbf0fb410ce 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4373,6 +4373,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + list->dsv = VK_NULL_HANDLE; + list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) { if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)) @@ -4397,8 +4399,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi else { WARN("DSV descriptor is not initialized.\n"); - list->dsv = VK_NULL_HANDLE; - list->dsv_format = VK_FORMAT_UNDEFINED; } } -- 2.21.0

2 1

[PATCH v2 1/4] winex11.drv: Print the FocusIn/FocusOut mode in trace message
by Rémi Bernon 11 Jun '19

11 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5c465aa0335..edeae7caff0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -749,6 +749,14 @@ static const char * const focus_details[] = "NotifyDetailNone" }; +static const char * const focus_modes[] = +{ + "NotifyNormal", + "NotifyGrab", + "NotifyUngrab", + "NotifyWhileGrabbed" +}; + /********************************************************************** * X11DRV_FocusIn */ @@ -759,7 +767,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!hwnd) return FALSE; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; @@ -839,7 +847,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) { -- 2.20.1

1 3

[PATCH 1/3] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura 11 Jun '19

11 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c66d46..c3d3b770b5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.20.1

2 4

[PATCH v2 resend 1/3] dxgi/tests: Add IDXGIOutput ownership tests.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Mostly to show that TakeOwnership and ReleaseOwnership are based on VidPN ownership. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 226 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 225 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..765b174af6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -17,11 +17,15 @@ */ #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #define COBJMACROS #include "initguid.h" #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/heap.h" #include "wine/test.h" @@ -36,6 +40,10 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); +static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -43,6 +51,9 @@ static unsigned int use_adapter_idx; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; +static const DWORD wait_timeout = 1000; +static const DWORD wait_step = 100; + static struct test_entry { void (*test)(void); @@ -113,6 +124,24 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +/* This is to get a result from a function that returns different result if called too early */ +#define wait_result(a, b, c, d) wait_result_(__LINE__, a, b, c, d) +#define wait_result_(line, func, arg, expected, todo) \ + do \ + { \ + DWORD total_time = 0; \ + typeof(expected) got; \ + do \ + { \ + got = func(arg); \ + if (got == expected) \ + break; \ + Sleep(wait_step); \ + total_time += wait_step; \ + } while (total_time < wait_timeout); \ + todo_wine_if(todo) ok_(__FILE__, line)(got == expected, "Expect %#x, got %#x.\n", expected, got); \ + } while (0) + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -4985,6 +5014,194 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_output_ownership(IUnknown *device, BOOL is_d3d12) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_ownership_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; + ID3D12Device *d3d12_device; + IDXGISwapChain *swapchain; + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + BOOL fullscreen; + NTSTATUS status; + ULONG refcount; + LUID luid; + HRESULT hr; + + if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + return; + } + + get_factory(device, is_d3d12, &factory); + + if (is_d3d12) + { + hr = ID3D12CommandQueue_GetDevice((ID3D12CommandQueue *)device, &IID_ID3D12Device, (void **)&d3d12_device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + luid = ID3D12Device_GetAdapterLuid(d3d12_device); + ID3D12Device_Release(d3d12_device); + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); + if (hr == E_NOINTERFACE) + { + skip("DXGI 1.4 unsupported.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Wine doesn't support IDXGIFactory4_EnumAdapterByLuid.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + hr = IDXGIDevice_GetAdapter((IDXGIDevice *)device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + IDXGIAdapter_Release(adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + lstrcpyW(open_adapter_gdi_desc.DeviceName, output_desc.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_SUCCESS, FALSE); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + /* Swapchain in fullscreen mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. DXGI_ERROR_UNSUPPORTED on Win 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Failed to change fullscreen state.\n"); + goto done; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen state.\n"); + if (is_d3d12) + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_SUCCESS, FALSE); + else + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + /* Calling IDXGIOutput_ReleaseOwnership makes it unoccluded. So we can be confident about IDXGIOutput_TakeOwnership + * was called in IDXGISwapChain_SetFullscreenState */ + IDXGIOutput_ReleaseOwnership(output); + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_SUCCESS, FALSE); + + /* IDXGIOutput_TakeOwnership always return E_NOINTERFACE for d3d12. Tests finished */ + if (is_d3d12) + goto done; + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* The following results shows that IDXGIOutput_TakeOwnership(output, device, TRUE) is used in + * SetFullscreenState(swapchain, TRUE, NULL) + * + * This make me believe the MSDN documentation is saying the opposite about the last parameter, + * " + * HRESULT TakeOwnership(IUnknown *pDevice, BOOL Exclusive); + * Name: Exclusive Type: BOOL + * Set to TRUE to enable other threads or applications to take ownership of the device; otherwise, set to FALSE. + * " + * + * Reasons: + * 1. The parameter name is called 'Exclusive' + * 2. D3DKMTSetVidPnSourceOwner(D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE) makes D3DKMTCheckVidPnExclusiveOwnership return + * STATUS_GRAPHICS_PRESENT_OCCLUDED. And D3DKMTSetVidPnSourceOwner(D3DKMT_VIDPNSOURCEOWNER_SHARED) makes + * D3DKMTCheckVidPnExclusiveOwnership return STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE. So the opposite mapping of + * what MSDN is saying is consistent with the tests. + */ + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_ReleaseOwnership(output); + + /* Swapchain in windowed mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Unexpected fullscreen state.\n"); + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_SUCCESS, FALSE); + + hr = IDXGIOutput_TakeOwnership(output, device, FALSE); + todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_TakeOwnership(output, device, TRUE); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + IDXGIOutput_ReleaseOwnership(output); + wait_result(pD3DKMTCheckVidPnExclusiveOwnership, &check_ownership_desc, STATUS_SUCCESS, FALSE); + +done: + IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + wait_device_idle(device); + + IDXGIOutput_Release(output); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5028,7 +5245,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module; + HMODULE dxgi_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -5038,6 +5255,11 @@ START_TEST(dxgi) pCreateDXGIFactory1 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory1"); pCreateDXGIFactory2 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory2"); + gdi32_module = GetModuleHandleA("gdi32.dll"); + pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32_module, "D3DKMTCheckVidPnExclusiveOwnership"); + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); @@ -5088,6 +5310,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); + run_on_d3d10(test_output_ownership); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -5108,6 +5331,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); + run_on_d3d12(test_output_ownership); FreeLibrary(d3d12_module); } -- 2.20.1

2 3

[PATCH] winebus.sys: Close SDL handles when a device is removed
by Andrew Eikum 11 Jun '19

11 Jun '19

This fixes opening SDL haptic handles after a device is removed and re-added. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1a938aa1313..d24e21cff83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -75,6 +75,7 @@ static void *sdl_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); MAKE_FUNCPTR(SDL_Init); +MAKE_FUNCPTR(SDL_JoystickClose); MAKE_FUNCPTR(SDL_JoystickEventState); MAKE_FUNCPTR(SDL_JoystickGetGUID); MAKE_FUNCPTR(SDL_JoystickGetGUIDString); @@ -89,6 +90,7 @@ MAKE_FUNCPTR(SDL_JoystickNumHats); MAKE_FUNCPTR(SDL_JoystickGetAxis); MAKE_FUNCPTR(SDL_JoystickGetHat); MAKE_FUNCPTR(SDL_IsGameController); +MAKE_FUNCPTR(SDL_GameControllerClose); MAKE_FUNCPTR(SDL_GameControllerGetAxis); MAKE_FUNCPTR(SDL_GameControllerGetButton); MAKE_FUNCPTR(SDL_GameControllerName); @@ -879,13 +881,28 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) static void try_remove_device(SDL_JoystickID index) { DEVICE_OBJECT *device = NULL; + struct platform_private *private; + SDL_Joystick *sdl_joystick; + SDL_GameController *sdl_controller; + SDL_Haptic *sdl_haptic; device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); if (!device) return; + private = impl_from_DEVICE_OBJECT(device); + sdl_joystick = private->sdl_joystick; + sdl_controller = private->sdl_controller; + sdl_haptic = private->sdl_haptic; + IoInvalidateDeviceRelations(device, RemovalRelations); bus_remove_hid_device(device); + + pSDL_JoystickClose(sdl_joystick); + if (sdl_controller) + pSDL_GameControllerClose(sdl_controller); + if (sdl_haptic) + pSDL_HapticClose(sdl_haptic); } static void try_add_device(SDL_JoystickID index) @@ -1085,6 +1102,7 @@ NTSTATUS sdl_driver_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(sdl_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(SDL_GetError); LOAD_FUNCPTR(SDL_Init); + LOAD_FUNCPTR(SDL_JoystickClose); LOAD_FUNCPTR(SDL_JoystickEventState); LOAD_FUNCPTR(SDL_JoystickGetGUID); LOAD_FUNCPTR(SDL_JoystickGetGUIDString); @@ -1099,6 +1117,7 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_JoystickGetAxis); LOAD_FUNCPTR(SDL_JoystickGetHat); LOAD_FUNCPTR(SDL_IsGameController); + LOAD_FUNCPTR(SDL_GameControllerClose); LOAD_FUNCPTR(SDL_GameControllerGetAxis); LOAD_FUNCPTR(SDL_GameControllerGetButton); LOAD_FUNCPTR(SDL_GameControllerName); -- 2.22.0

1 0

[PATCH 1/5] qedit/samplegrabber: Use BaseFilterImpl_QueryVendorInfo().
by Zebediah Figura 11 Jun '19

11 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Native does not implement QueryVendorInfo(); we have no reason to do so ourselves. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/samplegrabber.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 517c7fe77bb..b53d4d8c7e9 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; @@ -420,19 +419,6 @@ SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *grap return S_OK; } -/* IBaseFilter */ -static HRESULT WINAPI -SampleGrabber_IBaseFilter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *vendor) -{ - TRACE("(%p)\n", vendor); - if (!vendor) - return E_POINTER; - *vendor = CoTaskMemAlloc(sizeof(vendor_name)); - CopyMemory(*vendor, vendor_name, sizeof(vendor_name)); - return S_OK; -} - - /* SampleGrabber implementation of ISampleGrabber interface */ /* IUnknown */ @@ -1061,7 +1047,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable = BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, SampleGrabber_IBaseFilter_JoinFilterGraph, - SampleGrabber_IBaseFilter_QueryVendorInfo, + BaseFilterImpl_QueryVendorInfo, }; static const ISampleGrabberVtbl ISampleGrabber_VTable = -- 2.20.1

2 5

[PATCH v2 resend 2/3] dxgi/tests: Add more IDXGISwapChain_Present tests.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 167 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 765b174af6..216f03eed8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3992,9 +3992,13 @@ static void test_swapchain_parameters(void) static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { + static const DWORD flags[] = {0, DXGI_PRESENT_TEST}; + static const DWORD timeout = 2000; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; + IDXGIOutput *output; + BOOL fullscreen; unsigned int i; ULONG refcount; HRESULT hr; @@ -4029,6 +4033,169 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + HWND occluding_hwnd = CreateWindowA("static", "occluding_window", WS_POPUP | WS_VISIBLE, 0, 0, 400, 200, 0, 0, 0, 0); + + /* Another window covers the swapchain window, doesn't report as occluded */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Minimized window */ + ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); + + /* Hidden window */ + ShowWindow(swapchain_desc.OutputWindow, SW_HIDE); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ShowWindow(swapchain_desc.OutputWindow, SW_SHOW); + DestroyWindow(occluding_hwnd); + + /* Test IDXGIOutput_ReleaseOwnership makes the swapchain exit fullscreen */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + /* DXGI_ERROR_NOT_CURRENTLY_AVAILABLE on some machines. DXGI_ERROR_UNSUPPORTED on Win 7 testbot. */ + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED)) + { + skip("Could not change fullscreen state.\n"); + continue; + } + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + output = NULL; + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + todo_wine_if(is_d3d12) ok(output != NULL, "Expect output not null.\n"); + + if (output) IDXGIOutput_ReleaseOwnership(output); + /* Still in fullscreen */ + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + /* Now calling IDXGISwapChain_Present will exit the fullscreen */ + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Now fullscreen mode is exited */ + if (flags[i] == 0 && !is_d3d12) + { + /* Still on fullscreen on vista and 2008 */ + todo_wine ok(!fullscreen || broken(fullscreen), "Unexpected fullscreen status.\n"); + } + else + ok(fullscreen, "Unexpected fullscreen status.\n"); + if (output) IDXGIOutput_Release(output); + + + /* Test creating a window when swapchain is in fullscreen. + * The window should break the swapchain out of fullscreen mode on d3d10/11. + * d3d12 is different, new occluding window doesn't break swapchain out of fullscreen because d3d12 swapchain + * fullscreen mode doesn't take exclusive ownership over output, nor does it disable compositing. + * d3d12 fullscreen mode acts just like borderless fullscreen window mode */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + occluding_hwnd = CreateWindowA("static", "occluding_window", WS_POPUP, 0, 0, 400, 200, 0, 0, 0, 0); + /* Invisible window doesn't cause fullscreen mode to exit */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = FALSE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(fullscreen, "Unexpected fullscreen status.\n"); + /* Visible but with bottom z-order window still cause fullscreen mode to exit */ + SetWindowPos(occluding_hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + ShowWindow(occluding_hwnd, SW_SHOW); + /* Fullscreen mode takes a while to exit */ + Sleep(timeout); + + /* No longer fullscreen before calling IDXGISwapChain_Present except for d3d12 */ + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Unexpected fullscreen status.\n"); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Got unexpected hr %#x.\n", hr); + + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (flags[i] == DXGI_PRESENT_TEST) + todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Unexpected fullscreen status.\n"); + else + todo_wine ok(!fullscreen, "Unexpected fullscreen status.\n"); + + /* Even though d3d12 doesn't exit fullscreen, a IDXGISwapChain_ResizeBuffers is still needed for subsequent + * IDXGISwapChain_Present calls to work, otherwise they will return DXGI_ERROR_INVALID_CALL */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Got unexpected hr %#x.\n", hr); + else + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + + /* Trying break out of fullscreen mode again. This time, don't call IDXGISwapChain_GetFullscreenState before + * IDXGISwapChain_Present */ + ShowWindow(occluding_hwnd, SW_HIDE); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ShowWindow(occluding_hwnd, SW_SHOW); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + /* hr == S_OK on vista and 2008 */ + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + if (flags[i] == DXGI_PRESENT_TEST) + { + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + /* IDXGISwapChain_Present without flags refresh the occlusion state */ + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + fullscreen = TRUE; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!fullscreen, "Unexpected fullscreen status.\n"); + + DestroyWindow(occluding_hwnd); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); + } + wait_device_idle(device); IDXGISwapChain_Release(swapchain); -- 2.20.1

3 2

[PATCH 1/5] mfplat: Add MFRegisterLocalByteStreamHandler().
by Nikolay Sivov 11 Jun '19

11 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 75 +++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 15 ++++++++ 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4082f9e2ac..b0db0db922 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -48,13 +48,22 @@ static LONG platform_lock; struct local_handler { struct list entry; - WCHAR *scheme; + union + { + WCHAR *scheme; + struct + { + WCHAR *extension; + WCHAR *mime; + } bytestream; + } u; IMFActivate *activate; }; static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); +static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); struct system_clock { @@ -7154,21 +7163,25 @@ static const IMFAsyncCallbackVtbl async_create_file_callback_vtbl = async_create_file_callback_Invoke, }; -static WCHAR *heap_strdupW(const WCHAR *str) +static HRESULT heap_strdupW(const WCHAR *str, WCHAR **dest) { - WCHAR *ret = NULL; + HRESULT hr = S_OK; if (str) { unsigned int size; size = (strlenW(str) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); - if (ret) - memcpy(ret, str, size); + *dest = heap_alloc(size); + if (*dest) + memcpy(*dest, str, size); + else + hr = E_OUTOFMEMORY; } + else + *dest = NULL; - return ret; + return hr; } /*********************************************************************** @@ -7202,12 +7215,8 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD async->access_mode = access_mode; async->open_mode = open_mode; async->flags = flags; - async->path = heap_strdupW(path); - if (!async->path) - { - hr = E_OUTOFMEMORY; + if (FAILED(hr = heap_strdupW(path, &async->path))) goto failed; - } hr = MFCreateAsyncResult(NULL, &async->IMFAsyncCallback_iface, (IUnknown *)caller, &item); if (FAILED(hr)) @@ -7301,6 +7310,7 @@ HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie) HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *activate) { struct local_handler *handler; + HRESULT hr; TRACE("%s, %p.\n", debugstr_w(scheme), activate); @@ -7310,10 +7320,10 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac if (!(handler = heap_alloc(sizeof(*handler)))) return E_OUTOFMEMORY; - if (!(handler->scheme = heap_strdupW(scheme))) + if (FAILED(hr = heap_strdupW(scheme, &handler->u.scheme))) { heap_free(handler); - return E_OUTOFMEMORY; + return hr; } handler->activate = activate; IMFActivate_AddRef(handler->activate); @@ -7324,3 +7334,40 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac return S_OK; } + +/*********************************************************************** + * MFRegisterLocalByteStreamHandler (mfplat.@) + */ +HRESULT WINAPI MFRegisterLocalByteStreamHandler(const WCHAR *extension, const WCHAR *mime, IMFActivate *activate) +{ + struct local_handler *handler; + HRESULT hr; + + TRACE("%s, %s, %p.\n", debugstr_w(extension), debugstr_w(mime), activate); + + if ((!extension && !mime) || !activate) + return E_INVALIDARG; + + if (!(handler = heap_alloc_zero(sizeof(*handler)))) + return E_OUTOFMEMORY; + + hr = heap_strdupW(extension, &handler->u.bytestream.extension); + if (SUCCEEDED(hr)) + hr = heap_strdupW(mime, &handler->u.bytestream.mime); + + if (FAILED(hr)) + goto failed; + + EnterCriticalSection(&local_handlers_section); + list_add_head(&local_bytestream_handlers, &handler->entry); + LeaveCriticalSection(&local_handlers_section); + + return hr; + +failed: + heap_free(handler->u.bytestream.extension); + heap_free(handler->u.bytestream.mime); + heap_free(handler); + + return hr; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2dfa92f202..1ae0927f51 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -128,6 +128,7 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stdcall MFPutWorkItemEx2(long long ptr) @ stub MFRecordError +@ stdcall MFRegisterLocalByteStreamHandler(wstr wstr ptr) @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ab651c54f2..e63efc154b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3591,6 +3591,21 @@ static void test_local_handlers(void) hr = pMFRegisterLocalSchemeHandler(localW, &local_activate); ok(hr == S_OK, "Failed to register scheme handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, &local_activate); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, NULL, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); } START_TEST(mfplat) -- 2.20.1

2 5

[PATCH v9 7/7] user32: Implement EnumDisplayDevicesW().
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 202 +++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 +- 2 files changed, 205 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 355457098d..5f26cf9af3 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -29,9 +29,13 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "winnls.h" #include "winternl.h" #include "controls.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -39,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR default_monitor_name[] = {'\\','\\','.','\\', @@ -66,6 +73,36 @@ static const WCHAR default_monitor_interface_id[] = '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR monitor_fmtW[] = + {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR video_keyW[] = + {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR video_value_fmtW[] = + {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; +static const WCHAR guid_devinterface_monitorW[] = + {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR nt_classW[] = + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -309,11 +346,174 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + /* Find adapter */ + if (!lpDevice) + { + sprintfW(key_nameW, video_value_fmtW, i); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); + + /* Strip \Registry\Machine\ */ + lstrcpyW(key_nameW, bufferW + 18); + + /* DeviceString */ + size = sizeof(lpDisplayDevice->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, + lpDisplayDevice->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(lpDisplayDevice->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, + &lpDisplayDevice->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) + return FALSE; + + adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); + sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); + + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW(key_nameW, bufferW + 18); + sprintfW(bufferW, mointor_id_value_fmtW, i); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)lpDisplayDevice->DeviceString, + sizeof(lpDisplayDevice->DeviceString), NULL)) + goto done; + + /* DeviceKey */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); + lstrcatW(lpDisplayDevice->DeviceKey, bufferW); + } + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); + lstrcatW(lpDisplayDevice->DeviceID, instanceW); + lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); + /* Replace '\\' with '#' after prefix */ + for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + lstrcatW(lpDisplayDevice->DeviceID, backslashW); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcatW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList(set); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ if (i) return FALSE; + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) + { + RegCloseKey(hkey); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + /* Adapter */ if (!lpDevice) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e3e1f38d66..26ee28a122 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else @@ -208,9 +208,9 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceKey */ lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); - todo_wine ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); - todo_wine ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); } static void test_enumdisplaydevices(void) -- 2.20.1

2 1

[PATCH v9 6/7] user32: Improve EnumDisplayDevicesW stub.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 74 +++++++++++++++++++++++++++++-------- dlls/user32/tests/monitor.c | 18 ++++----- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a03d70dde..355457098d 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -39,6 +39,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR default_monitor_name[] = + {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR default_monitor_string[] = + {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR default_adapter_id[] = + {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR default_monitor_id[] = + {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR default_monitor_interface_id[] = + {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -243,12 +270,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -293,16 +314,39 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lp if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + /* Adapter */ + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); + memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(default_adapter_name, lpDevice)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); + else + memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); + } + } - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bee1085a14..e3e1f38d66 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ @@ -201,9 +201,9 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */ @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

2 1

[PATCH v9 5/7] winex11.drv: Handle display device changes.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbdcb3..a0495c44b1 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a85925d1f1..93eacf6110 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -339,7 +339,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -366,7 +366,7 @@ void X11DRV_DisplayDevices_Init(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("via %s\n", wine_dbgstr_a(handler.name)); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f8f28f0e0b..ba473c3fc5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -736,7 +736,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 69478741f1..21807af3f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(FALSE); return TRUE; } -- 2.20.1

2 1

[PATCH v9 4/7] winex11.drv: Initialize monitor registry data.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 95 +++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 18 +++++++ dlls/winex11.drv/xinerama.c | 51 ++++++++++++++++++++ 3 files changed, 159 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 4502c6b2b1..a85925d1f1 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,10 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -84,6 +88,13 @@ static const WCHAR nt_classW[] = { 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'C','l','a','s','s','\\',0}; +static const WCHAR monitor_instance_fmtW[] = { + 'D','I','S','P','L','A','Y','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '%','0','4','X','&','%','0','4','X',0}; +static const WCHAR monitor_hardware_idW[] = { + 'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; @@ -169,7 +180,7 @@ done: return ret; } -static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, INT monitor_count, const struct x11drv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) { @@ -179,6 +190,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, HKEY hkey = NULL; BOOL ret = FALSE; LSTATUS ls; + INT i; sprintfW(key_nameW, device_video_fmtW, video_index); lstrcpyW(bufferW, machine_prefixW); @@ -213,6 +225,15 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + /* Write all monitor instances paths under this adapter */ + for (i = 0; i < monitor_count; i++) + { + sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(bufferW, monitor_instance_fmtW, video_index, i); + if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -226,6 +247,43 @@ done: return ret; } +static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, + int video_index) +{ + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + WCHAR bufferW[MAX_PATH]; + HKEY hkey; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, monitor->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto done; + + /* Write HaredwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto done; + + /* Create driver key */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + RegCloseKey(hkey); + + /* FIXME: + * Following properties are Wine specific, see comments in X11DRV_InitAdapter for details */ + /* StateFlags */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, + (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) + goto done; + + ret = TRUE; +done: + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; @@ -233,6 +291,15 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Clean up old adapter keys for reinitialization */ RegDeleteTreeW(video_hkey, NULL); @@ -241,6 +308,7 @@ static void prepare_devices(HKEY video_hkey) * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain * the same GUID for the same GPU. */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -277,9 +345,10 @@ void X11DRV_DisplayDevices_Init(void) HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct x11drv_monitor *monitors = NULL; + INT gpu_count, adapter_count, monitor_count; + INT gpu, adapter, monitor; + HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -305,6 +374,7 @@ void X11DRV_DisplayDevices_Init(void) prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) @@ -321,10 +391,22 @@ void X11DRV_DisplayDevices_Init(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + goto done; + + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto done; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto done; + } + + handler.pFreeMonitors(monitors); + monitors = NULL; video_index++; } @@ -334,6 +416,7 @@ void X11DRV_DisplayDevices_Init(void) done: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); ReleaseMutex(mutex); @@ -342,4 +425,6 @@ done: handler.pFreeGpus(gpus); if (adapters) handler.pFreeAdapters(adapters); + if (monitors) + handler.pFreeMonitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5d99d69eff..f8f28f0e0b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,15 @@ struct x11drv_adapter DWORD state_flags; }; +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -710,11 +719,20 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 8b0ee51f7e..fde2e189f6 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -291,6 +291,55 @@ static void xinerama_free_adapters( struct x11drv_adapter *adapters ) heap_free( adapters ); } +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + { + lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -331,8 +380,10 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; handler.pFreeGpus = xinerama_free_gpus; handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

2 1

[PATCH v9 3/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 4 +- dlls/winex11.drv/display.c | 128 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 18 +++++ dlls/winex11.drv/xinerama.c | 69 +++++++++++++++++++ 4 files changed, 210 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0a097cc85c..bee1085a14 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -113,9 +113,9 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de memset(video_value, 0, sizeof(video_value)); size = sizeof(video_value); ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); - todo_wine ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6ff5828b3a..4502c6b2b1 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; @@ -61,6 +64,26 @@ static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'V','I','D','E','O',0}; +static const WCHAR adapter_key_fmtW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '%','s','\\', + '%','0','4','x',0}; +static const WCHAR device_video_fmtW[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR machine_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; static struct x11drv_display_device_handler handler; @@ -73,8 +96,9 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } -/* Initialize a GPU instance */ -static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, + WCHAR *driver) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -116,6 +140,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; RegCloseKey(hkey); + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto done; + lstrcpyW(driver, nt_classW); + lstrcatW(driver, bufferW); + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); @@ -128,6 +159,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; } + lstrcpyW(guid_string, bufferW); ret = TRUE; done: @@ -137,13 +169,73 @@ done: return ret; } -static void prepare_devices(void) +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, + const struct x11drv_gpu *gpu, const WCHAR *guid_string, + const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) +{ + WCHAR adapter_keyW[MAX_PATH]; + WCHAR key_nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + BOOL ret = FALSE; + LSTATUS ls; + + sprintfW(key_nameW, device_video_fmtW, video_index); + lstrcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + lstrcatW(bufferW, adapter_keyW); + + /* Write value of \Device\Video? (adapter key) in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW(video_hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* Create HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} link to GPU driver */ + ls = RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (ls == ERROR_ALREADY_EXISTS) + RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (RegSetValueExW(hkey, symbolic_link_valueW, 0, REG_LINK, (const BYTE *)gpu_driver, + strlenW(gpu_driver) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information are Wine specific, they don't really exist on Windows. They are used so that we can + * implement EnumDisplayDevices etc by querying registry only. These information are most likely reported by the + * device driver on Windows */ + RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + + /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match + * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto done; + + ret = TRUE; +done: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + +static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; HDEVINFO devinfo; DWORD i = 0; + /* Clean up old adapter keys for reinitialization */ + RegDeleteTreeW(video_hkey, NULL); + /* FIXME: * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result @@ -184,11 +276,15 @@ void X11DRV_DisplayDevices_Init(void) static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct x11drv_adapter *adapters = NULL; + INT gpu_count, adapter_count; + INT gpu, adapter; HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; + INT video_index = 0; DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -206,7 +302,7 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); - prepare_devices(); + prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); @@ -216,8 +312,24 @@ void X11DRV_DisplayDevices_Init(void) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto done; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto done; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } done: @@ -228,4 +340,6 @@ done: CloseHandle(mutex); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e50158d282..5d99d69eff 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -681,6 +681,15 @@ struct x11drv_gpu UINT revision_id; }; +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -695,8 +704,17 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 900cfd91db..8b0ee51f7e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -224,6 +224,73 @@ static void xinerama_free_gpus( struct x11drv_gpu *gpus ) heap_free( gpus ); } +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + INT primary_index; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + primary_index = primary_monitor; + if (primary_index >= nb_monitors) + primary_index = 0; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + if (i == primary_index) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + /* Primary adapter has to be first */ + if (primary_index) + { + struct x11drv_adapter tmp; + tmp = adapters[primary_index]; + adapters[primary_index] = adapters[0]; + adapters[0] = tmp; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -263,7 +330,9 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

2 1

[PATCH v9 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 154 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++ dlls/winex11.drv/xinerama.c | 25 ++++++ 4 files changed, 202 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index e3e4dce84d..6ff5828b3a 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,37 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,10 +73,120 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +/* Initialize a GPU instance */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto done; + } + + /* Write HaredwareID registry property, REG_MULTI_SZ */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto done; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto done; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + + ret = TRUE; +done: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* FIXME: + * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in + * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result + * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain + * the same GUID for the same GPU. */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + void X11DRV_DisplayDevices_Init(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; DWORD disposition = 0; @@ -70,8 +206,26 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto done; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + goto done; + } + done: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); ReleaseMutex(mutex); CloseHandle(mutex); + if (gpus) + handler.pFreeGpus(gpus); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbc5a104f6..e50158d282 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -667,6 +667,20 @@ void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* X11 display device handler. Used to initialize display device registry data */ +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -675,6 +689,14 @@ struct x11drv_display_device_handler /* Higher priority can override handlers with lower proprity */ INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 35dd36049b..900cfd91db 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -201,6 +201,29 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + lstrcpyW( gpus[0].name, wine_adapterW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -239,6 +262,8 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pFreeGpus = xinerama_free_gpus; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

2 1

[PATCH v9 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang 11 Jun '19

11 Jun '19

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. v5: Fix explorer patch triggered user32 test failures. v6: Restructure patches. v7: Add mutex to avoid init race. Remove old adapter keys during reinit. Add fallback monitor data in explorer. Simplify code. v8: Rename mutex. Prefer lstr* functions. Move fallback to EnumDisplayDevicesW(). Minor cleanup. v9: Supersede 166265~166271. Fix intermediate test failure. I was testing with a polluted prefix. dlls/user32/tests/monitor.c | 6 +-- dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 77 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 15 +++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 7 ++++ 6 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c5e6745322..0a097cc85c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,7 +81,7 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[16]; + char video_name[32]; char video_value[128]; char buffer[128]; int number; @@ -107,13 +107,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de { sprintf(video_name, "\\Device\\Video%d", index); ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); if (!ls) { memset(video_value, 0, sizeof(video_value)); size = sizeof(video_value); ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); - ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); + todo_wine ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..e3e4dce84d --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,77 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex; + HKEY video_hkey = NULL; + DWORD disposition = 0; + + mutex = CreateMutexW(NULL, FALSE, init_mutexW); + WaitForSingleObject(mutex, INFINITE); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + { + ERR("Failed to create video device key\n"); + goto done; + } + + /* Avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + goto done; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + +done: + RegCloseKey(video_hkey); + ReleaseMutex(mutex); + CloseHandle(mutex); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..fbc5a104f6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,21 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..35dd36049b 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -201,6 +203,7 @@ RECT get_primary_monitor_rect(void) void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +237,10 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

2 1

[PATCH v9 1/2] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32
by Huw Davies 11 Jun '19

11 Jun '19

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 49 ---------------- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/virtual.c | 107 ++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 50 deletions(-) create mode 100644 dlls/ntdll/tests/virtual.c diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d797df26f6..0b718606d0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -52,8 +52,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); -static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); /* ############################### */ @@ -230,8 +228,6 @@ static void test_VirtualAlloc(void) void *addr1, *addr2; DWORD old_prot; MEMORY_BASIC_INFORMATION info; - NTSTATUS status; - SIZE_T size; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -440,55 +436,12 @@ static void test_VirtualAlloc(void) addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); - /* allocation conflicts because of 64k align */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - - /* it should conflict, even when zero_bits is explicitly set */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 21 zero bits never succeeds */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 22 zero bits is invalid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); ok(!addr2, "VirtualAlloc unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | - MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } @@ -4438,8 +4391,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); - pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a..ed15c51339 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ - time.c + time.c \ + virtual.c diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c new file mode 100644 index 0000000000..c1b46c959e --- /dev/null +++ b/dlls/ntdll/tests/virtual.c @@ -0,0 +1,107 @@ +/* + * Unit test suite for the virtual memory APIs. + * + * Copyright 2019 Remi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/test.h" + +static void test_AllocateVirtualMemory(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; + + /* simple allocation should success */ + size = 0x1000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemory returned %08x\n", status); + + /* allocation conflicts because of 64k align */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + + /* it should conflict, even when zero_bits is explicitly set */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 21 zero bits never succeeds */ + size = 0x1000; + addr2 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + + /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 0, &size, + MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); +} + +START_TEST(virtual) +{ + SYSTEM_BASIC_INFORMATION sbi; + + NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); + trace("system page size %#x\n", sbi.PageSize); + + test_AllocateVirtualMemory(); +} -- 2.17.1

2 1

[PATCH v2 1/2] ucrtbase/tests: Add some tests for __stdio_common_vsscanf().
by Zebediah Figura 11 Jun '19

11 Jun '19

Based on msvcrt:scanf tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/scanf.c | 276 ++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+) create mode 100644 dlls/ucrtbase/tests/scanf.c diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 3fd4b1c7d389..116bdcc7b653 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -4,4 +4,5 @@ C_SRCS = \ cpp.c \ misc.c \ printf.c \ + scanf.c \ string.c diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c new file mode 100644 index 000000000000..7f44b7f1adf3 --- /dev/null +++ b/dlls/ucrtbase/tests/scanf.c @@ -0,0 +1,276 @@ +/* + * Conformance tests for *scanf functions. + * + * Copyright 2002 Uwe Bonnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +#include "wine/test.h" + +static int (__cdecl *p_vsscanf)(unsigned __int64 options, const char *str, size_t len, const char *format, + void *locale, __ms_va_list valist); + +static BOOL init(void) +{ + HMODULE hmod = LoadLibraryA("ucrtbase.dll"); + + if (!hmod) + { + win_skip("ucrtbase.dll not installed\n"); + return FALSE; + } + + p_vsscanf = (void *)GetProcAddress(hmod, "__stdio_common_vsscanf"); + + return TRUE; +} + +static int WINAPIV vsscanf_wrapper(unsigned __int64 options, const char *str, const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsscanf(options, str, -1, format, NULL, valist); + __ms_va_end(valist); + return ret; +} + +#define UCRTBASE_SCANF_SECURECRT (0x0001) +#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) +#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) + +static void test_sscanf(void) +{ + static const float float1 = -82.6267f, float2 = 27.76f; + char buffer[100], buffer1[100]; + int result, ret, hour, min, count; + LONGLONG result64; + char c; + void *ptr; + float ret_float1, ret_float2; + double double_res; + unsigned int i; + + static const unsigned int tests[] = + { + 0, + UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS, + UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ret = vsscanf_wrapper(tests[i], "", "%d", &result); + ok(ret == EOF, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + ret = vsscanf_wrapper(tests[i], "000000000046F170", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f170, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0046F171", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f171, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "46F172", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f172, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x46F173", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + todo_wine ok(ptr == (void *)0x46f173, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-46F174", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)(ULONG_PTR)-0x46f174, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "+46F175", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f175, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1233", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x1233, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1234", "%P", &ptr); + todo_wine ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x519", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x519, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x51a", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x51a, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x51g", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x51, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "-1", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "\"%12@", "%\"%%%d%@", &result); + todo_wine ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + sprintf(buffer, "%f %f", float1, float2); + ret = vsscanf_wrapper(tests[i], buffer, "%f%f", &ret_float1, &ret_float2); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ret_float1 == float1, "got wrong float %.8e for flags %#x\n", ret_float1, tests[i]); + ok(ret_float2 == float2, "got wrong float %.8e for flags %#x\n", ret_float2, tests[i]); + + sprintf(buffer, "%lf", 32.715); + ret = vsscanf_wrapper(tests[i], buffer, "%lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 32.715, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + ret = vsscanf_wrapper(tests[i], buffer, "%Lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 32.715, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1.1e-30", "%lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 1.1e-30, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + + ret = vsscanf_wrapper(tests[i], " Waverly", "%*c%[^\n]", buffer); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, " Waverly"), "got string '%s' for flags %#x\n", buffer, tests[i]); + + ret = vsscanf_wrapper(tests[i], "abcefgdh", "%*[a-cg-e]%c", &buffer[0]); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(buffer[0] == 'd', "got char '%c' for flags %#x\n", buffer[0], tests[i]); + + ret = vsscanf_wrapper(tests[i], "abcefgdh", "%*[a-cd-dg-e]%c", &buffer[0]); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(buffer[0] == 'h', "got char '%c' for flags %#x\n", buffer[0], tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "a", "%s%s", buffer, buffer1); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "a"), "got string '%s' for flags %#x\n", buffer, tests[i]); + ok(!strcmp(buffer1, "bar"), "got string '%s' for flags %#x\n", buffer1, tests[i]); + + ret = vsscanf_wrapper(tests[i], "21:59:20", "%d%n", &result, &count); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 21, "got wrong number %d for flags %#x\n", result, tests[i]); + ok(count == 2, "got wrong count %d for flags %#x\n", count, tests[i]); + + ret = vsscanf_wrapper(tests[i], ":59:20", "%*c%n", &count); + ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(count == 1, "got wrong count %d for flags %#x\n", count, tests[i]); + + result = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "12345678", "%hd", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0xdead614e, "got wrong number %#x for flags %#x\n", result, tests[i]); + + result = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "12345678", "%hhd", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + todo_wine ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "12345678901234", "%lld", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + ret = vsscanf_wrapper(tests[i], "123", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 123, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "123", "%d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 123, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "017", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 15, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x17", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 23, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%o", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "-1", "%u", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], "a", "%c", &c); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(c == 'a', "got wrong char '%c' for flags %#x\n", c, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], " a", "%c", &c); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(c == ' ', "got wrong char '%c' for flags %#x\n", c, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], "18:59", "%d:%d%c", &hour, &min, &c); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(hour == 18, "got wrong char '%c' for flags %#x\n", hour, tests[i]); + ok(min == 59, "got wrong char '%c' for flags %#x\n", min, tests[i]); + ok(c == 0x55, "got wrong char '%c' for flags %#x\n", c, tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "abc def", "%s %n%s", buffer, &count, buffer1); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "abc"), "got wrong string '%s' for flags %#x\n", buffer, tests[i]); + ok(count == 6, "got wrong count %d for flags %#x\n", count, tests[i]); + ok(!strcmp(buffer1, "def"), "got wrong string '%s' for flags %#x\n", buffer1, tests[i]); + + ret = vsscanf_wrapper(tests[i], "3:45", "%d:%d%n", &hour, &min, &count); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(hour == 3, "got wrong char '%c' for flags %#x\n", hour, tests[i]); + ok(min == 45, "got wrong char '%c' for flags %#x\n", min, tests[i]); + ok(count == 4, "got wrong count %d for flags %#x\n", count, tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "test=value\xda", "%[^=] = %[^;]", buffer, buffer1); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "test"), "got wrong string '%s' for flags %#x\n", buffer, tests[i]); + ok(!strcmp(buffer1, "value\xda"), "got wrong string '%s' for flags %#x\n", buffer1, tests[i]); + } +} + +START_TEST(scanf) +{ + if (!init()) return; + + test_sscanf(); +} -- 2.20.1

2 3

[PATCH v8 1/4] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32
by Rémi Bernon 11 Jun '19

11 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 49 --------------- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/virtual.c | 113 ++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 50 deletions(-) create mode 100644 dlls/ntdll/tests/virtual.c diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d797df26f6c..0b718606d0e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -52,8 +52,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); -static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); /* ############################### */ @@ -230,8 +228,6 @@ static void test_VirtualAlloc(void) void *addr1, *addr2; DWORD old_prot; MEMORY_BASIC_INFORMATION info; - NTSTATUS status; - SIZE_T size; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -440,55 +436,12 @@ static void test_VirtualAlloc(void) addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); - /* allocation conflicts because of 64k align */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - - /* it should conflict, even when zero_bits is explicitly set */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 21 zero bits never succeeds */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 22 zero bits is invalid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); ok(!addr2, "VirtualAlloc unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | - MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, - "NtAllocateVirtualMemory returned %08x\n", status); - ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } @@ -4438,8 +4391,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); - pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a0..ed15c51339f 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ - time.c + time.c \ + virtual.c diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c new file mode 100644 index 00000000000..21dd57e8de5 --- /dev/null +++ b/dlls/ntdll/tests/virtual.c @@ -0,0 +1,113 @@ +/* + * Unit test suite for Virtual* family of APIs. + * + * Copyright 2019 Remi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/test.h" + +static void test_AllocateVirtualMemory(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; + + /* simple allocation should success */ + size = 0x1000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemory returned %08x\n", status); + + /* allocation conflicts because of 64k align */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + + /* it should conflict, even when zero_bits is explicitly set */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 12, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 21 zero bits never succeeds */ + size = 0x1000; + addr2 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | + MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); +} + +START_TEST(virtual) +{ + SYSTEM_BASIC_INFORMATION sbi; + + NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); + trace("system page size %#x\n", sbi.PageSize); + + test_AllocateVirtualMemory(); +} -- 2.20.1

3 6

[PATCH v9 2/2] ntdll/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior
by Huw Davies 11 Jun '19

11 Jun '19

From: Rémi Bernon <rbernon(a)codeweavers.com> The zero_bits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space. The expected full behaviour is: * zero_bits == 0: no constraint on address range * 0 < zero_bits <= 15: returned address should have as many upper bits set to 0, starting at bit 31. In 64bit mode, upper 32bits should all be 0 as well. * 15 < zero_bits <= 31: unsure, but probably same as zero_bits == 15. * zero_bits > 31: (64bit/WoW64 only) zero_bits behaves as a bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index c1b46c959e..195a54704f 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -26,11 +26,15 @@ #include "winternl.h" #include "wine/test.h" +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); + static void test_AllocateVirtualMemory(void) { void *addr1, *addr2; NTSTATUS status; SIZE_T size; + ULONG zero_bits; + BOOL is_wow64; /* simple allocation should success */ size = 0x1000; @@ -60,6 +64,46 @@ static void test_AllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); } + /* 1 zero bits should zero 63-31 upper bits */ + size = 0x1000; + addr2 = NULL; + zero_bits = 1; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 1, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY || + broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory returned address: %p\n", addr2); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + for (zero_bits = 2; zero_bits <= 20; zero_bits++) + { + size = 0x1000; + addr2 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY || + broken(zero_bits == 20 && status == STATUS_CONFLICTING_ADDRESSES) /* w1064v1809 */, + "NtAllocateVirtualMemory with %d zero_bits returned %08x\n", zero_bits, status); + if (status == STATUS_SUCCESS) + { + todo_wine_if((UINT_PTR)addr2 >> (32 - zero_bits)) + ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory with %d zero_bits returned address %p\n", zero_bits, addr2); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* 21 zero bits never succeeds */ size = 0x1000; addr2 = NULL; @@ -83,6 +127,35 @@ static void test_AllocateVirtualMemory(void) ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); + /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + size = 0x1000; + addr2 = NULL; + zero_bits = 0x1fffffff; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + + if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || + !pIsWow64Process(NtCurrentProcess(), &is_wow64) || !is_wow64)) + { + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + } + else + { + todo_wine + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) + { + todo_wine + ok(((UINT_PTR)addr2 & ~zero_bits) == 0, + "NtAllocateVirtualMemory returned address %p\n", addr2); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ size = 0x1000; addr2 = (char *)addr1 + 0x1000; @@ -99,6 +172,10 @@ static void test_AllocateVirtualMemory(void) START_TEST(virtual) { SYSTEM_BASIC_INFORMATION sbi; + HMODULE hkernel32; + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); -- 2.17.1

1 0

[PATCH 1/2] ucrtbase/tests: Add some tests for __stdio_common_vsscanf().
by Zebediah Figura 10 Jun '19

10 Jun '19

Based on msvcrt:scanf tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/scanf.c | 280 ++++++++++++++++++++++++++++++++ 2 files changed, 281 insertions(+) create mode 100644 dlls/ucrtbase/tests/scanf.c diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 3fd4b1c7d389..116bdcc7b653 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -4,4 +4,5 @@ C_SRCS = \ cpp.c \ misc.c \ printf.c \ + scanf.c \ string.c diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c new file mode 100644 index 000000000000..644e79921613 --- /dev/null +++ b/dlls/ucrtbase/tests/scanf.c @@ -0,0 +1,280 @@ +/* + * Conformance tests for *scanf functions. + * + * Copyright 2002 Uwe Bonnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +#include "wine/test.h" + +static int (__cdecl *p_vsscanf)(unsigned __int64 options, const char *str, size_t len, const char *format, + void *locale, __ms_va_list valist); + +static BOOL init(void) +{ + HMODULE hmod = LoadLibraryA("ucrtbase.dll"); + + if (!hmod) + { + win_skip("ucrtbase.dll not installed\n"); + return FALSE; + } + + p_vsscanf = (void *)GetProcAddress(hmod, "__stdio_common_vsscanf"); + + return TRUE; +} + +static int WINAPIV vsscanf_wrapper(unsigned __int64 options, const char *str, const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsscanf(options, str, -1, format, NULL, valist); + __ms_va_end(valist); + return ret; +} + +#define UCRTBASE_SCANF_SECURECRT (0x0001) +#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) +#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) + +static void test_sscanf(void) +{ + static const float float1 = -82.6267f, float2 = 27.76f; + char buffer[100], buffer1[100]; + int result, ret, hour, min, count; + LONGLONG result64; + char c; + void *ptr; + float ret_float1, ret_float2; + double double_res; + unsigned int i; + + static const unsigned int tests[] = + { + 0, + UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS, + UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ret = vsscanf_wrapper(tests[i], "", "%d", &result); + ok(ret == EOF, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + ret = vsscanf_wrapper(tests[i], "000000000046F170", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f170, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0046F171", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f171, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "46F172", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f172, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x46F173", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + todo_wine ok(ptr == (void *)0x46f173, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-46F174", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)(ULONG_PTR)-0x46f174, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "+46F175", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x46f175, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1233", "%p", &ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ptr == (void *)0x1233, "sscanf reads %p for flags %#x\n", ptr, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1234", "%P", &ptr); + todo_wine ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x519", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x519, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x51a", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x51a, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x51g", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0x51, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "-1", "%x", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "sscanf reads %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "\"%12@", "%\"%%%d%@", &result); + todo_wine ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + + sprintf(buffer, "%f %f", float1, float2); + ret = vsscanf_wrapper(tests[i], buffer, "%f%f", &ret_float1, &ret_float2); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(ret_float1 == float1, "got wrong float %.8e for flags %#x\n", ret_float1, tests[i]); + ok(ret_float2 == float2, "got wrong float %.8e for flags %#x\n", ret_float2, tests[i]); + + sprintf(buffer, "%lf", 32.715); + ret = vsscanf_wrapper(tests[i], buffer, "%lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 32.715, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + ret = vsscanf_wrapper(tests[i], buffer, "%Lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 32.715, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + + ret = vsscanf_wrapper(tests[i], "1.1e-30", "%lf", &double_res); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(double_res == 1.1e-30, "got wrong double %.16e for flags %#x\n", double_res, tests[i]); + + ret = vsscanf_wrapper(tests[i], " Waverly", "%*c%[^\n]", buffer); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, " Waverly"), "got string '%s' for flags %#x\n", buffer, tests[i]); + + ret = vsscanf_wrapper(tests[i], "abcefgdh", "%*[a-cg-e]%c", &buffer[0]); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(buffer[0] == 'd', "got char '%c' for flags %#x\n", buffer[0], tests[i]); + + ret = vsscanf_wrapper(tests[i], "abcefgdh", "%*[a-cd-dg-e]%c", &buffer[0]); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(buffer[0] == 'h', "got char '%c' for flags %#x\n", buffer[0], tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "a", "%s%s", buffer, buffer1); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "a"), "got string '%s' for flags %#x\n", buffer, tests[i]); + ok(!strcmp(buffer1, "bar"), "got string '%s' for flags %#x\n", buffer1, tests[i]); + + ret = vsscanf_wrapper(tests[i], "21:59:20", "%d%n", &result, &count); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 21, "got wrong number %d for flags %#x\n", result, tests[i]); + ok(count == 2, "got wrong count %d for flags %#x\n", count, tests[i]); + + ret = vsscanf_wrapper(tests[i], ":59:20", "%*c%n", &count); + ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(count == 1, "got wrong count %d for flags %#x\n", count, tests[i]); + + result = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "12345678", "%hd", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 0xdead614e, "got wrong number %#x for flags %#x\n", result, tests[i]); + + result = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "12345678", "%hhd", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + todo_wine ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "12345678901234", "%lld", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + ret = vsscanf_wrapper(tests[i], "123", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 123, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "123", "%d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 123, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "017", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 15, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "0x17", "%i", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == 23, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = vsscanf_wrapper(tests[i], "-1", "%o", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + ret = 0xdeadbeef; + ret = vsscanf_wrapper(tests[i], "-1", "%u", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == -1, "got wrong number %d for flags %#x\n", result, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], "a", "%c", &c); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(c == 'a', "got wrong char '%c' for flags %#x\n", c, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], " a", "%c", &c); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(c == ' ', "got wrong char '%c' for flags %#x\n", c, tests[i]); + + c = 0x55; + ret = vsscanf_wrapper(tests[i], "18:59", "%d:%d%c", &hour, &min, &c); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(hour == 18, "got wrong char '%c' for flags %#x\n", hour, tests[i]); + ok(min == 59, "got wrong char '%c' for flags %#x\n", min, tests[i]); + ok(c == 0x55, "got wrong char '%c' for flags %#x\n", c, tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "abc def", "%s %n%s", buffer, &count, buffer1); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "abc"), "got wrong string '%s' for flags %#x\n", buffer, tests[i]); + ok(count == 6, "got wrong count %d for flags %#x\n", count, tests[i]); + ok(!strcmp(buffer1, "def"), "got wrong string '%s' for flags %#x\n", buffer1, tests[i]); + + ret = vsscanf_wrapper(tests[i], "3:45", "%d:%d%n", &hour, &min, &count); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(hour == 3, "got wrong char '%c' for flags %#x\n", hour, tests[i]); + ok(min == 45, "got wrong char '%c' for flags %#x\n", min, tests[i]); + ok(count == 4, "got wrong count %d for flags %#x\n", count, tests[i]); + + strcpy(buffer, "foo"); + strcpy(buffer1, "bar"); + ret = vsscanf_wrapper(tests[i], "test=value\xda", "%[^=] = %[^;]", buffer, buffer1); + ok(ret == 2, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(!strcmp(buffer, "test"), "got wrong string '%s' for flags %#x\n", buffer, tests[i]); + ok(!strcmp(buffer1, "value\xda"), "got wrong string '%s' for flags %#x\n", buffer1, tests[i]); + + strcpy(buffer, "foo"); + ret = vsscanf_wrapper(tests[i], "\x81\x82test", "\x81\x82%s", buffer); + todo_wine ok(ret == 0, "sscanf returned %d for flags %#x\n", ret, tests[i]); + } +} + +START_TEST(scanf) +{ + if (!init()) return; + + test_sscanf(); +} -- 2.20.1

2 3

[PATCH 5/5] wined3d: Upload texture data through the texture ops in wined3d_cs_exec_update_sub_resource().
by Henri Verbeet 10 Jun '19

10 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a95ba502f32..05d39038843 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2340,11 +2340,11 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_prepare_texture(texture, context, FALSE); else wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, - &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE); + texture->texture_ops->texture_upload_data(context, &addr, texture->resource.format, &src_box, + op->data.row_pitch, op->data.slice_pitch, texture, op->sub_resource_idx, + WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_unload_tex_coords().
by Henri Verbeet 10 Jun '19

10 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 01d350de502..be24baf3187 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5015,9 +5015,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s context_release(context); } -void context_unload_tex_coords(const struct wined3d_context *context) +void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int texture_idx; for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) @@ -5091,6 +5091,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context /* This should match any arrays loaded in context_load_vertex_data(). */ static void context_unload_vertex_data(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (!context->namedArraysLoaded) @@ -5100,7 +5101,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - context_unload_tex_coords(context); + wined3d_context_gl_unload_tex_coords(context_gl); context->namedArraysLoaded = FALSE; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a31f08574ed..1e13557a98f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3474,7 +3474,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d */ GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; - context_unload_tex_coords(context); + wined3d_context_gl_unload_tex_coords(context_gl); wined3d_context_gl_load_tex_coords(context_gl, &context->stream_info, &curVBO, state); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0dd1fc1bc75..4f0b91adaf1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2111,6 +2111,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2268,7 +2269,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_map_bo_address().
by Henri Verbeet 10 Jun '19

10 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- dlls/wined3d/texture.c | 18 ++++++++++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 18a17163cba..01d350de502 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2589,17 +2589,16 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen checkGLcall("bind texture"); } -void *context_map_bo_address(struct wined3d_context *context, +void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *memory; if (!data->buffer_object) return data->addr; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -2656,8 +2655,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = context_map_bo_address(&context_gl->c, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = context_map_bo_address(&context_gl->c, dst, size, dst_binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_binding, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7ae4fb81877..5e28c46b114 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -614,6 +614,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; + struct wined3d_context_gl *context_gl = NULL; unsigned int src_row_pitch, src_slice_pitch; struct wined3d_context *context = NULL; struct wined3d_texture *dst_texture; @@ -651,7 +652,10 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } map_binding = src_texture->resource.map_binding; if (!wined3d_texture_load_location(src_texture, sub_resource_idx, context, map_binding)) @@ -672,10 +676,10 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_get_pitch(dst_texture, 0, &dst_row_pitch, &dst_slice_pitch); wined3d_texture_get_memory(dst_texture, 0, &dst_data, map_binding); - src = context_map_bo_address(context, &src_data, + src = wined3d_context_gl_map_bo_address(context_gl, &src_data, src_texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - dst = context_map_bo_address(context, - &dst_data, dst_texture->sub_resources[0].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); + dst = wined3d_context_gl_map_bo_address(context_gl, &dst_data, + dst_texture->sub_resources[0].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); @@ -1525,6 +1529,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = texture->resource.device; const struct wined3d_color_key_conversion *conversion; @@ -1643,8 +1648,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); - src_mem = context_map_bo_address(context, &data, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, + src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); @@ -2468,6 +2473,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int const struct wined3d_format *src_format, *dst_format; struct wined3d_texture *converted_texture = NULL; struct wined3d_bo_address src_data, dst_data; + struct wined3d_context_gl *context_gl = NULL; unsigned int src_fmt_flags, dst_fmt_flags; struct wined3d_map_desc dst_map, src_map; struct wined3d_context *context = NULL; @@ -2486,7 +2492,10 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_sub_resource_idx, debug_box(src_box), flags, fx, debug_d3dtexturefiltertype(filter)); if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) { @@ -2499,7 +2508,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); - dst_map.data = context_map_bo_address(context, &dst_data, + dst_map.data = wined3d_context_gl_map_bo_address(context_gl, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); @@ -2536,7 +2545,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_get_pitch(src_texture, texture_level, &src_map.row_pitch, &src_map.slice_pitch); wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &src_data, map_binding); - src_map.data = context_map_bo_address(context, &src_data, + src_map.data = wined3d_context_gl_map_bo_address(context_gl, &src_data, src_texture->sub_resources[src_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); map_binding = dst_texture->resource.map_binding; @@ -2546,7 +2555,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); - dst_map.data = context_map_bo_address(context, &dst_data, + dst_map.data = wined3d_context_gl_map_bo_address(context_gl, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); } flags &= ~WINED3D_BLT_RAW; @@ -2944,6 +2953,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, const struct wined3d_box *box, const struct wined3d_color *colour) { struct wined3d_device *device = view->resource->device; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -2972,7 +2982,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; @@ -2987,7 +3000,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, wined3d_texture_get_pitch(texture, view->sub_resource_idx % texture->level_count, &map.row_pitch, &map.slice_pitch); wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); - map.data = context_map_bo_address(context, &data, + map.data = wined3d_context_gl_map_bo_address(context_gl, &data, texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); map.data = (BYTE *)map.data + (box->front * map.slice_pitch) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6e1cc047502..2a8bff458e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -695,6 +695,7 @@ static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *text static void wined3d_texture_create_dc(void *object) { const struct wined3d_texture_idx *idx = object; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; unsigned int sub_resource_idx, level; const struct wined3d_format *format; @@ -732,13 +733,16 @@ static void wined3d_texture_create_dc(void *object) } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - desc.pMemory = context_map_bo_address(context, &data, + desc.pMemory = wined3d_context_gl_map_bo_address(context_gl, &data, texture->sub_resources[sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); @@ -1903,6 +1907,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; @@ -1995,8 +2000,8 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s return; } - src_mem = context_map_bo_address(context, &bo, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, + src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (decompress) compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); @@ -2577,6 +2582,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; unsigned int fmt_flags = resource->format_flags; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -2613,7 +2619,10 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } if (flags & WINED3D_MAP_DISCARD) { @@ -2641,7 +2650,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); - base_memory = context_map_bo_address(context, &data, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, flags); + base_memory = wined3d_context_gl_map_bo_address(context_gl, &data, + sub_resource->size, GL_PIXEL_UNPACK_BUFFER, flags); TRACE("Base memory pointer %p.\n", base_memory); if (context) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dad878cab2a..0dd1fc1bc75 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2104,6 +2104,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; @@ -2257,8 +2259,6 @@ void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, - size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback().
by Henri Verbeet 10 Jun '19

10 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context.c | 14 ++++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9fcd96b864a..8e1ac4819c5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,6 +144,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_resource *resource = &buffer_gl->b.resource; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -179,7 +180,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b443fcd98ed..18a17163cba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4085,20 +4085,22 @@ static BOOL use_transform_feedback(const struct wined3d_state *state) return shader->u.gs.so_desc.element_count; } -void context_end_transform_feedback(struct wined3d_context *context) +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (context->transform_feedback_active) + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + + if (context_gl->c.transform_feedback_active) { GL_EXTCALL(glEndTransformFeedback()); checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - context->transform_feedback_paused = 0; + context_gl->c.transform_feedback_active = 0; + context_gl->c.transform_feedback_paused = 0; } } static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (!context->transform_feedback_active || context->transform_feedback_paused) @@ -4115,7 +4117,7 @@ static void context_pause_transform_feedback(struct wined3d_context *context, BO WARN("Cannot pause transform feedback operations.\n"); if (force) - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } static void context_setup_target(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b01caa3e6e..a31f08574ed 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4448,13 +4448,14 @@ static void state_uav_warn(struct wined3d_context *context, const struct wined3d static void state_so(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; unsigned int offset, size, i; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588d7e5b582..dad878cab2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2091,6 +2091,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2250,7 +2251,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances().
by Henri Verbeet 10 Jun '19

10 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/state.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 933bf13fefc..b443fcd98ed 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2401,17 +2401,18 @@ static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *cont size->cy = wined3d_texture_get_level_height(rt, level); } -void context_enable_clip_distances(struct wined3d_context *context, unsigned int enable_mask) +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t enable_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int clip_distance_count = gl_info->limits.user_clip_distances; - unsigned int i, disable_mask, current_mask; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + unsigned int clip_distance_count, i; + uint32_t disable_mask, current_mask; + clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; enable_mask &= (1u << clip_distance_count) - 1; disable_mask &= (1u << clip_distance_count) - 1; - current_mask = context->clip_distance_mask; - context->clip_distance_mask = enable_mask; + current_mask = context_gl->c.clip_distance_mask; + context_gl->c.clip_distance_mask = enable_mask; enable_mask &= ~current_mask; while (enable_mask) @@ -2850,7 +2851,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab62c1ca599..bb510ecf2d3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10533,6 +10533,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha static void shader_glsl_select(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; @@ -10552,7 +10553,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex program_id = glsl_program->id; current_vertex_color_clamp = glsl_program->vs.vertex_color_clamp; if (glsl_program->shader_controlled_clip_distances) - context_enable_clip_distances(context, glsl_program->clip_distance_mask); + wined3d_context_gl_enable_clip_distances(context_gl, glsl_program->clip_distance_mask); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c52e25d6ce2..2b01caa3e6e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -693,7 +693,8 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - unsigned int enable_mask; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + uint32_t enable_mask; if (use_vs(state) && !context->d3d_info->vs_clipping) { @@ -721,7 +722,7 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state */ enable_mask = state->render_states[WINED3D_RS_CLIPPING] ? state->render_states[WINED3D_RS_CLIPPLANEENABLE] : 0; - context_enable_clip_distances(context, enable_mask); + wined3d_context_gl_enable_clip_distances(context_gl, enable_mask); } static void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3864,6 +3865,7 @@ static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL useVertexShaderFunction = use_vs(state); BOOL updateFog = FALSE; @@ -3940,7 +3942,7 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine /* Disable all clip planes to get defined results on all drivers. See comment in the * state_clipping state handler */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); if (!warned && state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 631573816c0..588d7e5b582 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,6 +2090,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2249,7 +2250,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps().
by Henri Verbeet 10 Jun '19

10 Jun '19

From: Michael Muller <michael(a)fds-team.de> Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6978f..8dce5ce8f82 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1510,6 +1510,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps |= DDCAPS_ALIGNSTRIDE; caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; + caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps; + if(DriverCaps) { DD_STRUCT_COPY_BYSIZE(DriverCaps, &caps); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68428e29650..860e101159f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12874,6 +12874,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12984,4 +13009,5 @@ START_TEST(ddraw1) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d0569493268..2c047a5e1ff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13750,6 +13750,30 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw2 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw2_Release(ddraw); +} START_TEST(ddraw2) { @@ -13868,4 +13892,5 @@ START_TEST(ddraw2) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 823af434dbb..fa6cca60db4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16170,6 +16170,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16302,4 +16327,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e8c36dc39af..b0fc634eef7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16264,6 +16264,31 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16410,4 +16435,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_caps(); } -- 2.11.0

2 1

[PATCH] winemac.drv: Send state change notifications from ImeSelect
by Aric Stewart 10 Jun '19

10 Jun '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH] ddraw/tests: Fix test failures in test_lighting() on some of WARP drivers for ddraw7.
by Paul Gofman 10 Jun '19

10 Jun '19

Currently fails on w1064v1507 test machine. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5641a8fc18..d0c8168f2e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3842,6 +3842,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 2, 1, src_vb2, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, unlitnquad, 4, indices, 6, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -3850,6 +3851,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 3, 1, src_vb2, 1, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, litnquad, 4, indices, 6, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -3868,7 +3870,7 @@ static void test_lighting(void) "Unexpected specular color 0x%08x.\n", dst_data[0].specular); color = get_surface_color(rt, 160, 120); /* Broken on some of WARP drivers. */ - ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + ok(color == 0x00000000 || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); ok(dst_data[1].diffuse == 0xff000000, "Lit quad without normals has color 0x%08x, expected 0xff000000.\n", dst_data[1].diffuse); @@ -3881,7 +3883,7 @@ static void test_lighting(void) ok(!dst_data[2].specular, "Unexpected specular color 0x%08x.\n", dst_data[2].specular); color = get_surface_color(rt, 480, 120); - ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + ok(color == 0x00000000 || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); ok(dst_data[3].diffuse == 0xff000000, "Lit quad with normals has color 0x%08x, expected 0xff000000.\n", dst_data[3].diffuse); @@ -3926,7 +3928,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == tests[i].expected || broken(is_warp && color == 0x000000ff), + ok(color == tests[i].expected || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "%s has color 0x%08x.\n", tests[i].message, color); todo_wine_if(tests[i].process_vertices_todo) ok(dst_data[0].diffuse == tests[i].expected_process_vertices, -- 2.21.0

3 2

[PATCH 1/2] wined3d: Compute fog factor in process_vertices_strided().
by Paul Gofman 10 Jun '19

10 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 127 +++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 13 ++++ 2 files changed, 111 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f9485aa6a..3d4914eb6a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -58,16 +58,21 @@ struct lights_settings struct wined3d_color ambient_light; struct wined3d_matrix modelview_matrix; struct wined3d_matrix_3x3 normal_matrix; + struct wined3d_vec4 position_transformed; + + float fog_start, fog_end, fog_density; uint32_t point_light_count : 8; uint32_t spot_light_count : 8; uint32_t directional_light_count : 8; uint32_t parallel_point_light_count : 8; - + uint32_t lighting : 1; uint32_t legacy_lighting : 1; uint32_t normalise : 1; uint32_t localviewer : 1; - uint32_t padding : 29; + uint32_t fog_coord_mode : 2; + uint32_t fog_mode : 2; + uint32_t padding : 24; }; /* Define the default light parameters as specified by MSDN. */ @@ -3269,7 +3274,7 @@ static void wined3d_color_rgb_mul_add(struct wined3d_color *dst, const struct wi } static void init_transformed_lights(struct lights_settings *ls, - const struct wined3d_state *state, BOOL legacy_lighting) + const struct wined3d_state *state, BOOL legacy_lighting, BOOL compute_lighting) { const struct wined3d_light_info *lights[WINED3D_MAX_SOFTWARE_ACTIVE_LIGHTS]; const struct wined3d_light_info *light_info; @@ -3280,15 +3285,30 @@ static void init_transformed_lights(struct lights_settings *ls, memset(ls, 0, sizeof(*ls)); - wined3d_color_from_d3dcolor(&ls->ambient_light, state->render_states[WINED3D_RS_AMBIENT]); - ls->legacy_lighting = !!legacy_lighting; - ls->normalise = !!state->render_states[WINED3D_RS_NORMALIZENORMALS]; - ls->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; + ls->lighting = !!compute_lighting; + ls->fog_mode = state->render_states[WINED3D_RS_FOGVERTEXMODE]; + ls->fog_coord_mode = state->render_states[WINED3D_RS_RANGEFOGENABLE] + ? WINED3D_FFP_VS_FOG_RANGE : WINED3D_FFP_VS_FOG_DEPTH; + ls->fog_start = wined3d_get_float_state(state, WINED3D_RS_FOGSTART); + ls->fog_end = wined3d_get_float_state(state, WINED3D_RS_FOGEND); + ls->fog_density = wined3d_get_float_state(state, WINED3D_RS_FOGDENSITY); + + if (ls->fog_mode == WINED3D_FOG_NONE && !compute_lighting) + return; multiply_matrix(&ls->modelview_matrix, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); + + if (!compute_lighting) + return; + compute_normal_matrix(&ls->normal_matrix._11, legacy_lighting, &ls->modelview_matrix); + wined3d_color_from_d3dcolor(&ls->ambient_light, state->render_states[WINED3D_RS_AMBIENT]); + ls->legacy_lighting = !!legacy_lighting; + ls->normalise = !!state->render_states[WINED3D_RS_NORMALIZENORMALS]; + ls->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; + for (i = 0, index = 0; i < LIGHTMAP_SIZE && index < ARRAY_SIZE(lights); ++i) { LIST_FOR_EACH_ENTRY(light_info, &state->light_state.light_map[i], struct wined3d_light_info, entry) @@ -3430,21 +3450,28 @@ static void update_light_diffuse_specular(struct wined3d_color *diffuse, struct wined3d_color_rgb_mul_add(specular, &light->specular, att * powf(t, material_shininess)); } +static void light_set_vertex_data(struct lights_settings *ls, + const struct wined3d_vec4 *position) +{ + if (ls->fog_mode == WINED3D_FOG_NONE && !ls->lighting) + return; + + wined3d_vec4_transform(&ls->position_transformed, position, &ls->modelview_matrix); + wined3d_vec3_scale((struct wined3d_vec3 *)&ls->position_transformed, 1.0f / ls->position_transformed.w); +} + static void compute_light(struct wined3d_color *ambient, struct wined3d_color *diffuse, - struct wined3d_color *specular, const struct lights_settings *ls, const struct wined3d_vec3 *normal, - const struct wined3d_vec4 *position, float material_shininess) + struct wined3d_color *specular, struct lights_settings *ls, const struct wined3d_vec3 *normal, + float material_shininess) { struct wined3d_vec3 position_transformed_normalised; struct wined3d_vec3 normal_transformed = {0.0f}; - struct wined3d_vec4 position_transformed; const struct light_transformed *light; struct wined3d_vec3 dir, dst; unsigned int i, index; float att; - wined3d_vec4_transform(&position_transformed, position, &ls->modelview_matrix); - wined3d_vec3_scale((struct wined3d_vec3 *)&position_transformed, 1.0f / position_transformed.w); - position_transformed_normalised = *(const struct wined3d_vec3 *)&position_transformed; + position_transformed_normalised = *(const struct wined3d_vec3 *)&ls->position_transformed; wined3d_vec3_normalise(&position_transformed_normalised); if (normal) @@ -3472,9 +3499,9 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d for (i = 0; i < ls->point_light_count; ++i, ++index) { light = &ls->lights[index]; - dir.x = light->position.x - position_transformed.x; - dir.y = light->position.y - position_transformed.y; - dir.z = light->position.z - position_transformed.z; + dir.x = light->position.x - ls->position_transformed.x; + dir.y = light->position.y - ls->position_transformed.y; + dir.z = light->position.z - ls->position_transformed.z; dst.z = wined3d_vec3_dot(&dir, &dir); dst.y = sqrtf(dst.z); @@ -3510,9 +3537,9 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d light = &ls->lights[index]; - dir.x = light->position.x - position_transformed.x; - dir.y = light->position.y - position_transformed.y; - dir.z = light->position.z - position_transformed.z; + dir.x = light->position.x - ls->position_transformed.x; + dir.y = light->position.y - ls->position_transformed.y; + dir.z = light->position.z - ls->position_transformed.z; dst.z = wined3d_vec3_dot(&dir, &dir); dst.y = sqrtf(dst.z); @@ -3563,6 +3590,46 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d } } +static float wined3d_calculate_fog_factor(float fog_coord, const struct lights_settings *ls) +{ + switch (ls->fog_mode) + { + case WINED3D_FOG_NONE: + return fog_coord; + case WINED3D_FOG_LINEAR: + return (ls->fog_end - fog_coord) / (ls->fog_end - ls->fog_start); + case WINED3D_FOG_EXP: + return expf(-fog_coord * ls->fog_density); + case WINED3D_FOG_EXP2: + return expf(-fog_coord * fog_coord * ls->fog_density * ls->fog_density); + } +} + +static void update_fog_factor(float *fog_factor, struct lights_settings *ls) +{ + float fog_coord; + + if (ls->fog_mode == WINED3D_FOG_NONE) + return; + + switch (ls->fog_coord_mode) + { + case WINED3D_FFP_VS_FOG_RANGE: + fog_coord = sqrtf(wined3d_vec3_dot((const struct wined3d_vec3 *)&ls->position_transformed, + (const struct wined3d_vec3 *)&ls->position_transformed)); + break; + + case WINED3D_FFP_VS_FOG_DEPTH: + fog_coord = fabsf(ls->position_transformed.z); + break; + + default: + ERR("Unhandled fog coordinate mode %#x.\n", ls->fog_coord_mode); + return; + } + *fog_factor = wined3d_calculate_fog_factor(fog_coord, ls); +} + /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, @@ -3661,17 +3728,24 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO output_colour_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, 0); material_specular_state_colour = state->render_states[WINED3D_RS_SPECULARENABLE] ? &state->material.specular : &black; - if (lighting) - init_transformed_lights(&ls, state, - device->adapter->d3d_info.wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING); + init_transformed_lights(&ls, state, device->adapter->d3d_info.wined3d_creation_flags + & WINED3D_LEGACY_FFP_LIGHTING, lighting); for (i = 0; i < dwCount; ++i) { const struct wined3d_stream_info_element *position_element = &stream_info->elements[WINED3D_FFP_POSITION]; const float *p = (const float *)&position_element->data.addr[i * position_element->stride]; struct wined3d_color ambient, diffuse, specular; + struct wined3d_vec4 position; unsigned int tex_index; + position.x = p[0]; + position.y = p[1]; + position.z = p[2]; + position.w = 1.0f; + + light_set_vertex_data(&ls, &position); + if ( ((dst_fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZ ) || ((dst_fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { /* The position first */ @@ -3783,14 +3857,8 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO if (lighting) { const struct wined3d_stream_info_element *element; - struct wined3d_vec4 position; struct wined3d_vec3 *normal; - position.x = p[0]; - position.y = p[1]; - position.z = p[2]; - position.w = 1.0f; - if (stream_info->use_map & (1u << WINED3D_FFP_NORMAL)) { element = &stream_info->elements[WINED3D_FFP_NORMAL]; @@ -3800,7 +3868,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO { normal = NULL; } - compute_light(&ambient, &diffuse, &specular, &ls, normal, &position, + compute_light(&ambient, &diffuse, &specular, &ls, normal, state->render_states[WINED3D_RS_SPECULARENABLE] ? state->material.power : 0.0f); } @@ -3853,6 +3921,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO { specular_colour = material_specular; } + update_fog_factor(&specular_colour.a, &ls); wined3d_color_clamp(&specular_colour, &specular_colour, 0.0f, 1.0f); *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &specular_colour); dest_ptr += sizeof(DWORD); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dcb0693c5..68ef9e13dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4945,6 +4945,19 @@ static inline void context_release(struct wined3d_context *context) context->device->adapter->adapter_ops->adapter_release_context(context); } +static inline float wined3d_get_float_state(const struct wined3d_state *state, enum wined3d_render_state rs) +{ + union + { + DWORD d; + float f; + } + tmpvalue; + + tmpvalue.d = state->render_states[rs]; + return tmpvalue.f; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.21.0

3 4

[PATCH] dxgi: Improve tracing in dxgi_adapter_QueryVideoMemoryInfo().
by Józef Kucia 10 Jun '19

10 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 859c24a105ed..d2fc629c8435 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -291,14 +291,18 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTe } static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface, - UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info) + UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *info) { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; + static unsigned int once; HRESULT hr; - FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p partial stub!\n", - iface, node_index, segment_group, memory_info); + TRACE("iface %p, node_index %u, segment_group %#x, info %p.\n", + iface, node_index, segment_group, info); + + if (!once++) + FIXME("Returning fake video memory info.\n"); if (node_index) FIXME("Ignoring node index %u.\n", node_index); @@ -313,26 +317,30 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap switch (segment_group) { case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: - memory_info->Budget = adapter_id.video_memory; - memory_info->CurrentUsage = 0; - memory_info->AvailableForReservation = adapter_id.video_memory / 2; - memory_info->CurrentReservation = 0; + info->Budget = adapter_id.video_memory; + info->CurrentUsage = 0; + info->AvailableForReservation = adapter_id.video_memory / 2; + info->CurrentReservation = 0; break; case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: - memset(memory_info, 0, sizeof(*memory_info)); + memset(info, 0, sizeof(*info)); break; default: WARN("Invalid memory segment group %#x.\n", segment_group); return E_INVALIDARG; } + TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", + wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), + wine_dbgstr_longlong(info->AvailableForReservation), wine_dbgstr_longlong(info->CurrentReservation)); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXGIAdapter *iface, UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, UINT64 reservation) { - FIXME("iface %p, node_index %u, segment_group %#x, reservation %s stub!\n", + FIXME("iface %p, node_index %u, segment_group %#x, reservation 0x%s stub!\n", iface, node_index, segment_group, wine_dbgstr_longlong(reservation)); return S_OK; -- 2.21.0

2 1

[PATCH 1/3] winex11.drv: Print the FocusIn/FocusOut mode in trace message
by Rémi Bernon 10 Jun '19

10 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c47..61dd56dcb4c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -749,6 +749,14 @@ static const char * const focus_details[] = "NotifyDetailNone" }; +static const char * const focus_modes[] = +{ + "NotifyNormal", + "NotifyGrab", + "NotifyUngrab", + "NotifyWhileGrabbed" +}; + /********************************************************************** * X11DRV_FocusIn */ @@ -759,7 +767,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!hwnd) return FALSE; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; @@ -839,7 +847,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) { -- 2.20.1

2 4

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-devel