June 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move CheckMenuRadioItem implementation from user32.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: d7dba1ed740708d584093152d571f8f0b1440bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dba1ed740708d584093152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:53:02 2022 +0200 win32u: Move CheckMenuRadioItem implementation from user32. --- dlls/user32/menu.c | 49 +++++-------------------------------------------- dlls/win32u/menu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 342ee08a89b..043af437356 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1098,51 +1098,12 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, /********************************************************************** * CheckMenuRadioItem (USER32.@) */ - -BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, - UINT check, UINT flags) +BOOL WINAPI CheckMenuRadioItem( HMENU menu, UINT first, UINT last, UINT check, UINT flags ) { - POPUPMENU *first_menu = NULL, *check_menu; - UINT i, check_pos; - BOOL done = FALSE; - - for (i = first; i <= last; i++) - { - MENUITEM *item; - - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - - if (!first_menu) - first_menu = grab_menu_ptr(check_menu->obj.handle); - - if (first_menu != check_menu) - { - release_menu_ptr(check_menu); - continue; - } - - item = &check_menu->items[check_pos]; - if (item->fType != MFT_SEPARATOR) - { - if (i == check) - { - item->fType |= MFT_RADIOCHECK; - item->fState |= MFS_CHECKED; - done = TRUE; - } - else - { - /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ - item->fState &= ~MFS_CHECKED; - } - } - - release_menu_ptr(check_menu); - } - release_menu_ptr(first_menu); - - return done; + MENUITEMINFOW info; /* abuse to pass last and check */ + info.cch = last; + info.fMask = check; + return NtUserThunkedMenuItemInfo( menu, first, flags, NtUserCheckMenuRadioItem, &info, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index eab97e58d39..4ba5b42ec9d 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1109,6 +1109,48 @@ static BOOL get_menu_item_info( HMENU handle, UINT id, UINT flags, MENUITEMINFOW return TRUE; } +static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT check, UINT flags ) +{ + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; + BOOL done = FALSE; + + for (i = first; i <= last; i++) + { + MENUITEM *item; + + if (!(check_menu = find_menu_item( handle, i, flags, &check_pos ))) continue; + if (!first_menu) first_menu = grab_menu_ptr( check_menu->obj.handle ); + + if (first_menu != check_menu) + { + release_menu_ptr(check_menu); + continue; + } + + item = &check_menu->items[check_pos]; + if (item->fType != MFT_SEPARATOR) + { + if (i == check) + { + item->fType |= MFT_RADIOCHECK; + item->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* Windows does not remove MFT_RADIOCHECK */ + item->fState &= ~MFS_CHECKED; + } + } + + release_menu_ptr( check_menu ); + } + + release_menu_ptr( first_menu ); + return done; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1121,6 +1163,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT switch (method) { + case NtUserCheckMenuRadioItem: + return check_menu_radio_item( handle, pos, info->cch, info->fMask, flags ); + case NtUserGetMenuItemID: if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1; ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID; diff --git a/include/ntuser.h b/include/ntuser.h index 41b328376a9..e15345bb7d6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -224,6 +224,7 @@ enum NtUserSetMenuItemInfo, NtUserInsertMenuItem, /* Wine extensions */ + NtUserCheckMenuRadioItem, NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW,

1 0

Zebediah Figura : d3d11/tests: Add tests for D3D11_FORMAT_SUPPORT_BLENDABLE.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: fcc276ecb1508d5217ec977ca530ee7d30d355b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc276ecb1508d5217ec977c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 15 13:30:19 2022 -0500 d3d11/tests: Add tests for D3D11_FORMAT_SUPPORT_BLENDABLE. --- dlls/d3d11/tests/d3d11.c | 55 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 345a87c4194..4856aa32358 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20758,9 +20758,9 @@ static void test_line_antialiasing_blending(void) release_test_context(&test_context); } -static void check_format_support(const unsigned int *format_support, D3D_FEATURE_LEVEL feature_level, - const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, - const char *feature_name) +static void check_format_support(ID3D11Device *device, const unsigned int *format_support, + D3D_FEATURE_LEVEL feature_level, const struct format_support *formats, + unsigned int format_count, unsigned int feature_flag, const char *feature_name) { unsigned int i; @@ -20771,8 +20771,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) - ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY || feature_flag == D3D11_FORMAT_SUPPORT_BLENDABLE) + ok(supported || broken(is_warp_device(device)), + "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); continue; } @@ -20785,7 +20786,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY) + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY && feature_flag != D3D11_FORMAT_SUPPORT_BLENDABLE) ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); } @@ -20814,6 +20815,39 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; + static const struct format_support blend[] = + { + {DXGI_FORMAT_R16G16B16A16_UNORM, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16G16_UNORM, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16_UNORM, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16G16B16A16_SNORM, D3D_FEATURE_LEVEL_10_1}, + {DXGI_FORMAT_R16G16_SNORM, D3D_FEATURE_LEVEL_10_1}, + {DXGI_FORMAT_R16_SNORM, D3D_FEATURE_LEVEL_10_1}, + {DXGI_FORMAT_R8G8B8A8_SNORM, D3D_FEATURE_LEVEL_10_1}, + {DXGI_FORMAT_R8G8_SNORM, D3D_FEATURE_LEVEL_10_1}, + {DXGI_FORMAT_R8_SNORM, D3D_FEATURE_LEVEL_10_1}, + + {DXGI_FORMAT_R32G32B32A32_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R32G32_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R32_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10A2_UNORM, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, + + {DXGI_FORMAT_R16G16B16A16_FLOAT, D3D_FEATURE_LEVEL_9_3}, + + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8G8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B5G6R5_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8X8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + }; + device_desc.feature_level = &feature_level; device_desc.flags = 0; if (!(device = create_device(&device_desc))) @@ -20875,18 +20909,21 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); } - check_format_support(format_support, feature_level, + check_format_support(device, format_support, feature_level, index_buffers, ARRAY_SIZE(index_buffers), D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); - check_format_support(format_support, feature_level, + check_format_support(device, format_support, feature_level, vertex_buffers, ARRAY_SIZE(vertex_buffers), D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); - check_format_support(format_support, feature_level, + check_format_support(device, format_support, feature_level, display_format_support, ARRAY_SIZE(display_format_support), D3D11_FORMAT_SUPPORT_DISPLAY, "display"); + check_format_support(device, format_support, feature_level, blend, ARRAY_SIZE(blend), + D3D11_FORMAT_SUPPORT_BLENDABLE, "blendable"); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Zebediah Figura : wined3d: Add Vulkan format information for WINED3DFMT_B5G6R5_UNORM.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 14028eaff0f6c5334541aef6e3fc29558a4535c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14028eaff0f6c5334541aef6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 15 15:16:36 2022 -0500 wined3d: Add Vulkan format information for WINED3DFMT_B5G6R5_UNORM. --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 381c1ae7bc6..7761576c058 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4300,6 +4300,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, + {WINED3DFMT_B5G6R5_UNORM, VK_FORMAT_R5G6B5_UNORM_PACK16, }, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0

Zebediah Figura : wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC and VK_FORMAT_FEATURE_TRANSFER_DST.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 154d7164f86569f216691c9ea379ac8d4436e05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=154d7164f86569f216691c9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 15 15:23:20 2022 -0500 wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC and VK_FORMAT_FEATURE_TRANSFER_DST. Vulkan 1.0 implementations without KHR_maintenance1 will still be broken. In order to work around this we would have to try creating textures with TRANSFER_* usage. This does not seem worthwhile. --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7761576c058..06c95135678 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4397,6 +4397,11 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { caps |= WINED3D_FORMAT_CAP_UNORDERED_ACCESS; } + if ((texture_flags & VK_FORMAT_FEATURE_TRANSFER_SRC_BIT) + && (texture_flags & VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) + { + caps |= WINED3D_FORMAT_CAP_BLIT; + } if (!(~caps & (WINED3D_FORMAT_CAP_RENDERTARGET | WINED3D_FORMAT_CAP_FILTERING))) caps |= WINED3D_FORMAT_CAP_GEN_MIPMAP;

1 0

Zebediah Figura : wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format().
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 83d3e14da1771d8402abb86346e1154d5703c408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d3e14da1771d8402abb863… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 15 16:46:21 2022 -0500 wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format(). WINED3D_GL_RES_TYPE_RB is not used by the Vulkan backend. We could alternatively solve this by filling WINED3D_GL_RES_TYPE_RB for the Vulkan backend, but this makes less sense. Checking both formats is more in line with what is done elsewhere, e.g. wined3d_check_surface_format(). --- dlls/wined3d/directx.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6f8d1edad6e..85405eaa6b5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1974,6 +1974,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_bind_flags = WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { if (!wined3d_check_surface_format(format)) @@ -1981,8 +1982,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id)); return WINED3DERR_NOTAVAILABLE; } - - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_RB; break; } allowed_usage |= WINED3DUSAGE_DYNAMIC @@ -1996,7 +1995,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; allowed_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (usage & WINED3DUSAGE_LEGACY_CUBEMAP) { allowed_usage &= ~WINED3DUSAGE_QUERY_LEGACYBUMPMAP; @@ -2095,10 +2093,15 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, for (; gl_type <= gl_type_end; ++gl_type) { - if ((format->caps[gl_type] & format_caps) != format_caps) + unsigned int caps = format->caps[gl_type]; + + if (gl_type == WINED3D_GL_RES_TYPE_TEX_2D && !(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) + caps |= format->caps[WINED3D_GL_RES_TYPE_RB]; + + if ((caps & format_caps) != format_caps) { TRACE("Requested format caps %#x, but format %s only has %#x.\n", - format_caps, debug_d3dformat(check_format_id), format->caps[gl_type]); + format_caps, debug_d3dformat(check_format_id), caps); return WINED3DERR_NOTAVAILABLE; } @@ -2129,7 +2132,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } - if (!(format->caps[gl_type] & WINED3D_FORMAT_CAP_GEN_MIPMAP)) + if (!(caps & WINED3D_FORMAT_CAP_GEN_MIPMAP)) mipmap_gen_supported = FALSE; }

