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

Gijs Vermeulen : qdvd: Support aggregation.
by Alexandre Julliard 17 Jul '20

17 Jul '20

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

Jacek Caban : server: Allow creating console renderer with open_file.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 5a174dd60446effe39f78ec7b4394e80e2522d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a174dd60446effe39f78ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:49:55 2020 +0200 server: Allow creating console renderer with open_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/server/console.c b/server/console.c index 17e11bc7ec..345dd9b4e5 100644 --- a/server/console.c +++ b/server/console.c @@ -124,6 +124,8 @@ static const struct fd_ops console_input_fd_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); static struct fd *console_input_events_get_fd( struct object *obj ); +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); struct console_input_events { @@ -152,7 +154,7 @@ static const struct object_ops console_input_events_ops = no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ - no_open_file, /* open_file */ + console_input_events_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ console_input_events_destroy /* destroy */ @@ -331,6 +333,12 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + /* retrieves events from the console's renderer events list */ static int get_renderer_events( struct console_input_events* evts, struct async *async ) { @@ -406,7 +414,7 @@ static void console_input_events_append( struct console_input* console, } } -static struct console_input_events *create_console_input_events(void) +static struct object *create_console_input_events(void) { struct console_input_events* evt; @@ -419,7 +427,7 @@ static struct console_input_events *create_console_input_events(void) release_object( evt ); return NULL; } - return evt; + return &evt->obj; } static struct object *create_console_input( struct thread* renderer, int fd ) @@ -439,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? create_console_input_events() : NULL; + console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -1747,6 +1755,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1776,6 +1785,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return grab_object( obj ); } + if (name->len == sizeof(rendererW) && !memcmp( name->str, rendererW, name->len )) + { + name->len = 0; + return create_console_input_events(); + } + return NULL; }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_ATTACH_RENDERER ioctl.
by Alexandre Julliard 17 Jul '20

17 Jul '20

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

Jacek Caban : wineconsole: Use NtCreateFile to create renderer object.
by Alexandre Julliard 17 Jul '20

17 Jul '20

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: Remove support for crating renderer in alloc_console request.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 9415667cdfbb4c94cdfe03a1e80a87482bee98c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9415667cdfbb4c94cdfe03a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:42 2020 +0200 server: Remove support for crating renderer in alloc_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/server/console.c b/server/console.c index 4ff433be4e..2785669deb 100644 --- a/server/console.c +++ b/server/console.c @@ -430,7 +430,7 @@ static struct object *create_console_input_events(void) return &evt->obj; } -static struct object *create_console_input( struct thread* renderer, int fd ) +static struct object *create_console_input( int fd ) { struct console_input *console_input; @@ -439,7 +439,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) if (fd != -1) close( fd ); return NULL; } - console_input->renderer = renderer; + console_input->renderer = NULL; console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS; @@ -447,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; + console_input->evt = NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -462,7 +462,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->fd = NULL; init_async_queue( &console_input->read_q ); - if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) + if (!console_input->history || !console_input->event) { if (fd != -1) close( fd ); console_input->history_size = 0; @@ -1844,8 +1844,6 @@ struct object *create_console_device( struct object *root, const struct unicode_ /* allocate a console for the renderer */ DECL_HANDLER(alloc_console) { - obj_handle_t in = 0; - obj_handle_t evt = 0; struct process *process; struct console_input *console; int fd; @@ -1892,31 +1890,17 @@ DECL_HANDLER(alloc_console) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); - goto the_end; } - - if ((console = (struct console_input*)create_console_input( NULL, fd ))) + else if ((console = (struct console_input*)create_console_input( fd ))) { - if ((in = alloc_handle( current->process, console, req->access, req->attributes ))) + if ((reply->handle_in = alloc_handle( current->process, console, req->access, + req->attributes )) && attach) { - if (!console->evt || - (evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 ))) - { - if (attach) - { - process->console = (struct console_input*)grab_object( console ); - console->num_proc++; - } - reply->handle_in = in; - reply->event = evt; - release_object( console ); - goto the_end; - } - close_handle( current->process, in ); + process->console = (struct console_input*)grab_object( console ); + console->num_proc++; } release_object( console ); } - the_end: release_object( process ); }

