July 2020 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don't use strcmpiW in _wcsicmp_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 1ca971a248a2d1aac6f604ce037dc34aa0fb421f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca971a248a2d1aac6f604ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:53 2020 +0200 msvcrt: Don't use strcmpiW in _wcsicmp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 69 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6da06ce74..0db911fe81 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -86,12 +86,48 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) return ret; } +/********************************************************************* + * _towlower_l (MSVCRT.@) + */ +int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'A' && c <= 'Z') + return c + 'a' - 'A'; + return c; + } + + return tolowerW(c); +} + +/********************************************************************* + * towlower (MSVCRT.@) + */ +int CDECL MSVCRT_towlower(MSVCRT_wint_t c) +{ + return MSVCRT__towlower_l(c, NULL); +} + INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) { + MSVCRT_wchar_t c1, c2; + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; - return strcmpiW(str1, str2); + do + { + c1 = MSVCRT__towlower_l(*str1++, locale); + c2 = MSVCRT__towlower_l(*str2++, locale); + } while(c1 && (c1 == c2)); + return c1 - c2; } /********************************************************************* @@ -99,7 +135,7 @@ INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *st */ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return strcmpiW( str1, str2 ); + return MSVCRT__wcsicmp_l(str1, str2, NULL); } /********************************************************************* @@ -2540,35 +2576,6 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) return MSVCRT__towupper_l(c, NULL); } -/********************************************************************* - * _towlower_l (MSVCRT.@) - */ -int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) -{ - MSVCRT_pthreadlocinfo locinfo; - - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { - if(c >= 'A' && c <= 'Z') - return c + 'a' - 'A'; - return c; - } - - return tolowerW(c); -} - -/********************************************************************* - * towlower (MSVCRT.@) - */ -int CDECL MSVCRT_towlower(MSVCRT_wint_t c) -{ - return MSVCRT__towlower_l(c, NULL); -} - /********************************************************************* * wcschr (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't use strncmpW in wcsncmp.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: f20f4dee00bee16b8dd860018a98a5d9080d976b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20f4dee00bee16b8dd86001… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:02 2020 +0200 msvcrt: Don't use strncmpW in wcsncmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0db911fe81..961a680ab8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -413,6 +413,21 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) return str; } +/********************************************************************* + * wcsncmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n) +{ + if (!n) + return 0; + while(--n && *str1 && (*str1 == *str2)) + { + str1++; + str2++; + } + return *str1 - *str2; +} + /********************************************************************* * _wcsncoll_l (MSVCRT.@) */ @@ -427,7 +442,7 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncmpW(str1, str2, count); + return MSVCRT_wcsncmp(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, MSVCRT_wcsnlen(str1, count), str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; @@ -2643,14 +2658,6 @@ __int64 CDECL MSVCRT__wtoi64(const MSVCRT_wchar_t *str) return MSVCRT__wtoi64_l(str, NULL); } -/********************************************************************* - * wcsncmp (MSVCRT.@) - */ -int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n) -{ - return strncmpW(str1, str2, n); -} - /********************************************************************* * _wcsxfrm_l (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't use strncmpW in msvcrt_get_flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: c6f19b121e74935689eb9666d0d21729a713c2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f19b121e74935689eb9666… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:14 2020 +0200 msvcrt: Don't use strncmpW in msvcrt_get_flags. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6b7471a56a..868a752575 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1611,7 +1611,7 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, ARRAY_SIZE(ccs)))) + if(!MSVCRT_CHECK_PMT(!MSVCRT_wcsncmp(ccs, mode, ARRAY_SIZE(ccs)))) return -1; mode += ARRAY_SIZE(ccs); while(*mode == ' ') mode++; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index dc89c6af23..c4263ccc16 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1196,6 +1196,7 @@ unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, int); double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*); +int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)

1 0

Piotr Caban : msvcrt: Don't use strncmpiW in _wcsnicoll_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 97095766ab42498e5202c99168cfe99814e113de URL: https://source.winehq.org/git/wine.git/?a=commit;h=97095766ab42498e5202c991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:20 2020 +0200 msvcrt: Don't use strncmpiW in _wcsnicoll_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 961a680ab8..cb355a0d13 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -209,7 +209,25 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncmpiW(str1, str2, count); + { + MSVCRT_wchar_t c1, c2; + + if (!count) + return 0; + + do + { + c1 = *str1++; + if (c1 >= 'A' && c1 <= 'Z') + c1 += 'a' - 'A'; + + c2 = *str2++; + if (c2 >= 'A' && c2 <= 'Z') + c2 += 'a' - 'A'; + } while(--count && c1 && (c1 == c2)); + return c1 - c2; + } + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, MSVCRT_wcsnlen(str1, count), str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL;

1 0

Piotr Caban : msvcrt: Don't use strncmpiW in _wcsnicmp_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: fb071ba01f96385ae50851d8ba172ba5e52917ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb071ba01f96385ae50851d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:26 2020 +0200 msvcrt: Don't use strncmpiW in _wcsnicmp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index cb355a0d13..59ff24e196 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -141,15 +141,29 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str /********************************************************************* * _wcsnicmp_l (MSVCRT.@) */ -INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n, MSVCRT__locale_t locale) +INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, + MSVCRT_size_t n, MSVCRT__locale_t locale) { - return strncmpiW(str1, str2, n); + MSVCRT_wchar_t c1, c2; + + if (!n) + return 0; + + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) + return MSVCRT__NLSCMPERROR; + + do + { + c1 = MSVCRT__towlower_l(*str1++, locale); + c2 = MSVCRT__towlower_l(*str2++, locale); + } while(--n && c1 && (c1 == c2)); + return c1 - c2; } /********************************************************************* * _wcsnicmp (MSVCRT.@) */ -INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) +INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n) { return MSVCRT__wcsnicmp_l(str1, str2, n, NULL); }

