January 2022 - Wine-devel - list.winehq.org

Soon Windows 8 clean runs on the TestBot?
by Francois Gouget 10 Jan '22

10 Jan '22

1 0

[PATCH] po: Update German translation.
by Julian Rüger 10 Jan '22

10 Jan '22

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

1 0

[PATCH 1/3] ddraw/tests: Reduce precision in test_filling_convention.
by Stefan Dösinger 10 Jan '22

10 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- d3d9 and earlier cards fail this test (tested on r500 and by Matteo on a gf4go, aka gf2). Since applications using ddraw.dll are unlikely to depend on the higher precision of d3d10+ cards, unconditionally increase the added offsets in the test. As far as my hardware is concerned we can now remove the todo_wine in this test because the offset we add for the "nudge" primitives is larger than the offset wined3d adds for correcting the filling convention. I'll wait for Matteo's word on the geforce 4 though. --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11c14777122..efbecf04c2d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14513,8 +14513,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 33ad957b644..65ac21d73ad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15443,8 +15443,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61828430331..ce2333d93f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18493,8 +18493,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc0f854e125..4cf57bfcfd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18745,8 +18745,10 @@ static void test_filling_convention(void) D3DVIEWPORT7 vp = { 0, 0, vp_size, vp_size, 0.0, 1.0 }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; -- 2.34.1

3 6

[PATCH] d3d11: Always initialize out view pointer in CreateRenderTargetView().
by Nikolay Sivov 10 Jan '22

10 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51195 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d7fc9efa901..ca12f185ec5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2939,8 +2939,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -3057,8 +3059,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D10Resource_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 546449037ce..626e4889708 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3334,6 +3334,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; @@ -5957,6 +5959,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a76e5fa1295..b8fa462dc39 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4050,8 +4050,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -4168,8 +4170,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D11Resource_Release(texture); } -- 2.34.1

3 2

[PATCH] ntdll: set user_shared_data to 0x7fffffff0000 and virtual_alloc_first_teb can run succeeded on android aarch64
by fanwj＠mail.ustc.edu.cn 10 Jan '22

10 Jan '22

--- dlls/ntdll/unix/virtual.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1f817cd977d..543c04e0dae 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -173,7 +173,16 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +#if defined(__aarch64__) && defined(__ANDROID__) +/* Note: Android-AARCH64 only support 3-level page table: + * user_shared_data = page_size * pow(page_size / ptr_size, page_level) - 0x20000 + * = 0x1000 * pow(0x1000 / 8, 3) - 0x20000 + * = 0x7ffffe0000 + */ +struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffffe0000; +#else struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +#endif /* TEB allocation blocks */ static void *teb_block; -- 2.32.0 (Apple Git-132)

2 1

[PATCH vkd3d] vkd3d: Handle D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE using a Vulkan extension.
by Conor McCarthy 10 Jan '22

10 Jan '22

