April 2023 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Consider register() as manual packing for resource fields.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: f3e81327dc775e4e794618558696971ee1741fdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3e81327dc775e4e7946185586969… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 1 15:57:31 2023 -0300 vkd3d-shader/hlsl: Consider register() as manual packing for resource fields. --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++-- tests/cbuffer.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 610b576c..5d7e426f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2994,10 +2994,11 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { buffer = var1->buffer; - if (!buffer) + if (!buffer || buffer == ctx->globals_buffer) continue; - if (var1->reg_reservation.offset_type == 'c') + if (var1->reg_reservation.offset_type + || (var1->data_type->class == HLSL_CLASS_OBJECT && var1->reg_reservation.reg_type)) buffer->manually_packed_elements = true; else buffer->automatically_packed_elements = true; diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index e95a5235..9cf42d9d 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -607,7 +607,7 @@ float4 main() : sv_target } % register() can be used instead of packoffset(). -[pixel shader todo] +[pixel shader] cbuffer buffer { float4 foo : packoffset(c0); @@ -619,7 +619,7 @@ float4 main() : sv_target return 0; } -[pixel shader todo] +[pixel shader] cbuffer buffer { float4 foo : packoffset(c0); @@ -632,7 +632,7 @@ float4 main() : sv_target } % Using register() alone is considered manual packing for resources, so the other fields expect packoffset(). -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo; @@ -644,7 +644,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo;

1 0