1 0

Piotr Caban : msvcrt: Use _wcsnicmp instead of strnicmpW.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 54b2a10659871032720df31ae9ca6cba2ff4acf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b2a10659871032720df31a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:38 2020 +0200 msvcrt: Use _wcsnicmp instead of strnicmpW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cc180e819e..ef8038d971 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -63,7 +63,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wgetenv(const MSVCRT_wchar_t *name) { MSVCRT_wchar_t *str = *environ; MSVCRT_wchar_t *pos = strchrW(str,'='); - if (pos && ((pos - str) == length) && !strncmpiW(str,name,length)) + if (pos && ((pos - str) == length) && !MSVCRT__wcsnicmp(str,name,length)) { TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1)); return pos + 1; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 868a752575..d5c227190c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1620,17 +1620,17 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!strncmpiW(utf8, mode, ARRAY_SIZE(utf8))) + if(!MSVCRT__wcsnicmp(utf8, mode, ARRAY_SIZE(utf8))) { *open_flags |= MSVCRT__O_U8TEXT; mode += ARRAY_SIZE(utf8); } - else if(!strncmpiW(utf16le, mode, ARRAY_SIZE(utf16le))) + else if(!MSVCRT__wcsnicmp(utf16le, mode, ARRAY_SIZE(utf16le))) { *open_flags |= MSVCRT__O_U16TEXT; mode += ARRAY_SIZE(utf16le); } - else if(!strncmpiW(unicode, mode, ARRAY_SIZE(unicode))) + else if(!MSVCRT__wcsnicmp(unicode, mode, ARRAY_SIZE(unicode))) { *open_flags |= MSVCRT__O_WTEXT; mode += ARRAY_SIZE(unicode); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c4263ccc16..ef1154ce76 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1197,6 +1197,7 @@ char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, int); double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*); int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); +int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)

1 0