Used by Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 14 +++++++++----- libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index afe2c6c3..6e850a6d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -128,6 +128,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), + VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), /* EXT extensions */ VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6cc9c565..fe1f7fc4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3143,7 +3143,8 @@ static VkSamplerMipmapMode vk_mipmap_mode_from_d3d12(D3D12_FILTER_TYPE type) } } -static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MODE mode) +static VkSamplerAddressMode vk_address_mode_from_d3d12(const struct d3d12_device *device, + D3D12_TEXTURE_ADDRESS_MODE mode) { switch (mode) { @@ -3155,7 +3156,10 @@ static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MOD return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; case D3D12_TEXTURE_ADDRESS_MODE_BORDER: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; - /* D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE requires VK_KHR_mirror_clamp_to_edge. */ + case D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE: + if (device->vk_info.KHR_sampler_mirror_clamp_to_edge) + return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; + /* Fall through */ default: FIXME("Unhandled address mode %#x.\n", mode); return VK_SAMPLER_ADDRESS_MODE_REPEAT; @@ -3184,9 +3188,9 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f sampler_desc.magFilter = vk_filter_from_d3d12(D3D12_DECODE_MAG_FILTER(filter)); sampler_desc.minFilter = vk_filter_from_d3d12(D3D12_DECODE_MIN_FILTER(filter)); sampler_desc.mipmapMode = vk_mipmap_mode_from_d3d12(D3D12_DECODE_MIP_FILTER(filter)); - sampler_desc.addressModeU = vk_address_mode_from_d3d12(address_u); - sampler_desc.addressModeV = vk_address_mode_from_d3d12(address_v); - sampler_desc.addressModeW = vk_address_mode_from_d3d12(address_w); + sampler_desc.addressModeU = vk_address_mode_from_d3d12(device, address_u); + sampler_desc.addressModeV = vk_address_mode_from_d3d12(device, address_v); + sampler_desc.addressModeW = vk_address_mode_from_d3d12(device, address_w); sampler_desc.mipLodBias = mip_lod_bias; sampler_desc.anisotropyEnable = D3D12_DECODE_IS_ANISOTROPIC_FILTER(filter); sampler_desc.maxAnisotropy = max_anisotropy; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a3289878..d448eaa0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -118,6 +118,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance3; bool KHR_push_descriptor; + bool KHR_sampler_mirror_clamp_to_edge; /* EXT device extensions */ bool EXT_conditional_rendering; bool EXT_debug_marker; -- 2.34.1

2 1

[PATCH vkd3d] vkd3d-shader/dxbc: Emit a fixme when a DXIL shader chunk is found.
by Conor McCarthy 10 Jan '22

10 Jan '22

Simplifies detection of SM6+ shaders, e.g. Horizon Zero Dawn and Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b83e2654..c5ba3575 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2024,6 +2024,10 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont TRACE("Skipping AON9 shader code chunk.\n"); break; + case TAG_DXIL: + FIXME("Skipping DXIL shader model 6+ code chunk.\n"); + break; + default: TRACE("Skipping chunk %#x.\n", tag); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 62073cf1..9c022777 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1218,6 +1218,7 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L') #define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1') -- 2.34.1

2 1

[PATCH] ntdll: set correct address_space_limit and user_shared_data for android aarch64, virtual_alloc_first_teb can run succeeded on android aarch64
by fanwj＠mail.ustc.edu.cn 10 Jan '22

10 Jan '22

--- dlls/ntdll/unix/virtual.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1f817cd977d..65ab5032ce1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -158,14 +158,22 @@ static void *address_space_start = (void *)0x10000; #endif #ifdef __aarch64__ +#ifdef __ANDROID__ +/* Note: Android-AARCH64 only support 3-level page table, address_space_limit is page_size * pow(page_size / ptr_size, page_level) - 0x10000 = 4096 * pow(4096 / 8, 3) - 0x10000 = 0x7fffff0000 */ +static void *address_space_limit = (void *)0x7fffff0000; +#else static void *address_space_limit = (void *)0xffffffff0000; /* top of the total available address space */ +#endif #elif defined(_WIN64) static void *address_space_limit = (void *)0x7fffffff0000; #else static void *address_space_limit = (void *)0xc0000000; #endif -#ifdef _WIN64 +#if defined(__aarch64__) && defined(__ANDROID__) +static void *user_space_limit = (void *)0x7fffff0000; /* top of the user address space */ +static void *working_set_limit = (void *)0x7fffff0000; /* top of the current working set */ +#elif defined(_WIN64) static void *user_space_limit = (void *)0x7fffffff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fffffff0000; /* top of the current working set */ #else @@ -173,7 +181,11 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +#if defined(__aarch64__) && defined(__ANDROID__) +struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffffe0000; /* user_shared_data use last 64kB address, set to address_space_limit - 0x10000 */ +#else struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +#endif /* TEB allocation blocks */ static void *teb_block; -- 2.32.0 (Apple Git-132)

1 0

[PATCH] kernel32/tests: Use INVALID_HANDLE_VALUE instead of 0xffffffff
by Alex Henrie 10 Jan '22

10 Jan '22

There's no guarantee that 0xffffffff is an invalid handle on 64-bit. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 8ec3a5433ee..77338e7f767 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -206,13 +206,13 @@ static void testGetModuleFileName_Wrong(void) if (is_unicode_enabled) { bufW[0] = '*'; - ok(GetModuleFileNameW((void*)0xffffffff, bufW, ARRAY_SIZE(bufW)) == 0, + ok(GetModuleFileNameW(INVALID_HANDLE_VALUE, bufW, ARRAY_SIZE(bufW)) == 0, "Unexpected success in module handle\n"); ok(bufW[0] == '*', "When failing, buffer shouldn't be written to\n"); } bufA[0] = '*'; - ok(GetModuleFileNameA((void*)0xffffffff, bufA, sizeof(bufA)) == 0, "Unexpected success in module handle\n"); + ok(GetModuleFileNameA(INVALID_HANDLE_VALUE, bufA, sizeof(bufA)) == 0, "Unexpected success in module handle\n"); ok(bufA[0] == '*', "When failing, buffer shouldn't be written to\n"); } -- 2.34.1

2 1

[PATCH v3 1/2] server: Terminating '\' in the registry root name is optional.
by Dmitry Timoshkov 10 Jan '22

10 Jan '22

v3: Check the length and reject invalid root name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 2 -- server/registry.c | 62 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..74d82b85be4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -417,7 +417,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +568,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..4ed3ee9896e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = sizeof(root_name); char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + memcpy( ret, root_name, sizeof(root_name) ); return (WCHAR *)ret; } @@ -474,7 +474,7 @@ static void key_destroy( struct object *obj ) } /* get the request vararg as registry path */ -static inline void get_req_path( struct unicode_str *str, int skip_root ) +static inline struct unicode_str *get_req_path( struct unicode_str *str, int skip_root ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); @@ -483,7 +483,19 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); + if (str->len) + { + if (str->str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return NULL; + } + + str->str++; + str->len -= sizeof(WCHAR); + } } + return str; } /* return the next token in a given path */ @@ -734,6 +746,12 @@ static struct key *follow_symlink( struct key *key, int iteration ) if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); + if (path.len) + { + if (path.str[0] != '\\') return NULL; + path.str++; + path.len -= sizeof(WCHAR); + } key = root_key; token.str = NULL; @@ -2156,6 +2174,17 @@ DECL_HANDLER(create_key) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len) + { + if (name.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return; + } + + name.str++; + name.len -= sizeof(WCHAR); + } } /* NOTE: no access rights are required from the parent handle to create a key */ @@ -2184,7 +2213,12 @@ DECL_HANDLER(open_key) /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + if (!get_req_path( &name, !req->parent )) + { + release_object( parent ); + return; + } + if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); @@ -2314,6 +2348,17 @@ DECL_HANDLER(load_registry) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len) + { + if (name.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return; + } + + name.str++; + name.len -= sizeof(WCHAR); + } } if ((parent = get_parent_hkey_obj( objattr->rootdir ))) @@ -2344,7 +2389,12 @@ DECL_HANDLER(unload_registry) if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + if (!get_req_path( &name, !req->parent )) + { + release_object( parent ); + return; + } + if ((key = open_key( parent, &name, access, req->attributes ))) { if (key->obj.handle_count) -- 2.34.1

2 2