1 0

Daniel Lehman : msvcrt: Treat large exponent as overflow in strtod.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: ee65859b7f007f64104242dfebeefc61385aaf3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee65859b7f007f64104242df… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:37 2020 +0200 msvcrt: Treat large exponent as overflow in strtod. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 49cc8e40ae..a654bb1dde 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -423,7 +423,7 @@ static double make_double(int sign, int exp, ULONGLONG m, enum round round, int } } - if (exp >= 1<<EXP_BITS) + if (exp >= (1<<EXP_BITS)-1) { if (err) *err = MSVCRT_ERANGE; return sign * INFINITY; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8a2d678b63..ad41ad4d24 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1956,7 +1956,12 @@ static void test__strtod(void) { "0.1d238", 7, 0.1e238 }, { "0.1D-4736", 9, 0, ERANGE }, { "3.4028234663852887e38", 21, FLT_MAX }, + { "1.1754943508222875e-38", 22, FLT_MIN }, { "1.7976931348623158e+308", 23, DBL_MAX }, + { "1.7976931348623159e+308", 23, INFINITY, ERANGE }, + { "2.2250738585072014e-308", 23, DBL_MIN }, + { "-1.7976931348623158e+308", 24, -DBL_MAX }, + { "-1.7976931348623159e+308", 24, -INFINITY, ERANGE }, { "00", 2, 0 }, { "00.", 3, 0 }, { ".00", 3, 0 },

1 0

Daniel Lehman : ucrtbase/tests: Check errno in strtod tests.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3fc33a4282b04a06b08bc158be439841f9d3d9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc33a4282b04a06b08bc158… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:45 2020 +0200 ucrtbase/tests: Check errno in strtod tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index f85f9abf73..5857a02773 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -77,12 +77,18 @@ static BOOL local_isnan(double d) return d != d; } -#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length) -static void _test_strtod_str(int line, const char* string, double value, int length) +#define test_strtod_str_errno(string, value, length, err) _test_strtod_str(__LINE__, string, value, length, err) +#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length, 0) +static void _test_strtod_str(int line, const char* string, double value, int length, int err) { char *end; double d; + errno = 0xdeadbeef; d = strtod(string, &end); + if(!err) + ok_(__FILE__, line)(errno == 0xdeadbeef, "errno = %d\n", errno); + else + ok_(__FILE__, line)(errno == err, "errno = %d\n", errno); if (local_isnan(value)) ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); else @@ -102,6 +108,8 @@ static void test_strtod(void) test_strtod_str("infini", INFINITY, 3); test_strtod_str("input", 0, 0); test_strtod_str("-input", 0, 0); + test_strtod_str_errno("1.7976931348623159e+308", INFINITY, 23, ERANGE); + test_strtod_str_errno("-1.7976931348623159e+308", -INFINITY, 24, ERANGE); test_strtod_str("NAN", NAN, 3); test_strtod_str("nan", NAN, 3); @@ -137,6 +145,7 @@ static void test_strtod(void) test_strtod_str("4.0621786324484881721115322e-53", 4.0621786324484881721115322e-53, 31); test_strtod_str("1.8905590910042396899370942", 1.8905590910042396899370942, 27); + test_strtod_str("1.7976931348623158e+308", 1.7976931348623158e+308, 23); test_strtod_str("2.2250738585072014e-308", 2.2250738585072014e-308, 23); test_strtod_str("4.9406564584124654e-324", 4.9406564584124654e-324, 23); }

1 0

Paul Gofman : ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher.
by Alexandre Julliard 17 Jul '20

17 Jul '20

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 17 Jul '20

17 Jul '20

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: Improve __crtLCMapStringA implementation.
by Alexandre Julliard 17 Jul '20

17 Jul '20

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