Nikolay Sivov : shlwapi/tests: Remove failing test.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 859766698cf2978e757316af04d07fa0c69d30d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859766698cf2978e757316af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:52:40 2020 +0300 shlwapi/tests: Remove failing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8c5e3e261e..919cac8563 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1684,11 +1684,8 @@ if (0) LocalFileTimeToFileTime(&filetime, &filetime); /* no way to get required buffer length here */ - SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS /* Win7 */), - "expected 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); buff[0] = 'a'; buff[1] = 0;

1 0

Piotr Caban : ntdll: Ignore L length specifier in printf.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: a6fb7be678438ab689ac87ad4ed21a9b33a17c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fb7be678438ab689ac87ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:24 2020 +0200 ntdll: Ignore L length specifier in printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.h | 6 +++++- dlls/ntdll/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/printf.h b/dlls/ntdll/printf.h index febb9e7bf7..9f7bad767f 100644 --- a/dlls/ntdll/printf.h +++ b/dlls/ntdll/printf.h @@ -375,11 +375,15 @@ static int FUNC_NAME(pf_vsnprintf)( FUNC_NAME(pf_output) *out, const APICHAR *fo flags.IntegerDouble = TRUE; p += 2; } - else if( *p == 'l' || *p == 'L' ) + else if( *p == 'l' ) { flags.IntegerLength = LEN_LONG; p++; } + else if( *p == 'L' ) + { + p++; + } else if( *p == 'h') { flags.IntegerLength = LEN_SHORT; diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cade4e4533..b6a40f6709 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1529,6 +1529,14 @@ static void test__snprintf(void) ok(!memcmp(buffer, "tes", 3), "buf = %s\n", buffer); ok(buffer[3] == 0x7c, "buffer[3] = %x\n", buffer[3]); + res = p_snprintf(buffer, sizeof(buffer), "%ls", L"test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + + res = p_snprintf(buffer, sizeof(buffer), "%Ls", "test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + res = p_snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); ok(res == strlen(buffer), "wrong size %d\n", res); ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer));

1 0

Piotr Caban : msvcrt: Use proper flags instead of characters for printf flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: e20756e9b8dcb29241ae435760d04a9c7cf519bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e20756e9b8dcb29241ae4357… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:33 2020 +0200 msvcrt: Use proper flags instead of characters for printf flags. Port 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 to msvcrt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 101 ++++++++++++++++++++++++--------------------------- dlls/msvcrt/wcs.c | 9 +++++ 2 files changed, 56 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e20756e9b8dcb29241ae…

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 6b96e0e0cbdc28e9dbde3fa3d9bc948b512fd1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96e0e0cbdc28e9dbde3fa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:17 2020 +0200 server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 13 +++++++++++++ server/console.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 25e5820046..a8b7c04915 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -36,6 +36,7 @@ /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -80,6 +81,18 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +/* IOCTL_CONDRV_FILL_OUTPUT params */ +struct condrv_fill_output_params +{ + int x; /* position where to start writing */ + int y; + int mode; /* char info mode */ + int count; /* number to write */ + int wrap; /* wrap around at end of line? */ + WCHAR ch; /* character to write */ + unsigned short attr; /* attribute to write */ +}; + #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 #define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 diff --git a/server/console.c b/server/console.c index 72e98f14a9..a5ddd82478 100644 --- a/server/console.c +++ b/server/console.c @@ -1682,6 +1682,26 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); } + case IOCTL_CONDRV_FILL_OUTPUT: + { + const struct condrv_fill_output_params *params = get_req_data(); + char_info_t data; + DWORD written; + if (get_req_data_size() != sizeof(*params) || + (get_reply_max_size() && get_reply_max_size() != sizeof(written))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + data.ch = params->ch; + data.attr = params->attr; + written = fill_console_output( screen_buffer, data, params->mode, + params->x, params->y, params->count, params->wrap ); + if (written && get_reply_max_size() == sizeof(written)) + set_reply_data( &written, sizeof(written) ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0