February 2024 - Wine-commits

Zebediah Figura : kernelbase: Do not canonicalize the relative part in UrlCombine().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 80a92c07f566e396e68280316efb46ba5fb9099a URL: https://gitlab.winehq.org/wine/wine/-/commit/80a92c07f566e396e68280316efb46… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 00:33:45 2024 -0600 kernelbase: Do not canonicalize the relative part in UrlCombine(). --- dlls/kernelbase/path.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 067bb0c87a7..5f25135ba11 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4662,7 +4662,7 @@ HRESULT WINAPI UrlCombineA(const char *base, const char *relative, char *combine HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *combined, DWORD *combined_len, DWORD flags) { DWORD i, len, process_case = 0, myflags, sizeloc = 0; - LPWSTR work, preliminary, mbase, mrelative; + LPWSTR work, preliminary, mbase, canonicalized; PARSEDURLW base, relative; HRESULT hr; @@ -4677,7 +4677,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co /* Get space for duplicates of the input and the output */ preliminary = heap_alloc(3 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); mbase = preliminary + INTERNET_MAX_URL_LENGTH; - mrelative = mbase + INTERNET_MAX_URL_LENGTH; + canonicalized = mbase + INTERNET_MAX_URL_LENGTH; *preliminary = '\0'; /* Canonicalize the base input prior to looking for the scheme */ @@ -4685,10 +4685,6 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co len = INTERNET_MAX_URL_LENGTH; UrlCanonicalizeW(baseW, mbase, &len, myflags); - /* Canonicalize the relative input prior to looking for the scheme */ - len = INTERNET_MAX_URL_LENGTH; - UrlCanonicalizeW(relativeW, mrelative, &len, myflags); - /* See if the base has a scheme */ if (ParseURLW(mbase, &base) != S_OK) { @@ -4787,12 +4783,12 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co * the last '/' */ - if (ParseURLW(mrelative, &relative) != S_OK) + if (ParseURLW(relativeW, &relative) != S_OK) { /* No scheme in relative */ TRACE("no scheme detected in Relative\n"); - relative.pszSuffix = mrelative; /* case 3,4,5 depends on this */ - relative.cchSuffix = lstrlenW(mrelative); + relative.pszSuffix = relativeW; /* case 3,4,5 depends on this */ + relative.cchSuffix = lstrlenW( relativeW ); if (*relativeW == ':') { /* Case that is either left alone or uses base. */ @@ -4804,26 +4800,26 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co process_case = 1; break; } - if (is_drive_spec( mrelative )) + if (is_drive_spec( relativeW )) { /* case that becomes "file:///" */ lstrcpyW(preliminary, L"file:///"); process_case = 1; break; } - if (*mrelative == '/' && *(mrelative+1) == '/') + if (relativeW[0] == '/' && relativeW[1] == '/') { /* Relative has location and the rest. */ process_case = 3; break; } - if (*mrelative == '/') + if (*relativeW == '/') { /* Relative is root to location. */ process_case = 4; break; } - if (*mrelative == '#') + if (*relativeW == '#') { if (!(work = wcschr(base.pszSuffix+base.cchSuffix, '#'))) work = (LPWSTR)base.pszSuffix + lstrlenW(base.pszSuffix); @@ -4880,12 +4876,12 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co { case 1: /* Return relative appended to whatever is in combined (which may the string "file:///" */ - lstrcatW(preliminary, mrelative); + lstrcatW(preliminary, relativeW); break; case 2: /* Relative replaces scheme and location */ - lstrcpyW(preliminary, mrelative); + lstrcpyW(preliminary, relativeW); break; case 3: @@ -4920,12 +4916,11 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co if (hr == S_OK) { - /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */ if (*combined_len == 0) *combined_len = 1; - hr = UrlCanonicalizeW(preliminary, mrelative, combined_len, flags & ~URL_FILE_USE_PATHURL); + hr = UrlCanonicalizeW(preliminary, canonicalized, combined_len, flags & ~URL_FILE_USE_PATHURL); if (SUCCEEDED(hr) && combined) - lstrcpyW(combined, mrelative); + lstrcpyW( combined, canonicalized ); TRACE("return-%ld len=%ld, %s\n", process_case, *combined_len, debugstr_w(combined)); }