Francisco Casas : tests: Test cbuffer element offsets.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: cf59ad9c9f9f7b8fb5b78fca6e390ef12de0bf31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf59ad9c9f9f7b8fb5b78fca6e390… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 21 20:16:23 2023 -0300 tests: Test cbuffer element offsets. --- tests/cbuffer.shader_test | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 07ef18db..d1d83b3b 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -15,3 +15,80 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) + + +% SM1 buffer offset allocation follows different rules than SM4. +% Those would have to be tested separately. +[require] +shader model >= 4.0 + + +% Respect register boundaries +[pixel shader] +cbuffer buffer +{ + float2 a; + float2 b; + float2 c; + float3 d; +} + +float4 main() : sv_target +{ + return float4(a.x, b.x, c.x, d.x); +} + +[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +uniform 12 float4 12.0 13.0 14.0 15.0 +draw quad +probe all rgba (0.0, 2.0, 4.0, 8.0) + + +[pixel shader] +cbuffer buffer +{ + float a; + float b[2]; + float c; +} + +float4 main() : sv_target +{ + return float4(a, b[0], b[1], c); +} + +[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +draw quad +probe all rgba (0.0, 4.0, 8.0, 9.0) + + +[pixel shader] +cbuffer buffer +{ + float a; + struct + { + float b; + float c; + } p; + float d; +} + +float4 main() : sv_target +{ + return float4(a, p.b, p.c, d); +} + +[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +uniform 12 float4 12.0 13.0 14.0 15.0 +draw quad +probe all rgba (0.0, 4.0, 5.0, 6.0)

1 0

Francisco Casas : tests: Test packoffset().
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 496f9b42cb6c7f63dba82588c3270649678954e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/496f9b42cb6c7f63dba82588c3270… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Feb 6 19:17:24 2023 -0300 tests: Test packoffset(). --- tests/cbuffer.shader_test | 340 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+) diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index d1d83b3b..7fa787d9 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -92,3 +92,343 @@ uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 draw quad probe all rgba (0.0, 4.0, 5.0, 6.0) + + +[pixel shader fail] +// Elements cannot overlap if buffer is used. +cbuffer buffer +{ + float c : packoffset(c0); + float4 a[2] : packoffset(c1); + float4 b[2] : packoffset(c2); +} + +float4 main() : sv_target +{ + return c; +} + + +[pixel shader todo] +// Elements can overlap if buffer is not used. +cbuffer buffer +{ + float4 a[2] : packoffset(c1); + float4 b[2] : packoffset(c2); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader todo] +cbuffer buffer +{ + float4 a : packoffset(c1); + float4 b : packoffset(c2); +} + +float4 main() : sv_target +{ + return 100 * a + b; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +todo draw quad +todo probe all rgba (509, 610, 711, 812) + + +[pixel shader todo] +struct apple +{ + float2 a; + float b; + float4 c; +}; + +cbuffer buffer +{ + float4 foo : packoffset(c3); + struct apple bar : packoffset(c1); +} + +float4 main() : sv_target +{ + return 1000 * foo + 100 * float4(bar.a, 0, 0) + 10 * float4(bar.b, 0, 0, 0) + bar.c; +} + +[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +uniform 12 float4 12.0 13.0 14.0 15.0 +todo draw quad +todo probe all rgba (12468.0, 13509.0, 14010.0, 15011.0) + + +[pixel shader todo] +cbuffer buffer +{ + float2 c : packoffset(c0.y); +} + +float4 main() : sv_target +{ + return float4(c, c); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo draw quad +todo probe all rgba (2.0, 3.0, 2.0, 3.0) + + +[pixel shader fail] +// Elements must respect register boundaries. +cbuffer buffer +{ + float4 c : packoffset(c0.z); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +// Matrices must be aligned. +cbuffer buffer +{ + float1x1 m : packoffset(c0.y); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +// Arrays must be aligned. +cbuffer buffer +{ + float a[1] : packoffset(c0.y); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +// Structs must be aligned. +struct apple +{ + float p; +}; + +cbuffer buffer +{ + struct apple a : packoffset(c0.y); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +// Invalid offset on unused buffer. +cbuffer buffer +{ + float3 a : packoffset(c0.z); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +// Invalid offset on unused variable. +cbuffer buffer +{ + float a : packoffset(c0); + float3 b : packoffset(c0.z); +} + +float4 main() : sv_target +{ + return a; +} + + +[pixel shader todo] +cbuffer buffer +{ + float4 a : packoffset(c1); + float1 b : packoffset(c0); + float1 c : packoffset(c0.y); +} + +float4 main() : sv_target +{ + return 100 * a + 10 * b + c; +} + +[test] +uniform 0 float 1.0 +uniform 1 float 2.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +todo draw quad +todo probe all rgba (512.0, 612.0, 712.0, 812.0) + + +[pixel shader fail] +// packoffset cannot be used unless all elements use it. +cbuffer buffer +{ + float4 a : packoffset(c0); + float4 b; +} + +float4 main() : sv_target +{ + return a + b; +} + + +[pixel shader todo] +cbuffer buffer +{ + float2 c : packoffset(c0.b); +} + +float4 main() : sv_target +{ + return float4(c, c); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo draw quad +todo probe all rgba (3.0, 4.0, 3.0, 4.0) + + +[pixel shader fail] +cbuffer buffer +{ + float2 c : packoffset(c0.xy); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +cbuffer buffer +{ + float4x4 mat : packoffset(c0._m00); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +cbuffer buffer +{ + float4 a : packoffset(c0._m00); +} + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader fail] +cbuffer buffer +{ + float2 c : packoffset(c0.xz); +} + +float4 main() : sv_target +{ + return 0; +} + + +% packoffset cannot be used outside a constant buffer. +[pixel shader fail] +float4 a : packoffset(c0); + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 foo(float4 a : packoffset(c0)) +{ + return a; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 foo(float4 a) : packoffset(c0) +{ + return a; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +struct apple +{ + float4 a : packoffset(c0); +}; + +cbuffer buffer +{ + struct apple a; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +cbuffer buffer +{ + struct + { + float4 a : packoffset(c0); + } s; +} + +float4 main() : sv_target +{ + return 0; +}

1 0

Daniel Tang : wintypes: Declare exported functions in rometadataresolution.h.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 9a49c0a655240fe7ba0407e5fef59f8c07d01050 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a49c0a655240fe7ba0407e5fef59f… Author: Daniel Tang <danielzgtg.opensource(a)gmail.com> Date: Fri Mar 31 13:00:39 2023 -0400 wintypes: Declare exported functions in rometadataresolution.h. --- dlls/wintypes/main.c | 1 + include/Makefile.in | 1 + include/rometadataresolution.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index 7eb2c0c2cce..e48a1b487a6 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -27,6 +27,7 @@ #include "objbase.h" #include "activation.h" +#include "rometadataresolution.h" #define WIDL_using_Windows_Foundation_Metadata #include "windows.foundation.metadata.h" diff --git a/include/Makefile.in b/include/Makefile.in index f0c0da3ed93..dcf6c016313 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -645,6 +645,7 @@ SOURCES = \ rmxftmpl.x \ roapi.h \ roerrorapi.h \ + rometadataresolution.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/rometadataresolution.h b/include/rometadataresolution.h new file mode 100644 index 00000000000..90258ff5aa0 --- /dev/null +++ b/include/rometadataresolution.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 Daniel Tang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ROMETADATARESOLUTION_H +#define _ROMETADATARESOLUTION_H + +#include <windef.h> +#include <hstring.h> + +HRESULT WINAPI RoIsApiContractMajorVersionPresent(const WCHAR *, UINT16, BOOL *); +HRESULT WINAPI RoResolveNamespace(HSTRING, HSTRING, DWORD, const HSTRING *, DWORD *, HSTRING **, DWORD *, HSTRING **); + +#endif /* _ROMETADATARESOLUTION_H */

1 0

Hugh McMaster : kernel32/tests: Check return length of GetConsoleOriginalTitleA/W().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: b1dc5a533b97840cfef5f914f330b63da9180fa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1dc5a533b97840cfef5f914f330b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 17 22:03:28 2023 +1100 kernel32/tests: Check return length of GetConsoleOriginalTitleA/W(). --- dlls/kernel32/tests/console.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f8e39c164d2..0786a7813ee 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4227,9 +4227,9 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_GetConsoleOriginalTitleA(void) { - char buf[64]; - DWORD ret; char title[] = "Original Console Title"; + char buf[64]; + DWORD ret, title_len = strlen(title); ret = GetConsoleOriginalTitleA(NULL, 0); ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); @@ -4240,6 +4240,7 @@ static void test_GetConsoleOriginalTitleA(void) ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleA("test"); ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); @@ -4247,13 +4248,14 @@ static void test_GetConsoleOriginalTitleA(void) ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitleW(void) { - WCHAR buf[64]; - DWORD ret; WCHAR title[] = L"Original Console Title"; + WCHAR buf[64]; + DWORD ret, title_len = lstrlenW(title); ret = GetConsoleOriginalTitleW(NULL, 0); ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); @@ -4265,6 +4267,7 @@ static void test_GetConsoleOriginalTitleW(void) todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); buf[ret] = 0; todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleW(L"test"); ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); @@ -4272,10 +4275,12 @@ static void test_GetConsoleOriginalTitleW(void) ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = GetConsoleOriginalTitleW(buf, 5); todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); + todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitle(void)

