November 2022 - Wine-Commits

Bartosz Kosiorek : msvcrt: Add _fprintf_p implementation.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: f043fc32c950e5efa8ed69e24ace069c98ed1be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f043fc32c950e5efa8ed69e24ace06… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 28 14:04:00 2022 +0200 msvcrt: Add _fprintf_p implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1cbf9b31fee..3902a731311 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -828,7 +828,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 92f7bb2f859..c233e79c1d1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1175,7 +1175,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2a0fa15cc01..e7350201a90 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1176,7 +1176,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 633991fcc54..de41ea06eb0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1105,7 +1105,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) msvcr120._fpieee_flt @ cdecl _fpreset() msvcr120._fpreset @ varargs _fprintf_l(ptr str ptr) msvcr120._fprintf_l -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) msvcr120._fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) msvcr120._fputc_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 695ff5857bb..7285ea78221 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -494,7 +494,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 546efb0a4a7..0a2e25e5c98 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -477,7 +477,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -@ stub _fprintf_p +@ varargs _fprintf_p(ptr str) @ stub _fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c017847fcf..170dae34c42 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5594,6 +5594,20 @@ int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) return res; } + +/********************************************************************* + * _fprintf_p (MSVCRT.@) + */ +int CDECL _fprintf_p(FILE* file, const char *format, ...) +{ + va_list valist; + int res; + va_start(valist, format); + res = _vfprintf_p_l(file, format, NULL, valist); + va_end(valist); + return res; +} + /********************************************************************* * fwprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c1b47db6940..60855f58997 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -461,7 +461,7 @@ @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) -# stub _fprintf_p(ptr str) +@ varargs _fprintf_p(ptr str) # stub _fprintf_p_l(ptr str ptr) # stub _fprintf_s_l(ptr str ptr) @ cdecl _fputchar(long)

1 0

Bartosz Kosiorek : msvcrt: Add _fwprintf_p implementation.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 630b9f8ec0f006f0fd7351f66b041931312aaf3e URL: https://gitlab.winehq.org/wine/wine/-/commit/630b9f8ec0f006f0fd7351f66b0419… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 28 14:43:24 2022 +0200 msvcrt: Add _fwprintf_p implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3ae04c0af78..d8e76a98532 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -863,7 +863,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4e8aba90118..b8c046d0a31 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1210,7 +1210,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c3ce7970f8e..273e4f619c8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1211,7 +1211,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 98bc11aaf6e..822927e7a8e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1140,7 +1140,7 @@ @ cdecl _futime32(long ptr) msvcr120._futime32 @ cdecl _futime64(long ptr) msvcr120._futime64 @ varargs _fwprintf_l(ptr wstr ptr) msvcr120._fwprintf_l -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) msvcr120._fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) msvcr120._fwrite_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 377f29579a9..13b371922f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -529,7 +529,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7c1ed166ca6..315d16bb477 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -@ stub _fwprintf_p +@ varargs _fwprintf_p(ptr wstr) @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8249fdd7764..cc5880cf5e0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5673,6 +5673,20 @@ int WINAPIV _fwprintf_l(FILE* file, const wchar_t *format, _locale_t locale, ... return res; } +/********************************************************************* + * _fwprintf_p (MSVCRT.@) + */ +int WINAPIV _fwprintf_p(FILE* file, const wchar_t *format, ...) +{ + va_list valist; + int res; + va_start(valist, format); + res = _vfwprintf_p_l(file, format, NULL, valist); + va_end(valist); + return res; +} + + /********************************************************************* * printf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e576f980815..2a2ab211e0b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -495,7 +495,7 @@ @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) @ varargs _fwprintf_l(ptr wstr ptr) -# stub _fwprintf_p(ptr wstr) +@ varargs _fwprintf_p(ptr wstr) # stub _fwprintf_p_l(ptr wstr ptr) # stub _fwprintf_s_l(ptr wstr ptr) @ varargs _fwscanf_l(ptr wstr ptr)

1 0

Bartosz Kosiorek : msvcrt: Add _fprintf_l implementation.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 52e2a53575247bd71e37de718eb73e693dd169ca URL: https://gitlab.winehq.org/wine/wine/-/commit/52e2a53575247bd71e37de718eb73e… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 28 13:50:38 2022 +0200 msvcrt: Add _fprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 21 +++++++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4be6144ca7e..1cbf9b31fee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -827,7 +827,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aee92ec232f..92f7bb2f859 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1174,7 +1174,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6c0d560b67f..2a0fa15cc01 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1175,7 +1175,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index aa5d8ccf968..633991fcc54 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1104,7 +1104,7 @@ @ cdecl -arch=!i386 _fpclassf(float) msvcr120._fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) msvcr120._fpieee_flt @ cdecl _fpreset() msvcr120._fpreset -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) msvcr120._fprintf_l @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3981ed3dea..695ff5857bb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -493,7 +493,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3e581b911e2..546efb0a4a7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -476,7 +476,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -@ stub _fprintf_l +@ varargs _fprintf_l(ptr str ptr) @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43f27629a64..7c017847fcf 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -681,12 +681,12 @@ BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *handle_ptr = INVALID_HANDLE_VALUE; } wxflag_ptr++; handle_ptr++; - } + } return TRUE; } -/* INTERNAL: Set up all file descriptors, - * as well as default streams (stdin, stderr and stdout) +/* INTERNAL: Set up all file descriptors, + * as well as default streams (stdin, stderr and stdout) */ void msvcrt_init_io(void) { @@ -1286,7 +1286,7 @@ int CDECL _dup(int od) { int fd, ret; ioinfo *info = get_ioinfo_alloc(&fd); - + if (_dup2(od, fd) == 0) ret = fd; else @@ -5581,6 +5581,19 @@ int WINAPIV fprintf_s(FILE* file, const char *format, ...) return res; } +/********************************************************************* + * _fprintf_l (MSVCRT.@) + */ +int CDECL _fprintf_l(FILE* file, const char *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vfprintf_l(file, format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * fwprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8c6a3b9a910..c1b47db6940 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -460,7 +460,7 @@ @ cdecl -arch=!i386 _fpclassf(float) @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -# stub _fprintf_l(ptr str ptr) +@ varargs _fprintf_l(ptr str ptr) # stub _fprintf_p(ptr str) # stub _fprintf_p_l(ptr str ptr) # stub _fprintf_s_l(ptr str ptr)

1 0

Eric Pouech : user32: Fix rounding issue in edit tests for char pos messages.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 614b7d7430e0ba60692a46e97f03b8b9600f0651 URL: https://gitlab.winehq.org/wine/wine/-/commit/614b7d7430e0ba60692a46e97f03b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Oct 29 13:06:46 2022 +0200 user32: Fix rounding issue in edit tests for char pos messages. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1e5ed8dbfa0..2afbbd5bea4 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1150,7 +1150,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1168,7 +1168,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1186,7 +1186,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1204,7 +1204,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1223,7 +1223,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1242,7 +1242,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 2) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));

1 0

Jacek Caban : winevulkan: Support optional dispatch handles.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 5b41a4816bb50c3d8c45896d375772ee2f224d74 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b41a4816bb50c3d8c45896d375772… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 14:52:12 2022 +0100 winevulkan: Support optional dispatch handles. --- dlls/winevulkan/make_vulkan | 23 +- dlls/winevulkan/vulkan_thunks.c | 1034 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1051 insertions(+), 6 deletions(-)

1 0

Eric Pouech : conhost/tests: Fix some conditions on tty test termination.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 9317a331f1d4c39f5da391f976c2cb98f1d3e0fe URL: https://gitlab.winehq.org/wine/wine/-/commit/9317a331f1d4c39f5da391f976c2cb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 26 15:36:42 2022 +0200 conhost/tests: Fix some conditions on tty test termination. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 5befbd2ea82..9371d0ce6f5 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1858,6 +1858,16 @@ static void test_pseudoconsole(void) if (i != 39) expect_output_sequence("\r\n"); } skip_sequence("\x1b[H\x1b[?25h"); + /* native sometimes redraws the screen afterwards */ + if (skip_sequence("\x1b[25l")) + { + unsigned int line_feed = 0; + /* not checking exact output, depends too heavily on previous tests */ + for (i = 0; i < console_output_count - 2; i++) + if (!memcmp(console_output + i, "\r\n", 2)) line_feed++; + ok(line_feed == 39, "Wrong number of line feeds %u\n", line_feed); + console_output_count = 0; + } } expect_empty_output();

1 0

Jacek Caban : winevulkan: Assert Unix call result in private thunks.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 0c38bb0b2bafca5eb232396e39c77a3e60de05fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0c38bb0b2bafca5eb232396e39c77a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 15:36:09 2022 +0100 winevulkan: Assert Unix call result in private thunks. --- dlls/winevulkan/loader.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index d6fe9fe078f..20bd9d38c27 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -257,6 +257,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, struct vkCreateInstance_params params; struct VkInstance_T *instance; uint32_t phys_dev_count = 8, i; + NTSTATUS status; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, ret); @@ -275,7 +276,8 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pAllocator = allocator; params.pInstance = ret; params.client_ptr = instance; - vk_unix_call(unix_vkCreateInstance, &params); + status = vk_unix_call(unix_vkCreateInstance, &params); + assert(!status); if (instance->phys_dev_count <= phys_dev_count) break; phys_dev_count = instance->phys_dev_count; @@ -290,9 +292,12 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, void WINAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) { struct vkDestroyInstance_params params; + NTSTATUS status; + params.instance = instance; params.pAllocator = pAllocator; - vk_unix_call(unix_vkDestroyInstance, &params); + status = vk_unix_call(unix_vkDestroyInstance, &params); + assert(!status); free(instance); } @@ -300,6 +305,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { struct vkEnumerateInstanceExtensionProperties_params params; + NTSTATUS status; TRACE("%p, %p, %p\n", layer_name, count, properties); @@ -318,13 +324,15 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + status = vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + assert(!status); return params.result; } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) { struct vkEnumerateInstanceVersion_params params; + NTSTATUS status; TRACE("%p\n", version); @@ -335,7 +343,8 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + status = vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + assert(!status); return params.result; } @@ -434,12 +443,14 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + assert(!status); fill_luid_property(properties2); } @@ -447,12 +458,14 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2KHR_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + assert(!status); fill_luid_property(properties2); } @@ -462,6 +475,7 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn struct vkCreateDevice_params params; uint32_t queue_count = 0, i; VkDevice device; + NTSTATUS status; for (i = 0; i < create_info->queueCreateInfoCount; i++) queue_count += create_info->pQueueCreateInfos[i].queueCount; @@ -475,7 +489,8 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn params.pAllocator = allocator; params.pDevice = ret; params.client_ptr = device; - vk_unix_call(unix_vkCreateDevice, &params); + status = vk_unix_call(unix_vkCreateDevice, &params); + assert(!status); if (!device->base.unix_handle) free(device); return params.result; @@ -484,10 +499,12 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator) { struct vkDestroyDevice_params params; + NTSTATUS status; params.device = device; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyDevice, &params); + status = vk_unix_call(unix_vkDestroyDevice, &params); + assert(!status); free(device); } @@ -496,6 +513,7 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn { struct vkCreateCommandPool_params params; struct vk_command_pool *cmd_pool; + NTSTATUS status; if (!(cmd_pool = malloc(sizeof(*cmd_pool)))) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -507,7 +525,8 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn params.pAllocator = allocator; params.pCommandPool = ret; params.client_ptr = cmd_pool; - vk_unix_call(unix_vkCreateCommandPool, &params); + status = vk_unix_call(unix_vkCreateCommandPool, &params); + assert(!status); if (!cmd_pool->unix_handle) free(cmd_pool); return params.result; @@ -518,6 +537,7 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk struct vk_command_pool *cmd_pool = command_pool_from_handle(handle); struct vkDestroyCommandPool_params params; VkCommandBuffer buffer, cursor; + NTSTATUS status; if (!cmd_pool) return; @@ -534,7 +554,8 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk params.device = device; params.commandPool = handle; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyCommandPool, &params); + status = vk_unix_call(unix_vkDestroyCommandPool, &params); + assert(!status); free(cmd_pool); } @@ -543,6 +564,7 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA { struct vk_command_pool *pool = command_pool_from_handle(allocate_info->commandPool); struct vkAllocateCommandBuffers_params params; + NTSTATUS status; uint32_t i; for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -551,7 +573,8 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA params.device = device; params.pAllocateInfo = allocate_info; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkAllocateCommandBuffers, &params); + status = vk_unix_call(unix_vkAllocateCommandBuffers, &params); + assert(!status); if (params.result == VK_SUCCESS) { for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -572,13 +595,15 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32 const VkCommandBuffer *buffers) { struct vkFreeCommandBuffers_params params; + NTSTATUS status; uint32_t i; params.device = device; params.commandPool = cmd_pool; params.commandBufferCount = count; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkFreeCommandBuffers, &params); + status = vk_unix_call(unix_vkFreeCommandBuffers, &params); + assert(!status); for (i = 0; i < count; i++) { list_remove(&buffers[i]->pool_link);

1 0

Jacek Caban : winevulkan: Assert Unix call result in generated thunks.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 572dd0b466c546adc77f7ad95a25e348bcef0088 URL: https://gitlab.winehq.org/wine/wine/-/commit/572dd0b466c546adc77f7ad95a25e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 00:59:13 2022 +0200 winevulkan: Assert Unix call result in generated thunks. Instead of silently ignoring crashes. --- dlls/winevulkan/loader_thunks.c | 1996 +++++++++++++++++++++++++++++---------- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_loader.h | 1 + 3 files changed, 1502 insertions(+), 501 deletions(-)

1 0

Brendan Shanks : ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: f726b6ba79e2b0b98c5afba747457f6685e80f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f726b6ba79e2b0b98c5afba747457f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 15:45:24 2022 -0700 ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used. --- dlls/ntdll/unix/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3a737044407..0cf0da4ad4c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2282,9 +2282,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (!info) return STATUS_ACCESS_VIOLATION; if (info->ThreadName.Length && !info->ThreadName.Buffer) return STATUS_ACCESS_VIOLATION; - if (handle == GetCurrentThread()) + status = NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + if (handle == GetCurrentThread() || (!status && (HandleToULong(tbi.ClientId.UniqueThread) == GetCurrentThreadId()))) WARN_(threadname)( "Thread renamed to %s\n", debugstr_us(&info->ThreadName) ); - else if (!NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL )) + else if (!status) WARN_(threadname)( "Thread ID %04x renamed to %s\n", HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) ); else WARN_(threadname)( "Thread handle %p renamed to %s\n", handle, debugstr_us(&info->ThreadName) );

