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

Piotr Caban : msvcrt: Add _ismbclower_l implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 1ad209428442e5c571b8a8478c3821e6c303b3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad209428442e5c571b8a847… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:15 2020 +0200 msvcrt: Add _ismbclower_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 4d63b2fa59..1131c6876e 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -47,7 +47,7 @@ @ cdecl _ismbclegal(long) ucrtbase._ismbclegal @ cdecl _ismbclegal_l(long ptr) ucrtbase._ismbclegal_l @ cdecl _ismbclower(long) ucrtbase._ismbclower -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) ucrtbase._ismbclower_l @ cdecl _ismbcprint(long) ucrtbase._ismbcprint @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 264d695496..b5b2aa783a 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -420,7 +420,7 @@ @ cdecl _o__ismbclegal(long) ucrtbase._o__ismbclegal @ cdecl _o__ismbclegal_l(long ptr) ucrtbase._o__ismbclegal_l @ stub _o__ismbclower -@ stub _o__ismbclower_l +@ cdecl _o__ismbclower_l(long ptr) ucrtbase._o__ismbclower_l @ cdecl _o__ismbcprint(long) ucrtbase._o__ismbcprint @ stub _o__ismbcprint_l @ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c308e0d9ae..cf1b51a4a9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -995,7 +995,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1d01c624a6..d3bd29417c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1341,7 +1341,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ stub _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7548f62b6d..604830ac60 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1346,7 +1346,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 322fcfb679..ca668cda12 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -667,7 +667,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d6bd5fbfa5..77a9514271 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -645,7 +645,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 73bc45c63b..dccfce4448 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1475,13 +1475,20 @@ int CDECL _ismbcalpha(unsigned int ch) return _ismbcalpha_l( ch, NULL ); } +/********************************************************************* + * _ismbclower_l (MSVCRT.@) + */ +int CDECL _ismbclower_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswlower_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbclower (MSVCRT.@) */ int CDECL _ismbclower(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_UPPER); + return _ismbclower_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index dc51dfa926..a5a1bf64bc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1205,6 +1205,7 @@ int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_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) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e347367c75..bcea57a7e3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -613,7 +613,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) -# stub _ismbclower_l(long ptr) +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) # stub _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 55bca3c414..68b61fece9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -485,7 +485,7 @@ @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) -@ stub _ismbclower_l +@ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) @@ -1084,7 +1084,7 @@ @ cdecl _o__ismbclegal(long) _ismbclegal @ cdecl _o__ismbclegal_l(long ptr) _ismbclegal_l @ stub _o__ismbclower -@ stub _o__ismbclower_l +@ cdecl _o__ismbclower_l(long ptr) _ismbclower_l @ cdecl _o__ismbcprint(long) _ismbcprint @ stub _o__ismbcprint_l @ cdecl _o__ismbcpunct(long) _ismbcpunct

1 0

Gijs Vermeulen : qdvd: Support aggregation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: c37e2ccceb80a12aedc8cd2590e1e8acd96c72c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37e2ccceb80a12aedc8cd25… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jul 16 06:16:33 2020 +0200 qdvd: Support aggregation. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/qdvd/graph.c | 61 +++++++++++++--- dlls/qdvd/qdvd_main.c | 8 +-- dlls/qdvd/qdvd_private.h | 2 +- dlls/qdvd/tests/Makefile.in | 5 ++ dlls/qdvd/tests/graph.c | 171 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 233 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c37e2ccceb80a12aedc8…

1 0