1 0

Hugh McMaster : conhost: Save original console title on initialization.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 6891faf454f74a9b377e66a6e34a4bfd96e84707 URL: https://gitlab.winehq.org/wine/wine/-/commit/6891faf454f74a9b377e66a6e34a4b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sat Mar 18 22:54:42 2023 +1100 conhost: Save original console title on initialization. --- programs/conhost/conhost.c | 29 +++++++++++++++++++++++------ programs/conhost/conhost.h | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 1bed7b8a03c..f07164c698e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2461,21 +2461,38 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct return STATUS_SUCCESS; } +static WCHAR *set_title( const WCHAR *in_title, size_t size ) +{ + WCHAR *title = NULL; + + title = malloc( size + sizeof(WCHAR) ); + if (!title) return NULL; + + memcpy( title, in_title, size ); + title[ size / sizeof(WCHAR) ] = 0; + + return title; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; TRACE( "%s\n", debugstr_wn(in_title, size / sizeof(WCHAR)) ); - if (size) - { - if (!(title = malloc( size + sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( title, in_title, size ); - title[size / sizeof(WCHAR)] = 0; - } + if (!(title = set_title( in_title, size ))) + return STATUS_NO_MEMORY; + free( console->title ); console->title = title; + if (!console->title_orig && !(console->title_orig = set_title( in_title, size ))) + { + free( console->title ); + console->title = NULL; + return STATUS_NO_MEMORY; + } + if (console->tty_output) { size_t len; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 4464f51032f..76d897e8800 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -93,6 +93,7 @@ struct console unsigned int key_state; struct console_window *window; WCHAR *title; /* console title */ + WCHAR *title_orig; /* original console title */ struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */

1 0

Hugh McMaster : kernelbase: Implement GetConsoleOriginalTitleW().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 887aa70e0884e78c7a97779200226e2f8566d29d URL: https://gitlab.winehq.org/wine/wine/-/commit/887aa70e0884e78c7a97779200226e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 21:37:59 2023 +1100 kernelbase: Implement GetConsoleOriginalTitleW(). --- dlls/kernel32/tests/console.c | 18 +++++++-------- dlls/kernelbase/console.c | 52 +++++++++++++++++++++++-------------------- programs/conhost/conhost.c | 12 ++++++---- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0786a7813ee..fbf773ec7d9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4264,23 +4264,23 @@ static void test_GetConsoleOriginalTitleW(void) ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); buf[ret] = 0; - todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleW(L"test"); ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = GetConsoleOriginalTitleW(buf, 5); - todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitle(void) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index fa143857bc2..0f72106e425 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -202,6 +202,32 @@ static COORD get_console_font_size( HANDLE handle, DWORD index ) return c; } +/* helper function for GetConsoleTitle and GetConsoleOriginalTitle */ +static DWORD get_console_title( WCHAR *title, DWORD size, BOOL current_title ) +{ + struct condrv_title_params *params; + size_t max_size = sizeof(*params) + (size - 1) * sizeof(WCHAR); + + if (!title || !size) return 0; + + if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) + return 0; + + if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + &current_title, sizeof(current_title), params, max_size, &size ) && + size >= sizeof(*params)) + { + size -= sizeof(*params); + memcpy( title, params->buffer, size ); + title[ size / sizeof(WCHAR) ] = 0; + size = params->title_len; + } + else size = 0; + + HeapFree( GetProcessHeap(), 0, params ); + return size; +} + static HANDLE create_console_server( void ) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; @@ -899,9 +925,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleW( LPWSTR title, DWORD size ) { - FIXME( ": (%p, %lu) stub!\n", title, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + return get_console_title( title, size, FALSE ); } @@ -1046,27 +1070,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleA( LPSTR title, DWORD size ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - struct condrv_title_params *params; - size_t max_size = sizeof(*params) + (size - 1) * sizeof(WCHAR); - - if (!title || !size) return 0; - - if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) - return 0; - - if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, - NULL, 0, params, max_size, &size ) && - size >= sizeof(*params)) - { - size -= sizeof(*params); - memcpy( title, params->buffer, size ); - title[ size / sizeof(WCHAR) ] = 0; - size = params->title_len; - } - else size = 0; - - HeapFree( GetProcessHeap(), 0, params ); - return size; + return get_console_title( title, size, TRUE ); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f07164c698e..04a294fc31f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2726,15 +2726,19 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_GET_TITLE: { + BOOL current_title; + WCHAR *title; size_t title_len, str_size; struct condrv_title_params *params; - if (in_size) return STATUS_INVALID_PARAMETER; - title_len = console->title ? wcslen( console->title ) : 0; + if (in_size != sizeof(BOOL)) return STATUS_INVALID_PARAMETER; + current_title = *(BOOL *)in_data; + title = current_title ? console->title : console->title_orig; + title_len = title ? wcslen( title ) : 0; str_size = min( *out_size - sizeof(*params), title_len * sizeof(WCHAR) ); *out_size = sizeof(*params) + str_size; if (!(params = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; - TRACE( "returning title %s\n", debugstr_w(console->title) ); - if (str_size) memcpy( params->buffer, console->title, str_size ); + TRACE( "returning %s %s\n", current_title ? "title" : "original title", debugstr_w(title) ); + if (str_size) memcpy( params->buffer, title, str_size ); params->title_len = title_len; return STATUS_SUCCESS; }

