July 2021 - Wine-Devel - list.winehq.org

[PATCH 3/3] gdi32: Store ntgdi object types in handle table.
by Jacek Caban July 8, 2021

July 8, 2021

2 1

[PATCH 2/3] gdi32/test: Add more handle table tests.
by Jacek Caban July 8, 2021

July 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/gdiobj.c | 83 +++++++++++++++++++++++++++++++++++---- include/ntgdi.h | 31 +++++++++++++-- 2 files changed, 103 insertions(+), 11 deletions(-)

2 1

[PATCH 1/3] gdi32/tests: Remove workarounds for old Windows versions.
by Jacek Caban July 8, 2021

July 8, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 94 +++++-------------------------------- 1 file changed, 13 insertions(+), 81 deletions(-)

2 1

[PATCH] mf/evr: Query d3d device manager via MR_VIDEO_RENDER_SERVICE service.
by Nikolay Sivov July 8, 2021

July 8, 2021

Default presenter responds to MR_VIDEO_ACCELERATION_SERVICE as well, but we'll have to be compatible to integrate with custom presenters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d048ea59681..5730a6e769f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1610,6 +1610,12 @@ static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); } +static HRESULT video_renderer_get_device_manager(struct video_renderer *renderer, IUnknown **device_manager) +{ + return MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_RENDER_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)device_manager); +} + static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -1660,13 +1666,12 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) /* Set device manager that presenter should have created. */ if (video_renderer_is_mixer_d3d_aware(renderer)) { - IDirect3DDeviceManager9 *device_manager; + IUnknown *device_manager; - if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IDirect3DDeviceManager9, (void **)&device_manager))) + if (SUCCEEDED(video_renderer_get_device_manager(renderer, &device_manager))) { IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); - IDirect3DDeviceManager9_Release(device_manager); + IUnknown_Release(device_manager); } } @@ -1690,8 +1695,7 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere hr = video_renderer_init_presenter_services(renderer); - if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IUnknown, (void **)&renderer->device_manager))) + if (FAILED(video_renderer_get_device_manager(renderer, &renderer->device_manager))) { WARN("Failed to get device manager from the presenter.\n"); } -- 2.30.2

1 0

[PATCH] po: Update German translation.
by Julian Rüger July 8, 2021

July 8, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

Wineconf futures
by Jeremy White July 8, 2021

July 8, 2021

Hi folks, I've got a complex set of thoughts about future Wine conferences which I've discussed privately with some folks, and wanted to bring up publicly. I'm going to share an overview here, and then have another thread strictly about Wineconf 2022. Arek Hiler has suggested that CodeWeavers host the X Developers Conference in Minnesota in September of 2022. That seems like a great idea to a lot of us. Our pitch to host that becomes stronger if we combine it with another conference, which creates a reason to combine Wineconf with XDC 2022. There also seems to be broad agreement that would be a good idea. I'll start another thread on that, with some further complications. However, working backwards, you come to the conclusion that our next Wine conference, if it's not that one in 2022, would probably be best accomplished in 2021. Given the vaccination rates in Japan, that seems to preclude the plan we had in place, which was a Wineconf in Japan. Alexandre and I have very little appetite for a virtual conference, which pretty much derailed the efforts to have a virtual conference in 2020 and suggests that trying to have a virtual conference in 2021 would not go well. Given all that, there is some thought to try for a hybrid conference somewhere in Europe later this year. The vaccination rates have led to an opening in the US that has been joyful; the hope is that Europe will not be far behind. I've discussed this with a range of folks, and the consensus seemed to be to wait and see. The Europeans are still quite nervous about that, and there is some concern about the variations, but they admit that perspectives may shift. I'm prepared to argue that a somewhat hurried, somewhat risky (i.e. with a real risk of cancellation) conference would still be worth it. I am the raging extrovert of the group, though. At any rate, the thought was to wait one or two months and then see, at least for Wineconf 2021. The full thought, then, is if our bid is accepted by XDC to have Wineconf 2022 in Minnesota, and then Japan in 2023. If our bid is not accepted, then I imagine Wineconf 2022 would be in Japan. Other thoughts? Cheers, Jeremy

5 5

[PATCH vkd3d] vkd3d-shader: Normalise descriptor register indices to shader model 5.1.
by Henri Verbeet July 8, 2021