Piotr Caban : msvcrt: Add _ismbcprint_l implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 1750a6969becfb02f0fee9447878d4374db652ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=1750a6969becfb02f0fee944… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:32 2020 +0200 msvcrt: Add _ismbcprint_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 3ab70829ca..4f6a1f7679 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -49,7 +49,7 @@ @ cdecl _ismbclower(long) ucrtbase._ismbclower @ cdecl _ismbclower_l(long ptr) ucrtbase._ismbclower_l @ cdecl _ismbcprint(long) ucrtbase._ismbcprint -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) ucrtbase._ismbcprint_l @ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) ucrtbase._ismbcspace diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 22ac50e14a..c6489ab976 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -422,7 +422,7 @@ @ stub _o__ismbclower @ cdecl _o__ismbclower_l(long ptr) ucrtbase._o__ismbclower_l @ cdecl _o__ismbcprint(long) ucrtbase._o__ismbcprint -@ stub _o__ismbcprint_l +@ cdecl _o__ismbcprint_l(long ptr) ucrtbase._o__ismbcprint_l @ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct @ stub _o__ismbcpunct_l @ cdecl _o__ismbcspace(long) ucrtbase._o__ismbcspace diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 30aaa302ef..f054026dd9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -997,7 +997,7 @@ @ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6bf022ac74..3a4ed8f6d1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1343,7 +1343,7 @@ @ stub _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ stub _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 48d58977a7..3d295f8324 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1348,7 +1348,7 @@ @ stub _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ddf81b4858..55e43e6c51 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -669,7 +669,7 @@ @ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9a86afb37c..55df1046f5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -647,7 +647,7 @@ @ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e93aafc44a..a6b5e6d4db 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1554,13 +1554,20 @@ int CDECL _ismbcspace(unsigned int ch) return _ismbcspace_l( ch, NULL ); } +/********************************************************************* + * _ismbcprint_l (MSVCRT.@) + */ +int CDECL _ismbcprint_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswprint_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcprint (MSVCRT.@) */ int CDECL _ismbcprint(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & (C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_ALPHA | C1_SPACE)); + return _ismbcprint_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 492fdf26bc..68245f6fdc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1207,6 +1207,7 @@ int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_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) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 12c4a718e8..79918ae7ab 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -615,7 +615,7 @@ @ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -# stub _ismbcprint_l(long ptr) +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) # stub _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c93d0cee04..c20e3f0b55 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -487,7 +487,7 @@ @ stub _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) -@ stub _ismbcprint_l +@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) @@ -1086,7 +1086,7 @@ @ stub _o__ismbclower @ cdecl _o__ismbclower_l(long ptr) _ismbclower_l @ cdecl _o__ismbcprint(long) _ismbcprint -@ stub _o__ismbcprint_l +@ cdecl _o__ismbcprint_l(long ptr) _ismbcprint_l @ cdecl _o__ismbcpunct(long) _ismbcpunct @ stub _o__ismbcpunct_l @ cdecl _o__ismbcspace(long) _ismbcspace

1 0