1 0

Zebediah Figura : d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: c59d25d3aea669f505c83b89dcad331e1e116757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59d25d3aea669f505c83b89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 15 15:24:44 2022 -0500 d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D. This fixes rendering in Raft. --- dlls/d3d11/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e93cdf74518..d510cebb110 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3886,7 +3886,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, - {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE}, }; HRESULT hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4856aa32358..5ba6bb7ce14 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20771,7 +20771,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma if (formats[i].fl_required <= feature_level) { - todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY || feature_flag == D3D11_FORMAT_SUPPORT_BLENDABLE) + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) ok(supported || broken(is_warp_device(device)), "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); @@ -20786,7 +20786,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma continue; } - todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY && feature_flag != D3D11_FORMAT_SUPPORT_BLENDABLE) + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY) ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); }

1 0

Alexandre Julliard : make_unicode: Make support of registry values more generic.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 630f605c2671ef3232f5ac1345582cce2547ccf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=630f605c2671ef3232f5ac13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 10:54:01 2022 +0200 make_unicode: Make support of registry values more generic. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 3 -- tools/make_unicode | 88 +++++++++++++++++++++++++++++------------- 2 files changed, 62 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index da998e72927..682a0a77e60 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -356,9 +356,6 @@ HKLM val '0000540a' = s '1' val '0000580a' = s '1' val '00005c0a' = s '1' - } - Locale - { 'Alternate Sorts' { val '0000040a' = s '1' diff --git a/tools/make_unicode b/tools/make_unicode index 33253104eb6..9173e834709 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -46,6 +46,8 @@ my $DEF_CHAR = ord '?'; # Last valid Unicode character my $MAX_CHAR = 0x10ffff; +my $nlskey = "-SYSTEM\\-CurrentControlSet\\-Control\\-Nls"; + my @allfiles = ( "CodpageFiles/037.txt", @@ -2268,19 +2270,44 @@ sub load_data() ################################################################ # add a new registry key -sub add_registry_key($$) +sub add_registry_key($$$) +{ + my ($base, $key, $defval) = @_; + $registry_keys{"$base\\$key"} = [ $defval ] unless defined $registry_keys{"$base\\$key"}; +} + +################################################################ +# add a new registry value with explicit type +sub add_registry_value($$$$) { - my ($key, $defval) = @_; - $registry_keys{$key} = [ $defval ] unless defined $registry_keys{$key}; + my ($base, $key, $name, $value) = @_; + add_registry_key( $base, $key, undef ); + push @{$registry_keys{"$base\\$key"}}, "'$name' = $value"; } ################################################################ -# add a new registry value -sub add_registry_value($$$) +# add a new registry string value +sub add_registry_string_value($$$$) { - my ($key, $name, $value) = @_; - add_registry_key( $key, undef ); - push @{$registry_keys{$key}}, "'$name' = s '$value'"; + my ($base, $key, $name, $value) = @_; + $value =~ s/\'/\'\'/g; + add_registry_value( $base, $key, $name, "s '$value'" ); +} + +################################################################ +# add a new registry dword value +sub add_registry_dword_value($$$$) +{ + my ($base, $key, $name, $value) = @_; + add_registry_value( $base, $key, $name, "d $value" ); +} + +################################################################ +# add a new registry binary value +sub add_registry_binary_value($$$$) +{ + my ($base, $key, $name, $value) = @_; + add_registry_value( $base, $key, $name, "b " . join "", map { sprintf "%02x", $_; } unpack( "C*", $value )); } ################################################################ @@ -3603,7 +3630,7 @@ sub dump_norm_table($) close OUTPUT; save_file($filename); - add_registry_value( "Normalization", sprintf( "%x", $forms{$type} ), "norm$type.nls" ); + add_registry_string_value( $nlskey, "Normalization", sprintf( "%x", $forms{$type} ), "norm$type.nls" ); } @@ -3623,7 +3650,7 @@ sub output_codepage_file($) close OUTPUT; save_file($output); - add_registry_value( "Codepage", sprintf( "%d", $codepage ), sprintf( "c_%03d.nls", $codepage )); + add_registry_string_value( $nlskey, "Codepage", sprintf( "%d", $codepage ), sprintf( "c_%03d.nls", $codepage )); } ################################################################ @@ -4098,14 +4125,14 @@ sub dump_sortkey_table($$) # Locales - add_registry_key( "Sorting\\Ids", "{$default_guid}" ); + add_registry_key( $nlskey, "Sorting\\Ids", "{$default_guid}" ); foreach my $loc (sort keys %locales) { # skip specific locales that match more general ones my @parts = split /[-_]/, $loc; next if @parts > 1 && defined($locales{$parts[0]}) && $locales{$parts[0]} eq $locales{$loc}; next if @parts > 2 && defined($locales{"$parts[0]-$parts[1]"}) && $locales{"$parts[0]-$parts[1]"} eq $locales{$loc}; - add_registry_value( "Sorting\\Ids", $loc, "\{$locales{$loc}\}" ); + add_registry_string_value( $nlskey, "Sorting\\Ids", $loc, "\{$locales{$loc}\}" ); } # File header @@ -4956,7 +4983,7 @@ sub build_locale_data() # output language groups my %groups; - add_registry_key( "Locale", "00000409" ); + add_registry_key( $nlskey, "Locale", "00000409" ); foreach my $loc (@locales) { next unless defined $loc->{lcid}; @@ -4965,11 +4992,11 @@ sub build_locale_data() my $group = locale_entry( $loc, "group", 1 ); my $name = sprintf( "%08x", $loc->{lcid} ); my $val = sprintf( "%x", $group ); - add_registry_value( "Locale", $name, $val ) unless ($loc->{lcid} & 0x000f0000); - add_registry_value( "Locale\\Alternate Sorts", $name, $val ) if $loc->{name} =~ /_/; + add_registry_string_value( $nlskey, "Locale", $name, $val ) unless ($loc->{lcid} & 0x000f0000); + add_registry_string_value( $nlskey, "Locale\\Alternate Sorts", $name, $val ) if $loc->{name} =~ /_/; $groups{$val} = 1; } - foreach my $group (keys %groups) { add_registry_value( "Language Groups", $group, "1" ); } + foreach my $group (keys %groups) { add_registry_string_value( $nlskey, "Language Groups", $group, "1" ); } # output calendar data @@ -5263,30 +5290,39 @@ sub dump_registry_script($%) { my ($filename, %keys) = @_; my $indent = 1; + my @prev; printf "Building %s\n", $filename; open OUTPUT, ">$filename.new" or die "Cannot create $filename"; print OUTPUT "HKLM\n{\n"; - foreach my $k (split /\\/, "SYSTEM\\CurrentControlSet\\Control\\Nls") - { - printf OUTPUT "%*sNoRemove %s\n%*s{\n", 4 * $indent, "", $k, 4 * $indent, ""; - $indent++; - } - foreach my $k (sort keys %keys) + foreach my $k (sort { ($a =~ tr/a-z\\/A-Z\001/r) cmp ($b =~ tr/a-z\\/A-Z\001/r) } keys %keys) { my @subkeys = split /\\/, $k; + while (@prev && @subkeys && $prev[0] eq $subkeys[0]) { shift @prev; shift @subkeys; } + while (@prev) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; shift @prev; } my ($def, @vals) = @{$keys{$k}}; for (my $i = 0; $i < @subkeys; $i++) { - printf OUTPUT "%*s%s%s\n%*s{\n", 4 * $indent, "", - $subkeys[$i] =~ /\s/ ? "'$subkeys[$i]'" : $subkeys[$i], + my $name = $subkeys[$i]; + my $prefix = ""; + if ($name =~ /^-/) + { + $name =~ s/^-//; + $prefix = "NoRemove "; + } + if ($name =~ /\s/) + { + $name = "'$name'"; + } + printf OUTPUT "%*s%s%s%s\n%*s{\n", 4 * $indent, "", $prefix, $name, $i == $#subkeys && $def ? " = s '$def'" : "", 4 * $indent, ""; $indent++; } foreach my $v (sort @vals) { printf OUTPUT "%*sval $v\n", 4 * $indent, ""; } - for (my $i = 0; $i < @subkeys; $i++) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } + @prev = split /\\/, $k; } - while ($indent) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; } + while (@prev) { printf OUTPUT "%*s}\n", 4 * --$indent, ""; shift @prev; } + printf OUTPUT "}\n"; close OUTPUT; save_file($filename); }

1 0

Nikolay Sivov : regedit: Add support for REG_QWORD type.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 3b1faf59f60c2e5d91321fd8998dd81d90a13e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1faf59f60c2e5d91321fd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 23 18:51:22 2022 +0300 regedit: Add support for REG_QWORD type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ar.po | 353 +++++++++++++++++++++++--------------------- po/ast.po | 349 ++++++++++++++++++++++--------------------- po/bg.po | 353 +++++++++++++++++++++++--------------------- po/ca.po | 353 +++++++++++++++++++++++--------------------- po/cs.po | 353 +++++++++++++++++++++++--------------------- po/da.po | 353 +++++++++++++++++++++++--------------------- po/de.po | 353 +++++++++++++++++++++++--------------------- po/el.po | 347 ++++++++++++++++++++++--------------------- po/en.po | 347 ++++++++++++++++++++++--------------------- po/en_US.po | 347 ++++++++++++++++++++++--------------------- po/eo.po | 353 +++++++++++++++++++++++--------------------- po/es.po | 353 +++++++++++++++++++++++--------------------- po/fa.po | 347 ++++++++++++++++++++++--------------------- po/fi.po | 353 +++++++++++++++++++++++--------------------- po/fr.po | 353 +++++++++++++++++++++++--------------------- po/he.po | 353 +++++++++++++++++++++++--------------------- po/hi.po | 347 ++++++++++++++++++++++--------------------- po/hr.po | 347 ++++++++++++++++++++++--------------------- po/hu.po | 353 +++++++++++++++++++++++--------------------- po/it.po | 353 +++++++++++++++++++++++--------------------- po/ja.po | 353 +++++++++++++++++++++++--------------------- po/ko.po | 353 +++++++++++++++++++++++--------------------- po/lt.po | 353 +++++++++++++++++++++++--------------------- po/ml.po | 347 ++++++++++++++++++++++--------------------- po/nb_NO.po | 353 +++++++++++++++++++++++--------------------- po/nl.po | 353 +++++++++++++++++++++++--------------------- po/or.po | 347 ++++++++++++++++++++++--------------------- po/pa.po | 347 ++++++++++++++++++++++--------------------- po/pl.po | 353 +++++++++++++++++++++++--------------------- po/pt_BR.po | 353 +++++++++++++++++++++++--------------------- po/pt_PT.po | 353 +++++++++++++++++++++++--------------------- po/rm.po | 347 ++++++++++++++++++++++--------------------- po/ro.po | 353 +++++++++++++++++++++++--------------------- po/ru.po | 353 +++++++++++++++++++++++--------------------- po/si.po | 353 +++++++++++++++++++++++--------------------- po/sk.po | 351 ++++++++++++++++++++++--------------------- po/sl.po | 353 +++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 347 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 347 ++++++++++++++++++++++--------------------- po/sv.po | 353 +++++++++++++++++++++++--------------------- po/ta.po | 347 ++++++++++++++++++++++--------------------- po/te.po | 347 ++++++++++++++++++++++--------------------- po/th.po | 347 ++++++++++++++++++++++--------------------- po/tr.po | 353 +++++++++++++++++++++++--------------------- po/uk.po | 353 +++++++++++++++++++++++--------------------- po/wa.po | 347 ++++++++++++++++++++++--------------------- po/wine.pot | 347 ++++++++++++++++++++++--------------------- po/zh_CN.po | 353 +++++++++++++++++++++++--------------------- po/zh_TW.po | 353 +++++++++++++++++++++++--------------------- programs/regedit/edit.c | 29 +++- programs/regedit/framewnd.c | 5 +- programs/regedit/listview.c | 12 ++ programs/regedit/regedit.rc | 5 + programs/regedit/resource.h | 2 + 54 files changed, 9051 insertions(+), 8191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b1faf59f60c2e5d9132…

1 0

Nikolay Sivov : regedit: Remove unnecessary string conversion when modifying REG_DWORD value.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: wine Branch: master Commit: 208f631ceec2fe6f25075030c7a2364360e181bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=208f631ceec2fe6f25075030… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 24 01:53:09 2022 +0300 regedit: Remove unnecessary string conversion when modifying REG_DWORD value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/regedit/edit.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e18b6ca5846..c19ef1506fa 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -284,16 +284,16 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) DWORD value = *((DWORD*)stringValueData); stringValueData = heap_xrealloc(stringValueData, 64); wsprintfW(stringValueData, L"%x", value); - if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { - DWORD val; - CHAR* valueA = GetMultiByteString(stringValueData); - if (sscanf(valueA, isDecimal ? "%lu" : "%lx", &val)) { - lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); - if (lRet == ERROR_SUCCESS) result = TRUE; + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) + { + DWORD val; + if (swscanf(stringValueData, isDecimal ? L"%lu" : L"%lx", &val)) + { + lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); + if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); - } - heap_free(valueA); - } + } + } } else if ( type == REG_QWORD ) { UINT64 value = *((UINT64 *)stringValueData); stringValueData = heap_xrealloc(stringValueData, 64);

1 0

Francois Gouget : testbot: Treat regular expression warnings as errors.
by Alexandre Julliard 24 Jun '22

24 Jun '22

Module: tools Branch: master Commit: bf85455d64e25705afd326ef335e99f1a1d218cf URL: https://source.winehq.org/git/tools.git/?a=commit;h=bf85455d64e25705afd326e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 24 16:24:51 2022 +0200 testbot: Treat regular expression warnings as errors. In particular do so when validating failures so errors are caught when the failure is created / modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 1 + testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 90620511..dc307bfa 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -104,6 +104,7 @@ sub Validate($) my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { + use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { return "The $Name regular expression should not match empty strings"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9e73b5f6..41016314 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1390,7 +1390,10 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/; + }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; @@ -1412,7 +1415,10 @@ sub MatchLogFailures($$) foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; - my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + $RegExp and $Line =~ /$RegExp/; + }; next if (!$Match); my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= [];

1 0