July 8, 2021

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> --- libs/vkd3d-shader/dxbc.c | 28 +++++++++++++++++++++------- libs/vkd3d-shader/trace.c | 13 +++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4bc6201..b81ac97 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -637,8 +637,8 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { - range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + range->first = reg->idx[1].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); @@ -1516,6 +1516,21 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p return true; } +static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) +{ + switch (register_type) + { + case VKD3D_SM4_RT_SAMPLER: + case VKD3D_SM4_RT_RESOURCE: + case VKD3D_SM4_RT_CONSTBUFFER: + case VKD3D_SM5_RT_UAV: + return true; + + default: + return false; + } +} + static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) @@ -1667,13 +1682,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } - else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) { - /* SM5.1 places the buffer offset in idx[2]; earlier versions place it - * in idx[1]. Normalize to SM5.1. */ + /* SM5.1 places a symbol identifier in idx[0] and moves + * other values up one slot. Normalize to SM5.1. */ param->idx[2] = param->idx[1]; - param->idx[1].rel_addr = NULL; - param->idx[1].offset = 0; + param->idx[1] = param->idx[0]; } map_register(priv, param); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2d16714..79a6089 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -766,6 +766,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int offset = reg->idx[0].offset; + bool is_descriptor = false; static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; @@ -847,6 +848,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_SAMPLER: shader_addline(buffer, "s"); + is_descriptor = true; break; case VKD3DSPR_MISCTYPE: @@ -871,6 +873,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); + is_descriptor = true; break; case VKD3DSPR_IMMCONSTBUFFER: @@ -891,10 +894,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_RESOURCE: shader_addline(buffer, "t"); + is_descriptor = true; break; case VKD3DSPR_UAV: shader_addline(buffer, "u"); + is_descriptor = true; break; case VKD3DSPR_OUTPOINTID: @@ -1057,11 +1062,11 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); } - /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] - * to normalise it with 5.1. - * Here we should ignore it if it's a CB in sm < 5.1. */ + /* For descriptors in sm < 5.1 we move the reg->idx values up one slot + * to normalise with 5.1. + * Here we should ignore it if it's a descriptor in sm < 5.1. */ if (reg->idx[1].offset != ~0u && - (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) + (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1))) shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u) -- 2.20.1

2 1

[PATCH v4 1/4] mshtml: Move assert.h include to mshtml_private.h.
by Paul Gofman July 8, 2021

July 8, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/dispex.c | 1 - dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlattr.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmlcurstyle.c | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlelemcol.c | 1 - dlls/mshtml/htmlevent.c | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 1 - dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 1 - dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlnode.c | 1 - dlls/mshtml/htmlobject.c | 1 - dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/htmlstyle.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmlstylesheet.c | 1 - dlls/mshtml/htmltable.c | 1 - dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmltextnode.c | 1 - dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 1 - dlls/mshtml/navigate.c | 1 - dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsevents.c | 1 - dlls/mshtml/nsio.c | 1 - dlls/mshtml/oleobj.c | 1 - dlls/mshtml/omnavigator.c | 1 - dlls/mshtml/pluginhost.c | 1 - dlls/mshtml/range.c | 1 - dlls/mshtml/script.c | 1 - dlls/mshtml/secmgr.c | 1 - dlls/mshtml/svg.c | 1 - dlls/mshtml/task.c | 1 - dlls/mshtml/xmlhttprequest.c | 1 - 41 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 39630590228..6d248691d6b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a0e96af822e..da48601fe87 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index a5ebfe757ae..a0708c4b062 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 14b79812eb0..dc8c45e488a 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 9955a8e6498..32c49fe1214 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 85ac99aef92..2abe5df30ec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79241fc34cc..9faf987d7b9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8187cbf867e..b9677ec867a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index f4722d96729..e72f21ffaa5 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b3b95083f80..17f5fb35b71 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5906202f1c7..5d0928e4a9c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 972ddc80a50..7118ea86b57 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 2dfd53eb0b9..f89e8e5ae84 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 2ba5833f3c0..1a0a739d5d5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <limits.h> #define COBJMACROS diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 22342027cbc..ddf67ca0f73 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a2692b1a230..b5ff02bcee2 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index b71b0e7db6f..67025489751 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 4d7997e31a6..9b7f95e3bb0 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 301d9fa5dc3..ad801f8433b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c4bd3a84867..4ee81ba7e99 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 538e79f0b5e..d2a4a75fe90 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 243aea2e618..4519b06155e 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index ad74ad30966..178e9e52304 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index fb8c3830862..57f33732a01 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index c2e7f375ada..56a0572459a 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0ca4cd6397e..4196d1f45ad 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7bc645e549f..e3486aa3314 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include <assert.h> + #define NS_ERROR_GENERATE_FAILURE(module,code) \ ((nsresult) (((UINT32)(1u<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) #define NS_ERROR_GENERATE_SUCCESS(module,code) \ diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 247a3277927..abe403ea976 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 233f58c89fd..8cbe0ec9304 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d4fe7e96fc2..ae94f224fac 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b060ae521c5..21908b09563 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ea8eae2007d..abf05aaa41b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fb3ff8a8b73..c7ce641a949 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 43067b813a1..a8f829b6a57 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index d880cc89a9d..ad67db5548c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 8c802ee9ede..89f68046a33 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8f7f502e121..28e07a50c8e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 019327caa47..a72099f33b9 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index e1de57fc4b1..75036cb39d6 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 28cb88ab5f1..67b7633a5b4 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 814162acbbc..d7d8ce51593 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS -- 2.31.1