1 0

Francisco Casas : tests/vkd3d-shader: Set uninitialized uniforms to a value.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: vkd3d Branch: master Commit: 0f9f5269e9c9cfb9882cda3c712f820d6f35295b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f9f5269e9c9cfb9882cda3c712f8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 15:21:23 2024 -0300 tests/vkd3d-shader: Set uninitialized uniforms to a value. Avoids a potential source of non-determinism because the padding bytes between uniforms could be left uninitialized. --- tests/shader_runner.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index fe5ee597..866fd5d4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -551,9 +551,13 @@ static void set_resource(struct shader_runner *runner, struct resource *resource static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { + size_t initial_count = runner->uniform_count; + runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); vkd3d_array_reserve((void **)&runner->uniforms, &runner->uniform_capacity, runner->uniform_count, sizeof(*runner->uniforms)); + memset(runner->uniforms + initial_count, 127, + (runner->uniform_count - initial_count) * sizeof(*runner->uniforms)); memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms)); }

1 0

Francisco Casas : tests: Don't ignore SM1 on a non-const-indexing.shader_test test.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: vkd3d Branch: master Commit: faec42e8a1b0613f6e38bc8b3f1586ca903ed6ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/faec42e8a1b0613f6e38bc8b3f158… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 29 21:04:20 2024 -0300 tests: Don't ignore SM1 on a non-const-indexing.shader_test test. The previous [require] block makes us skip the test for SM4. --- tests/hlsl/non-const-indexing.shader_test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index b0452148..ba60367f 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -216,7 +216,11 @@ draw quad probe all rgba (1, 5, 3, 4) -[pixel shader] +[require] +% reset requirements + + +[pixel shader todo(sm<4)] uniform float4 f[4]; uniform uint4 u; uniform uint4 v;

1 0