1 0

Rémi Bernon : winemac.drv: Use the primary adapter name instead of calling back win32u.
by Alexandre Julliard Nov. 1, 2022

Nov. 1, 2022

Module: wine Branch: master Commit: 81406eac96adb761f67bc6564ed57bc78982ace2 URL: https://gitlab.winehq.org/wine/wine/-/commit/81406eac96adb761f67bc6564ed57b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 21 14:00:21 2022 +0200 winemac.drv: Use the primary adapter name instead of calling back win32u. --- dlls/winemac.drv/display.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d7180a68950..7abf47ee3dd 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -685,24 +685,6 @@ void check_retina_status(void) } } -static BOOL get_primary_adapter(WCHAR *name) -{ - DISPLAY_DEVICEW dd; - DWORD i; - - dd.cb = sizeof(dd); - for (i = 0; !NtUserEnumDisplayDevices(NULL, i, &dd, 0); ++i) - { - if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - lstrcpyW(name, dd.DeviceName); - return TRUE; - } - } - - return FALSE; -} - static BOOL is_detached_mode(const DEVMODEW *mode) { return mode->dmFields & DM_POSITION && @@ -771,7 +753,6 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis */ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) { - WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_SUCCESSFUL; DEVMODEW *mode; int bpp; @@ -785,9 +766,6 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN init_original_display_mode(); - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; - if (macdrv_get_displays(&macdrv_displays, &num_displays)) return DISP_CHANGE_FAILED; @@ -804,7 +782,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN for (mode = displays; mode->dmSize && !ret; mode = NEXT_DEVMODEW(mode)) { - if (wcsicmp(primary_adapter, mode->dmDeviceName)) + if (wcsicmp(primary_name, mode->dmDeviceName)) { FIXME("Changing non-primary adapter settings is currently unsupported.\n"); continue;

1 0