3 8

[PATCH] shell32: Fix unused knownfolder definition
by Andrew Eikum July 8, 2021

July 8, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51425 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/shell32/shellpath.c | 4 +-- dlls/shell32/tests/shellpath.c | 52 ++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 005e905baaa..2ffd608f645 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2445,9 +2445,9 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x45 */ &GUID_NULL, - CSIDL_Type_User, + CSIDL_Type_Disallowed, + NULL, NULL, - DocumentsW }, { /* 0x46 */ &FOLDERID_DocumentsLibrary, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index df9d4ecc949..0ba3734c518 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -111,6 +111,7 @@ static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; static const BYTE ieSpecialType[] = { PT_IESPECIAL2 }; static const BYTE shellExtType[] = { PT_SHELLEXT }; static const BYTE workgroupType[] = { PT_WORKGRP }; +static const BYTE missingType[] = { 0xff }; #define DECLARE_TYPE(x, y) { x, ARRAY_SIZE(y), y } static const struct shellExpectedValues requiredShellValues[] = { DECLARE_TYPE(CSIDL_BITBUCKET, guidType), @@ -178,6 +179,14 @@ static const struct shellExpectedValues optionalShellValues[] = { DECLARE_TYPE(CSIDL_RESOURCES, folderType), DECLARE_TYPE(CSIDL_RESOURCES_LOCALIZED, folderType), }; +static const struct shellExpectedValues undefinedShellValues[] = { + DECLARE_TYPE(0x0f, missingType), + DECLARE_TYPE(0x32, missingType), + DECLARE_TYPE(0x33, missingType), + DECLARE_TYPE(0x34, missingType), + DECLARE_TYPE(0x3c, missingType), + DECLARE_TYPE(0x45, missingType), +}; #undef DECLARE_TYPE static void loadShell32(void) @@ -1399,8 +1408,7 @@ static BYTE testSHGetSpecialFolderLocation(int folder) HRESULT hr; BYTE ret = 0xff; - /* treat absence of function as success */ - if (!pSHGetSpecialFolderLocation) return TRUE; + if (!pSHGetSpecialFolderLocation) return ret; pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); @@ -1447,8 +1455,14 @@ static void test_SHGetSpecialFolderPath(BOOL optional, int folder) getFolderName(folder)); } +enum ShellValuesTestExpect { + ShellValuesTestExpect_Required, + ShellValuesTestExpect_Optional, + ShellValuesTestExpect_Missing, +}; + static void test_ShellValues(const struct shellExpectedValues testEntries[], - int numEntries, BOOL optional) + int numEntries, enum ShellValuesTestExpect expect) { int i; @@ -1462,7 +1476,9 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + ok((expect == ShellValuesTestExpect_Required && foundTypeMatch) || + (expect == ShellValuesTestExpect_Optional) || + (expect == ShellValuesTestExpect_Missing && type == 0xff), "%s has unexpected type %d (0x%02x)\n", getFolderName(testEntries[i].folder), type, type); @@ -1471,18 +1487,23 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + ok((expect == ShellValuesTestExpect_Required && foundTypeMatch) || + (expect == ShellValuesTestExpect_Optional) || + (expect == ShellValuesTestExpect_Missing && type == 0xff), "%s has unexpected type %d (0x%02x)\n", getFolderName(testEntries[i].folder), type, type); - switch (type) + if (expect != ShellValuesTestExpect_Missing) { - case PT_FOLDER: - case PT_DRIVE: - case PT_DRIVE2: - case PT_IESPECIAL2: - test_SHGetFolderPath(optional, testEntries[i].folder); - test_SHGetSpecialFolderPath(optional, testEntries[i].folder); - break; + switch (type) + { + case PT_FOLDER: + case PT_DRIVE: + case PT_DRIVE2: + case PT_IESPECIAL2: + test_SHGetFolderPath(expect == ShellValuesTestExpect_Optional, testEntries[i].folder); + test_SHGetSpecialFolderPath(expect == ShellValuesTestExpect_Optional, testEntries[i].folder); + break; + } } } } @@ -1555,8 +1576,9 @@ static void test_PidlTypes(void) test_SHGetFolderPath(FALSE, CSIDL_DESKTOP); test_SHGetSpecialFolderPath(FALSE, CSIDL_DESKTOP); - test_ShellValues(requiredShellValues, ARRAY_SIZE(requiredShellValues), FALSE); - test_ShellValues(optionalShellValues, ARRAY_SIZE(optionalShellValues), TRUE); + test_ShellValues(requiredShellValues, ARRAY_SIZE(requiredShellValues), ShellValuesTestExpect_Required); + test_ShellValues(optionalShellValues, ARRAY_SIZE(optionalShellValues), ShellValuesTestExpect_Optional); + test_ShellValues(undefinedShellValues, ARRAY_SIZE(undefinedShellValues), ShellValuesTestExpect_Missing); } /* FIXME: Should be in shobjidl.idl */ -- 2.32.0

1 0

[PATCH vkd3d v2 1/2] vkd3d-shader: Normalize descriptor declaration registers to SM5.1.
by Conor McCarthy July 8, 2021

July 8, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 28 +++++++++++++++++++++------- libs/vkd3d-shader/trace.c | 13 +++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4bc62014..b81ac976 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -637,8 +637,8 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { - range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + range->first = reg->idx[1].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); @@ -1516,6 +1516,21 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p return true; } +static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) +{ + switch (register_type) + { + case VKD3D_SM4_RT_SAMPLER: + case VKD3D_SM4_RT_RESOURCE: + case VKD3D_SM4_RT_CONSTBUFFER: + case VKD3D_SM5_RT_UAV: + return true; + + default: + return false; + } +} + static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) @@ -1667,13 +1682,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } - else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) { - /* SM5.1 places the buffer offset in idx[2]; earlier versions place it - * in idx[1]. Normalize to SM5.1. */ + /* SM5.1 places a symbol identifier in idx[0] and moves + * other values up one slot. Normalize to SM5.1. */ param->idx[2] = param->idx[1]; - param->idx[1].rel_addr = NULL; - param->idx[1].offset = 0; + param->idx[1] = param->idx[0]; } map_register(priv, param); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2d16714b..79a60897 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -766,6 +766,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int offset = reg->idx[0].offset; + bool is_descriptor = false; static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; @@ -847,6 +848,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_SAMPLER: shader_addline(buffer, "s"); + is_descriptor = true; break; case VKD3DSPR_MISCTYPE: @@ -871,6 +873,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); + is_descriptor = true; break; case VKD3DSPR_IMMCONSTBUFFER: @@ -891,10 +894,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_RESOURCE: shader_addline(buffer, "t"); + is_descriptor = true; break; case VKD3DSPR_UAV: shader_addline(buffer, "u"); + is_descriptor = true; break; case VKD3DSPR_OUTPOINTID: @@ -1057,11 +1062,11 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); } - /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] - * to normalise it with 5.1. - * Here we should ignore it if it's a CB in sm < 5.1. */ + /* For descriptors in sm < 5.1 we move the reg->idx values up one slot + * to normalise with 5.1. + * Here we should ignore it if it's a descriptor in sm < 5.1. */ if (reg->idx[1].offset != ~0u && - (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) + (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1))) shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u) -- 2.31.1

2 3