1 0

Hugh McMaster : kernelbase: Implement GetConsoleOriginalTitleA().
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 30f1c1be740174052bb727b82ef226d112501c42 URL: https://gitlab.winehq.org/wine/wine/-/commit/30f1c1be740174052bb727b82ef226… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 21:49:14 2023 +1100 kernelbase: Implement GetConsoleOriginalTitleA(). --- dlls/kernel32/tests/console.c | 12 ++++++------ dlls/kernelbase/console.c | 14 +++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index fbf773ec7d9..9e42c5b6c3b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4238,17 +4238,17 @@ static void test_GetConsoleOriginalTitleA(void) ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); - todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); ret = SetConsoleTitleA("test"); ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); - todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); - todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); - todo_wine ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); + ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } static void test_GetConsoleOriginalTitleW(void) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 0f72106e425..cd5fdb7d9f7 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -914,9 +914,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size ) { - FIXME( ": (%p, %lu) stub!\n", title, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + DWORD ret; + + if (!ptr) return 0; + + ret = GetConsoleOriginalTitleW( ptr, size ); + if (ret) + WideCharToMultiByte( GetConsoleOutputCP(), 0, ptr, -1, title, size, NULL, NULL); + + HeapFree( GetProcessHeap(), 0, ptr ); + return ret; }

1 0

Hugh McMaster : kernel32/tests: Test GetConsoleOriginalTitleW() with an empty title.
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: d350af24554ccf7253bf02984650b65ae1847a20 URL: https://gitlab.winehq.org/wine/wine/-/commit/d350af24554ccf7253bf02984650b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 30 22:28:37 2023 +1100 kernel32/tests: Test GetConsoleOriginalTitleW() with an empty title. --- dlls/kernel32/tests/console.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9e42c5b6c3b..8d569ad6410 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4283,6 +4283,15 @@ static void test_GetConsoleOriginalTitleW(void) ok(ret == title_len, "got %lu, expected %lu\n", ret, title_len); } +static void test_GetConsoleOriginalTitleW_empty(void) +{ + WCHAR buf[64]; + DWORD ret; + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + ok(!ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); +} + static void test_GetConsoleOriginalTitle(void) { STARTUPINFOA si = { sizeof(si) }; @@ -4299,6 +4308,14 @@ static void test_GetConsoleOriginalTitle(void) CloseHandle(info.hThread); wait_child_process(info.hProcess); CloseHandle(info.hProcess); + + strcat(buf, " empty"); + title[0] = 0; + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); } static void test_GetConsoleTitleA(void) @@ -4944,10 +4961,15 @@ START_TEST(console) ExitProcess(exit_code); } - if (argc == 3 && !strcmp(argv[2], "title_test")) + if (argc >= 3 && !strcmp(argv[2], "title_test")) { - test_GetConsoleOriginalTitleA(); - test_GetConsoleOriginalTitleW(); + if (argc == 3) + { + test_GetConsoleOriginalTitleA(); + test_GetConsoleOriginalTitleW(); + } + else + test_GetConsoleOriginalTitleW_empty(); return; }

1 0

Alex Henrie : wintrust: Annotate WINTRUST_Alloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 03 Apr '23

03 Apr '23

Module: wine Branch: master Commit: 654651bf23ee8ef4e3e9d72cc1a16815b6789b09 URL: https://gitlab.winehq.org/wine/wine/-/commit/654651bf23ee8ef4e3e9d72cc1a168… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 8 20:00:05 2022 -0700 wintrust: Annotate WINTRUST_Alloc with __WINE_(DEALLOC|MALLOC). --- dlls/wintrust/wintrust_priv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 66c925ade5f..08025dbba9e 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,8 +18,9 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; +void * WINAPI WINTRUST_Alloc(DWORD cb) + __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(WINTRUST_Free) __WINE_MALLOC DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN;

1 0