Jacek Caban : wineconsole: Use NtCreateFile to create renderer object.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 919a94aa954f543b49728f1750ea23aab21cc41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=919a94aa954f543b49728f17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:33 2020 +0200 wineconsole: Use NtCreateFile to create renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 7 +++++++ programs/wineconsole/wineconsole.c | 20 +++++++++++++++++++- server/console.c | 12 ++++-------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 80613d6b7f..bf00262d70 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -46,6 +46,13 @@ /* console handle type */ typedef unsigned int condrv_handle_t; +/* convert an object handle to a server handle */ +static inline condrv_handle_t condrv_handle( HANDLE handle ) +{ + if ((int)(INT_PTR)handle != (INT_PTR)handle) return 0xfffffff0; /* some invalid handle */ + return (INT_PTR)handle; +} + /* structure for console char/attribute info */ typedef struct { diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 5040800946..4e0309f18b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -637,10 +637,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna enum init_return (*backend)(struct inner_data*), INT nCmdShow) { + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; struct inner_data* data = NULL; DWORD ret; struct config_data cfg; STARTUPINFOW si; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + condrv_handle_t h; + NTSTATUS status; + + static const WCHAR renderer_pathW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', + '\\','R','e','n','d','e','r','e','r',0}; data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); if (!data) return 0; @@ -682,12 +690,22 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna ret = !wine_server_call_err( req ); data->hConIn = wine_server_ptr_handle( reply->handle_in ); - data->hSynchro = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; if (!ret) goto error; WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro); + RtlInitUnicodeString(&string, renderer_pathW); + attr.ObjectName = &string; + status = NtCreateFile(&data->hSynchro, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES + | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, + 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); + if (status) goto error; + + h = condrv_handle(data->hConIn); + if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) + goto error; + SERVER_START_REQ(create_console_output) { req->handle_in = wine_server_obj_handle( data->hConIn ); diff --git a/server/console.c b/server/console.c index f56d4ba380..4ff433be4e 100644 --- a/server/console.c +++ b/server/console.c @@ -1847,7 +1847,6 @@ DECL_HANDLER(alloc_console) obj_handle_t in = 0; obj_handle_t evt = 0; struct process *process; - struct thread *renderer; struct console_input *console; int fd; int attach = 0; @@ -1865,8 +1864,7 @@ DECL_HANDLER(alloc_console) switch (req->pid) { case 0: - /* renderer is current, console to be attached to parent process */ - renderer = current; + /* console to be attached to parent process */ if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); @@ -1876,15 +1874,13 @@ DECL_HANDLER(alloc_console) attach = 1; break; case 0xffffffff: - /* no renderer, console to be attached to current process */ - renderer = NULL; + /* console to be attached to current process */ process = current->process; grab_object( process ); attach = 1; break; default: - /* renderer is current, console to be attached to req->pid */ - renderer = current; + /* console to be attached to req->pid */ if (!(process = get_process_from_id( req->pid ))) { if (fd != -1) close( fd ); @@ -1899,7 +1895,7 @@ DECL_HANDLER(alloc_console) goto the_end; } - if ((console = (struct console_input*)create_console_input( renderer, fd ))) + if ((console = (struct console_input*)create_console_input( NULL, fd ))) { if ((in = alloc_handle( current->process, console, req->access, req->attributes ))) {

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: c4789b08f3bcc879d3a95b1023626a3e2a3a8967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4789b08f3bcc879d3a95b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:09 2020 +0200 server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ++++ server/console.c | 23 +++++++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 606c171c01..80613d6b7f 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -41,6 +41,10 @@ /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_PROPERTIES) + +/* console handle type */ +typedef unsigned int condrv_handle_t; /* structure for console char/attribute info */ typedef struct diff --git a/server/console.c b/server/console.c index 345dd9b4e5..f56d4ba380 100644 --- a/server/console.c +++ b/server/console.c @@ -1732,6 +1732,29 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct queue_async( &evts->read_q, async ); return 1; + case IOCTL_CONDRV_ATTACH_RENDERER: + { + struct console_input *console_input; + if (get_req_data_size() != sizeof(condrv_handle_t)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + console_input = (struct console_input *)get_handle_obj( current->process, *(condrv_handle_t *)get_req_data(), + 0, &console_input_ops ); + if (!console_input) return 0; + + if (!console_input->evt) + { + console_input->evt = (struct console_input_events *)grab_object( evts ); + console_input->renderer = current; + } + else set_error( STATUS_INVALID_HANDLE ); + + release_object( console_input ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; diff --git a/server/trace.c b/server/trace.c index 585ac50a0f..a2ee9c10b7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,6 +114,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) switch(*code) { #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break + CASE(IOCTL_CONDRV_ATTACH_RENDERER); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO); CASE(IOCTL_CONDRV_GET_MODE);

1 0

Piotr Caban : msvcrt: Don't use tolowerW in _towlower_l.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 7d2fafc0f889fe27959785defb936d26dddf4d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2fafc0f889fe27959785de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:42 2020 +0200 msvcrt: Don't use tolowerW in _towlower_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 29cad7c44e..f715832c26 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -92,6 +92,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + MSVCRT_wchar_t ret; if(!locale) locinfo = get_locinfo(); @@ -104,7 +105,9 @@ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) return c; } - return tolowerW(c); + if(!LCMapStringW(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, &c, 1, &ret, 1)) + return c; + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Improve __crtLCMapStringA implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 59ee87877c0767e2ac128ce7e37fe2b4b8cebb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ee87877c0767e2ac128ce7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:35 2020 +0200 msvcrt: Improve __crtLCMapStringA implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index bbcaed0ae0..bde08f2117 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -713,12 +713,52 @@ int CDECL __crtLCMapStringA( LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, int dstlen, unsigned int codepage, int xflag ) { - FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", - lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag); - /* FIXME: A bit incorrect. But msvcrt itself just converts its - * arguments to wide strings and then calls LCMapStringW - */ - return LCMapStringA(lcid,mapflags,src,srclen,dst,dstlen); + WCHAR buf_in[32], *in = buf_in; + WCHAR buf_out[32], *out = buf_out; + int in_len, out_len, r; + + TRACE("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid, mapflags, src, srclen, dst, dstlen, codepage, xflag); + + in_len = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, NULL, 0); + if (!in_len) return 0; + if (in_len > ARRAY_SIZE(buf_in)) + { + in = malloc(in_len * sizeof(WCHAR)); + if (!in) return 0; + } + + r = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, in, in_len); + if (!r) goto done; + + if (mapflags & LCMAP_SORTKEY) + { + r = LCMapStringW(lcid, mapflags, in, in_len, (WCHAR*)dst, dstlen); + goto done; + } + + r = LCMapStringW(lcid, mapflags, in, in_len, NULL, 0); + if (!r) goto done; + out_len = r; + if (r > ARRAY_SIZE(buf_out)) + { + out = malloc(r * sizeof(WCHAR)); + if (!out) + { + r = 0; + goto done; + } + } + + r = LCMapStringW(lcid, mapflags, in, in_len, out, out_len); + if (!r) goto done; + + r = WideCharToMultiByte(codepage, 0, out, out_len, dst, dstlen, NULL, NULL); + +done: + if (in != buf_in) free(in); + if (out != buf_out) free(out); + return r; } /*********************************************************************

1 0

Paul Gofman : ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 12dba1b2ae50099de4cd857f867ebcaefe6852d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dba1b2ae50099de4cd857f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 16 15:08:26 2020 +0300 ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher. Fixes StarCraft crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 16 +++---- dlls/ntdll/tests/exception.c | 100 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 95 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12dba1b2ae50099de4cd…

1 0

Paul Gofman : ntdll/tests: Test KiUserExceptionDispatcher with RtlUnwind on i386.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 2aa58e43a0d8589aa37f275147e5beab023b5d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa58e43a0d8589aa37f2751… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 16 18:36:13 2020 +0300 ntdll/tests: Test KiUserExceptionDispatcher with RtlUnwind on i386. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 88 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44b00ad7b0..fce1de385e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1667,6 +1667,23 @@ static void *hook_KiUserExceptionDispatcher_eip; static void *dbg_except_continue_handler_eip; static void *hook_exception_address; +static struct +{ + DWORD old_eax; + DWORD old_edx; + DWORD old_esi; + DWORD old_edi; + DWORD old_ebp; + DWORD old_esp; + DWORD new_eax; + DWORD new_edx; + DWORD new_esi; + DWORD new_edi; + DWORD new_ebp; + DWORD new_esp; +} +test_kiuserexceptiondispatcher_regs; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -1677,6 +1694,11 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; + + context->Eip = (DWORD)code_mem + 0x1c; + context->Eax = 0xdeadbeef; + context->Esi = 0xdeadbeef; + pRtlUnwind(NtCurrentTeb()->Tib.ExceptionList, (void *)context->Eip, rec, (void *)0xdeadbeef); return ExceptionContinueExecution; } @@ -1701,6 +1723,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE * software raised exception. */ context->Eip = (ULONG_PTR)rec->ExceptionAddress; } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -1725,9 +1748,39 @@ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *contex static void test_kiuserexceptiondispatcher(void) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - static const BYTE except_code[] = + static BYTE except_code[] = { + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1 */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + 0x83, 0xc1, 0x18, /* add $0x18, %ecx */ + + /* offset: 0x19 */ 0xcc, /* int3 */ + + 0x0f, 0x0b, /* ud2, illegal instruction */ + + /* offset: 0x1c */ + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1d */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + + 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0xc3, /* ret */ }; static BYTE hook_trampoline[] = @@ -1745,6 +1798,7 @@ static void test_kiuserexceptiondispatcher(void) void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; + void *bpt_address; BYTE *ptr; BOOL ret; @@ -1755,6 +1809,15 @@ static void test_kiuserexceptiondispatcher(void) return; } + if (!pRtlUnwind) + { + win_skip("RtlUnwind is not available.\n"); + return; + } + + *(DWORD *)(except_code + 1) = (DWORD)&test_kiuserexceptiondispatcher_regs; + *(DWORD *)(except_code + 0x1d) = (DWORD)&test_kiuserexceptiondispatcher_regs.new_eax; + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; @@ -1786,13 +1849,24 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n", + test_kiuserexceptiondispatcher_regs.new_eax); + ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n", + test_kiuserexceptiondispatcher_regs.new_esi); + ok(test_kiuserexceptiondispatcher_regs.old_edi + == test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_ebp + == test_kiuserexceptiondispatcher_regs.new_ebp, "ebp does not match.\n"); + + bpt_address = (BYTE *)code_mem + 0x19; + + ok(hook_exception_address == bpt_address || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", - hook_exception_address, code_mem); - ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_eip, code_mem); - ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_eip, code_mem); + hook_exception_address, bpt_address); + ok(hook_KiUserExceptionDispatcher_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, bpt_address); + ok(dbg_except_continue_handler_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, bpt_address); record.ExceptionCode = 0x80000003; record.ExceptionFlags = 0;

1 0

Piotr Caban : msvcrt: Don't use toupperW in _toupper_l.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 2a0569bbdfc4cf882ac0c949dfc9579ddf792af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0569bbdfc4cf882ac0c949… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:15 2020 +0200 msvcrt: Don't use toupperW in _toupper_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7322ea47c2..e051c01521 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -363,8 +363,7 @@ int CDECL MSVCRT___iscsymf(int c) int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - unsigned char str[2], *p = str; - WCHAR wide, upper; + unsigned char str[2], *p = str, ret[2]; if(!locale) locinfo = get_locinfo(); @@ -382,22 +381,15 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) } *p++ = c & 255; - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) - return c; - - upper = toupperW(wide); - if(upper == wide) - return str[0] + (str[1]<<8); - - switch(WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, (char*)str, 2, NULL, NULL)) { + switch(__crtLCMapStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, + (char*)str, p-str, (char*)ret, 2, locinfo->lc_codepage, 0)) + { case 0: return c; case 1: - return str[0]; + return ret[0]; default: - return str[0] + (str[1]<<8); + return ret[0] + (ret[1]<<8); } }

1 0