Francisco Casas : tests/shader-runner: Introduce "if" qualifier.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: vkd3d Branch: master Commit: 22c47e57f5e351a63ed061e8231161b884f6ce38 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22c47e57f5e351a63ed061e823116… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 29 20:07:39 2024 -0300 tests/shader-runner: Introduce "if" qualifier. When the "if" qualifier is added to a directive, the directive is skipped if the shader->minimum_shader_model is not included in the range. This can be used on the "probe" directives for tests that have different expected results on different shader models, without having to resort to [require] blocks. --- tests/hlsl/arithmetic-int.shader_test | 8 ++--- tests/hlsl/duplicate-modifiers.shader_test | 7 ++--- tests/hlsl/initializer-implicit-array.shader_test | 9 ++---- tests/hlsl/initializer-numeric.shader_test | 6 ++-- tests/hlsl/non-const-indexing.shader_test | 36 +++-------------------- tests/shader_runner.c | 36 +++++++++++++++++++++-- 6 files changed, 47 insertions(+), 55 deletions(-) diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index 46b64181..7a64894d 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -104,10 +104,9 @@ float4 main() : SV_TARGET draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) + [require] shader model >= 4.0 -% dxcompiler performs this calculation on unsigned values and emits zero. -shader model < 6.0 [pixel shader] float4 main() : SV_TARGET @@ -120,10 +119,9 @@ float4 main() : SV_TARGET [test] draw quad -probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +if(sm<6) probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +if(sm>=6) probe all rgba (0.0, 0.0, 0.0, 0.0) -[require] -shader model >= 4.0 [pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test index bf1d9c1b..87f56495 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -1,7 +1,3 @@ -% Returns (0.1, 0.3, 0.2, 0.4) with dxcompiler -[require] -shader model < 6.0 - [pixel shader] typedef const precise row_major float2x2 mat_t; float4 main() : sv_target @@ -12,4 +8,5 @@ float4 main() : sv_target [test] draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +if(sm<6) probe all rgba (0.1, 0.2, 0.3, 0.4) +if(sm>=6) probe all rgba (0.1, 0.3, 0.2, 0.4) diff --git a/tests/hlsl/initializer-implicit-array.shader_test b/tests/hlsl/initializer-implicit-array.shader_test index 25cd1564..e1182599 100644 --- a/tests/hlsl/initializer-implicit-array.shader_test +++ b/tests/hlsl/initializer-implicit-array.shader_test @@ -11,10 +11,6 @@ draw quad probe all rgba (50, 60, 70, 80) -% dxcompiler emits a nop shader which returns immediately. -[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -26,10 +22,9 @@ float4 main() : sv_target [test] draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +% dxcompiler emits a nop shader which returns immediately. +if(sm<6) probe all rgba (5.0, 6.0, 7.0, 8.0) -[require] -% reset requirements [pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 617b6740..1b41dfb5 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -60,9 +60,6 @@ draw quad probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 -[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -73,4 +70,5 @@ float4 main() : sv_target [test] draw quad -probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +if(sm<6) probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +if(sm>=6) probe all rgba (3000000000.0, 3000000000.0, 0.0, 0.0) 4 diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index ba60367f..aed33092 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -236,23 +236,6 @@ float4 main() : sv_target } % FXC is incapable of compiling this correctly, but results differ for SM1-3 vs SM4-5. -[require] -shader model < 4.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -todo draw quad -todo(sm<4) probe all rgba (1.0, 1.0, 1.0, 1.0) - -[require] -shader model >= 4.0 -shader model < 6.0 - [test] uniform 0 float 1.0 uniform 4 float 2.0 @@ -260,18 +243,7 @@ uniform 8 float 3.0 uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 -draw quad -todo probe all rgba (4.0, 4.0, 4.0, 4.0) - -[require] -shader model >= 6.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -draw quad -probe all rgba (4.0, 3.0, 2.0, 1.0) +todo(sm<4) draw quad +if(sm<4) todo probe all rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=4 & sm<6) todo probe all rgba (4.0, 4.0, 4.0, 4.0) +if(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 866fd5d4..a683866c 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -657,14 +657,46 @@ static void read_uint64_t2(const char **line, struct u64vec2 *v) static void parse_test_directive(struct shader_runner *runner, const char *line) { + bool skip_directive = false; + const char *line_ini; + bool match = true; char *rest; int ret; runner->is_todo = false; - if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + while (match) { - runner->is_todo = true; + match = false; + + if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + { + runner->is_todo = true; + match = true; + } + + line_ini = line; + if (match_string_with_args(line, "if", &line, runner->minimum_shader_model)) + { + match = true; + } + else if (line != line_ini) + { + /* Matched "if" but for other shader models. */ + skip_directive = true; + match = true; + } + } + + if (skip_directive) + { + const char *new_line; + + if ((new_line = strchr(line, '\n'))) + line = new_line + 1; + else + line += strlen(line); + return; } if (match_string(line, "dispatch", &line))

1 0

Francisco Casas : tests: Remove [require] directives for tests that use int and bool uniforms.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: vkd3d Branch: master Commit: 6a8939e19f312c8ab85d2d111766a693c75e490c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a8939e19f312c8ab85d2d111766a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 17:10:29 2024 -0300 tests: Remove [require] directives for tests that use int and bool uniforms. These tests should actually compile and run in SM1, which is possible if we pass the int and uint uniforms in the expected IEEE 754 float format for SM1 shaders. Also, bools should be passed as 1.0f or 0.0f to SM1. --- tests/hlsl/any.shader_test | 46 +++++----- tests/hlsl/bool-cast.shader_test | 18 ++-- tests/hlsl/cast-to-float.shader_test | 21 ++--- tests/hlsl/cast-to-half.shader_test | 21 ++--- tests/hlsl/cast-to-int.shader_test | 24 ++--- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/ceil.shader_test | 10 +-- tests/hlsl/floor.shader_test | 9 +- tests/hlsl/function-cast.shader_test | 7 +- tests/hlsl/ldexp.shader_test | 12 +-- tests/hlsl/lerp.shader_test | 15 ++-- tests/hlsl/sign.shader_test | 35 +++++--- tests/hlsl/switch.shader_test | 165 +++++++++++++++++++++-------------- tests/hlsl/trunc.shader_test | 9 +- 14 files changed, 220 insertions(+), 176 deletions(-)

1 0

Paul Gofman : kernel32/tests: Add tests for critical section debug info presence.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 0b441c4c8ff9854d8154ab1846fc63f904781f00 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b441c4c8ff9854d8154ab1846fc63… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 18 17:02:28 2023 -0600 kernel32/tests: Add tests for critical section debug info presence. --- dlls/kernel32/tests/sync.c | 32 +++++++++++++++++++++++++++++++- include/winnt.h | 12 +++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 56a9d6e4859..25cf75cd686 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2741,7 +2741,8 @@ static void test_crit_section(void) to override that. */ memset(&cs, 0, sizeof(cs)); InitializeCriticalSection(&cs); - ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2751,10 +2752,39 @@ static void test_crit_section(void) return; } + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + todo_wine ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* before Win8 */, + "Failed to initialize critical section, error %lu.\n", GetLastError()); + if (!ret) + { + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + } + ok(cs.DebugInfo && cs.DebugInfo != (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); ret = TryEnterCriticalSection(&cs); ok(ret, "Failed to enter critical section.\n"); diff --git a/include/winnt.h b/include/winnt.h index 2dc4eeb69d4..08ca04f8667 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6113,11 +6113,13 @@ typedef struct _RTL_CRITICAL_SECTION { ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; -#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x1000000 -#define RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN 0x2000000 -#define RTL_CRITICAL_SECTION_FLAG_STATIC_INIT 0x4000000 -#define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xFF000000 -#define RTL_CRITICAL_SECTION_FLAG_RESERVED (RTL_CRITICAL_SECTION_ALL_FLAG_BITS & ~0x7000000) +#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x01000000 +#define RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN 0x02000000 +#define RTL_CRITICAL_SECTION_FLAG_STATIC_INIT 0x04000000 +#define RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE 0x08000000 +#define RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO 0x10000000 +#define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xff000000 +#define RTL_CRITICAL_SECTION_FLAG_RESERVED 0xe0000000 typedef struct _RTL_SRWLOCK { PVOID Ptr;

1 0

Bernhard Übelacker : wininet: Add missing assignment of return value.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: ceea01b165903e376d8cef6dabb04be0f508630f URL: https://gitlab.winehq.org/wine/wine/-/commit/ceea01b165903e376d8cef6dabb04b… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Feb 12 15:29:43 2024 +0100 wininet: Add missing assignment of return value. --- dlls/wininet/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index c09315c301f..28269e8dd40 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1225,7 +1225,7 @@ static void InternetCreateUrlA_test(void) urlComp.dwExtraInfoLength = strlen(urlComp.lpszExtraInfo); len = 256; szUrl = HeapAlloc(GetProcessHeap(), 0, len); - InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL13), "Got len %lu\n", len); ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl);

1 0

Bernhard Übelacker : wininet: Avoid crash in InternetCreateUrl with scheme unknown.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 267a5658fb96968964e2204971abf6db23a1a29f URL: https://gitlab.winehq.org/wine/wine/-/commit/267a5658fb96968964e2204971abf6… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Feb 12 16:06:23 2024 +0100 wininet: Avoid crash in InternetCreateUrl with scheme unknown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33050 --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/tests/url.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fc962016246..b74015146ea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4405,6 +4405,12 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, { LPCWSTR scheme; + if (lpUrlComponents->nScheme == INTERNET_SCHEME_UNKNOWN) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + nScheme = lpUrlComponents->nScheme; if (nScheme == INTERNET_SCHEME_DEFAULT) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 28269e8dd40..2177d651f08 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1231,6 +1231,21 @@ static void InternetCreateUrlA_test(void) ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + fill_url_components(&urlComp); + urlComp.lpszScheme = NULL; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_UNKNOWN; + len = 256; + szUrl = HeapAlloc(GetProcessHeap(), 0, len); + SetLastError(0xdeadbeef); + ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, szUrl); } static void InternetCanonicalizeUrl_test(void)

1 0

Gabriel Ivăncescu : kernelbase: Copy the read-only attribute from the source.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: e8f4909ac3cc58e67ad73b9d4a0cbe6fe7b3bf90 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8f4909ac3cc58e67ad73b9d4a0cbe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 7 21:32:57 2024 +0200 kernelbase: Copy the read-only attribute from the source. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 4 ++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 17cfe24d50a..02625140702 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -850,6 +850,56 @@ static void test_CopyFileA(void) CloseHandle(hmapfile); CloseHandle(hfile); + /* check read-only attribute */ + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "source is read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + /* make source read-only */ + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_READONLY); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "source is not read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + /* dest becomes read-only after copied from read-only source */ + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_READONLY); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(source); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "source is not read-only\n"); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(!(ret & FILE_ATTRIBUTE_READONLY), "dest is read-only\n"); + + ret = CopyFileA(source, dest, FALSE); + ok(ret, "CopyFileA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "dest is not read-only\n"); + + /* same when dest does not exist */ + ret = SetFileAttributesA(dest, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); + ret = CopyFileA(source, dest, TRUE); + ok(ret, "CopyFileA: error %ld\n", GetLastError()); + ret = GetFileAttributesA(dest); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); + ok(ret & FILE_ATTRIBUTE_READONLY, "dest is not read-only\n"); + + ret = SetFileAttributesA(source, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = SetFileAttributesA(dest, FILE_ATTRIBUTE_NORMAL); + ok(ret, "SetFileAttributesA: error %ld\n", GetLastError()); + ret = DeleteFileA(source); ok(ret, "DeleteFileA: error %ld\n", GetLastError()); ret = DeleteFileA(dest); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index e1ba92a6448..cef861492e0 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -579,8 +579,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT } ret = TRUE; done: - /* Maintain the timestamp of source file to destination file */ - info.FileAttributes = 0; + /* Maintain the timestamp of source file to destination file and read-only attribute */ + info.FileAttributes &= FILE_ATTRIBUTE_READONLY; NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 );

1 0

Santino Mazza : mlang/tests: Test for GetGlobalFontLinkObject.
by Alexandre Julliard 12 Feb '24

12 Feb '24

Module: wine Branch: master Commit: 6360992deaf60bd486c1e1f6f11492a6b4ec9aaa URL: https://gitlab.winehq.org/wine/wine/-/commit/6360992deaf60bd486c1e1f6f11492… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Oct 16 16:54:57 2023 -0300 mlang/tests: Test for GetGlobalFontLinkObject. --- dlls/mlang/tests/mlang.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ee5ef5af738..99664a0e556 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2295,6 +2295,11 @@ static void test_GetGlobalFontLinkObject(void) { HRESULT ret; void *unknown; + LONG refcount; + IMLangFontLink2 *IMLFL2; + IMLangFontLink *IMLFL; + IMLangCodePages *IMLCP; + IMultiLanguage *IML; ret = GetGlobalFontLinkObject(NULL); ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); @@ -2305,7 +2310,26 @@ todo_wine { ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); + if (unknown == (void *)0xdeadbeef || !unknown) return; } + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink2, (void**)&IMLFL2); + ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage, (void**)&IML); + ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL); + ok(ret == S_OK, "expected S_OK got %#lx\n", ret); + IMLangFontLink_Release(IMLFL); + + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangCodePages, (void**)&IMLCP); + ok(ret == S_OK, "expected S_OK got %#lx\n", ret); + IMLangCodePages_Release(IMLCP); + + + refcount = IUnknown_Release((IUnknown*)unknown); + ok(refcount == 1, "Got refcount %ld\n", refcount); } static void test_IMLangConvertCharset(IMultiLanguage *ml) @@ -2778,6 +2802,8 @@ START_TEST(mlang) if (!init_function_ptrs()) return; + test_GetGlobalFontLinkObject(); + CoInitialize(NULL); test_Rfc1766ToLcid(); test_LcidToRfc1766(); @@ -2785,8 +2811,6 @@ START_TEST(mlang) test_ConvertINetUnicodeToMultiByte(); test_JapaneseConversion(); - test_GetGlobalFontLinkObject(); - trace("IMultiLanguage\n"); ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMultiLanguage, (void **)&iML);

1 0