November 2020 - Wine-Commits

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 9591dec3861b61c565c66e53e77bbb73428fbe0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9591dec3861b61c565c66e53… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Nov 27 16:03:34 2020 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5dcbb033700..278894eb89a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6920,10 +6920,8 @@ msgid "Not implemented.\n" msgstr "Ei toteutettu.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kutsu epäonnistui.\n" +msgstr "Kutsu epäonnistui.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" @@ -9898,16 +9896,12 @@ msgid "Iran Daylight Time" msgstr "Iranin kesäaika" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Haitin normaaliaika" +msgstr "Saint-Pierren normaaliaika" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Haitin kesäaika" +msgstr "Saint-Pierren kesäaika" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -9950,16 +9944,12 @@ msgid "Central Asia Daylight Time" msgstr "Keski-Aasian kesäaika" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Korean normaaliaika" +msgstr "Lord Howen normaaliaika" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Korean kesäaika" +msgstr "Lord Howen kesäaika" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10010,16 +10000,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Azerbaidžanin kesäaika" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Magadanin normaaliaika" +msgstr "Magallanesin normaaliaika" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Magadanin kesäaika" +msgstr "Magallanesin kesäaika" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10370,16 +10356,12 @@ msgid "Arabian Daylight Time" msgstr "Arabian kesäaika" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Kalliovuorten normaaliaika" +msgstr "Tocantinsin normaaliaika" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Kalliovuorten kesäaika" +msgstr "Tocantinsin kesäaika" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10390,16 +10372,12 @@ msgid "Russian Daylight Time" msgstr "Venäjän kesäaika" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Australian keskinen normaaliaika" +msgstr "Australian keskilännen normaaliaika" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Australian keskinen kesäaika" +msgstr "Australian keskilännen kesäaika" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time"

1 0

Piotr Caban : msvcp60: Remove MSVCP_bool type.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 74859a9cdcf3f37682c99168d727875628d9fcf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74859a9cdcf3f37682c99168… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:27 2020 +0100 msvcp60: Remove MSVCP_bool type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 222 +++++++++++++++++++++++++------------------------- dlls/msvcp60/msvcp.h | 24 +++--- dlls/msvcp60/string.c | 88 ++++++++++---------- 3 files changed, 167 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74859a9cdcf3f37682c9…

1 0

Piotr Caban : msvcp60/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 28587de754af661d7e0d9c735e66c1e64676c525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28587de754af661d7e0d9c73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:20 2020 +0100 msvcp60/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 4 +--- dlls/msvcp60/tests/string.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 806090b9667..b4753f3ee51 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1614,8 +1614,6 @@ static void test_istream_getline(void) static void test_ostream_print_ushort(void) { - static const wchar_t str65[] = { '6','5',0 }; - basic_stringstream_wchar wss; basic_string_wchar pwstr; const wchar_t *wstr; @@ -1625,7 +1623,7 @@ static void test_ostream_print_ushort(void) call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); - ok(!lstrcmpW(str65, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + ok(!lstrcmpW(L"65", wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); call_func1(p_basic_string_wchar_dtor, &pwstr); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 6a0efc178cf..ca6b05d6627 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -562,12 +562,11 @@ static void test_basic_string_char_concatenate(void) { } static void test_basic_string_char_find(void) { - static const char tmp[] = {'a','a','a','\0','b','b','b',0}; basic_string_char str; size_t ret; call_func1(p_basic_string_char_ctor, &str); - call_func3(p_basic_string_char_assign_cstr_len, &str, tmp, 7); + call_func3(p_basic_string_char_assign_cstr_len, &str, "aaa\0bbb", 7); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 0, 3); ok(ret == 0, "ret = %lu\n", (unsigned long)ret); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 1, 3); @@ -660,8 +659,6 @@ static void test_basic_string_char_replace(void) { } static void test_basic_string_wchar(void) { - static const wchar_t test[] = { 't','e','s','t',0 }; - basic_string_wchar str1, str2, *pstr; const wchar_t *str; size_t size, capacity; @@ -676,12 +673,12 @@ static void test_basic_string_wchar(void) { ok(*str == '\0', "*str = %c\n", *str); call_func1(p_basic_string_wchar_dtor, &str1); - pstr = call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, test, &fake_allocator); + pstr = call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, L"test", &fake_allocator); ok(pstr == &str1, "pstr != &str1\n"); str = call_func1(p_basic_string_wchar_cstr, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); @@ -691,9 +688,9 @@ static void test_basic_string_wchar(void) { pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); ok(pstr == &str2, "pstr != &str2\n"); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_erase, &str2, 1, 2); str = call_func1(p_basic_string_wchar_cstr, &str2); @@ -715,11 +712,11 @@ static void test_basic_string_wchar(void) { capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); - call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); + call_func3(p_basic_string_wchar_assign_cstr_len, &str2, L"test", 4); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, (str+1), 2); str = call_func1(p_basic_string_wchar_cstr, &str2);

1 0

Piotr Caban : msvcp90: Remove MSVCP_size_t type.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 0237785d9d777f49ed44623b814044d602d09bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0237785d9d777f49ed44623b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:47 2020 +0100 msvcp90: Remove MSVCP_size_t type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 71 ++--- dlls/msvcp90/locale.c | 506 +++++++++++++++++----------------- dlls/msvcp90/memory.c | 26 +- dlls/msvcp90/misc.c | 158 +++++------ dlls/msvcp90/msvcp90.h | 41 ++- dlls/msvcp90/msvcp_main.c | 8 +- dlls/msvcp90/string.c | 686 +++++++++++++++++++++++----------------------- 7 files changed, 748 insertions(+), 748 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0237785d9d777f49ed44…

1 0

Robert Wilhelm : vbscript: Remove no longer used bool call_statement_t.is_strict member variable.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: a7c8499902c675bbb7b44ac00b8d41146b7ee179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c8499902c675bbb7b44ac0… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 19:46:38 2020 +0100 vbscript: Remove no longer used bool call_statement_t.is_strict member variable. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f5d8a616b9f..2888ea3b546 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -140,7 +140,6 @@ typedef struct _statement_t { typedef struct { statement_t stat; call_expression_t *expr; - BOOL is_strict; } call_statement_t; typedef struct { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 034baffa4dd..37b14f05e14 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,7 @@ static call_expression_t *new_call_expression(parser_ctx_t*,expression_t*,expres static call_expression_t *make_call_expression(parser_ctx_t*,expression_t*,expression_t*); static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); -static statement_t *new_call_statement(parser_ctx_t*,unsigned,BOOL,expression_t*); +static statement_t *new_call_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); @@ -200,8 +200,8 @@ Statement SimpleStatement : CallExpression ArgumentList_opt { call_expression_t *call_expr = make_call_expression(ctx, $1, $2); CHECK_ERROR; - $$ = new_call_statement(ctx, @$, FALSE, &call_expr->expr); CHECK_ERROR; }; - | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, TRUE, $2); CHECK_ERROR; } + $$ = new_call_statement(ctx, @$, &call_expr->expr); CHECK_ERROR; }; + | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, $2); CHECK_ERROR; } | CallExpression '=' Expression { $$ = new_assign_statement(ctx, @$, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } @@ -734,7 +734,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return stat; } -static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_strict, expression_t *expr) +static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, expression_t *expr) { call_expression_t *call_expr = NULL; call_statement_t *stat; @@ -758,7 +758,6 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_ return NULL; stat->expr = call_expr; - stat->is_strict = is_strict; return &stat->stat; }

1 0

Jacek Caban : server: Use separated fd ops for unbound console input.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: a61188bfa5bf20443b11f397d8ef6e7e5fd4bdf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a61188bfa5bf20443b11f397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:59 2020 +0100 server: Use separated fd ops for unbound console input. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 18 ++++++++- server/console.c | 94 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 101 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0376d00892e..5e604e949f6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3776,15 +3776,20 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { - HANDLE handle, unbound_output = NULL; + HANDLE handle, unbound_output = NULL, unbound_input = NULL; DWORD size, mode; WCHAR title[16]; + char buf[32]; HWND hwnd; UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); - if (!skip_nt) unbound_output = create_unbound_handle(TRUE, TRUE); + if (!skip_nt) + { + unbound_input = create_unbound_handle(FALSE, TRUE); + unbound_output = create_unbound_handle(TRUE, TRUE); + } ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); @@ -3865,10 +3870,19 @@ static void test_FreeConsole(void) handle = GetConsoleInputWaitHandle(); ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); + ret = ReadFile(unbound_input, buf, sizeof(buf), &size, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x %u\n", ret, GetLastError()); + + ret = FlushFileBuffers(unbound_input); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x %u\n", ret, GetLastError()); + ret = GetConsoleMode(unbound_output, &mode); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode returned %x %u\n", ret, GetLastError()); + CloseHandle(unbound_input); CloseHandle(unbound_output); } diff --git a/server/console.c b/server/console.c index 91a00df0998..7cffa512f0e 100644 --- a/server/console.c +++ b/server/console.c @@ -290,15 +290,22 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +struct console_input +{ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd */ +}; + static void console_input_dump( struct object *obj, int verbose ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); +static void console_input_destroy( struct object *obj ); static const struct object_ops console_input_ops = { - sizeof(struct object), /* size */ + sizeof(struct console_input), /* size */ console_input_dump, /* dump */ console_device_get_type, /* get_type */ console_input_add_queue, /* add_queue */ @@ -317,7 +324,26 @@ static const struct object_ops console_input_ops = console_input_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ - no_destroy /* destroy */ + console_input_destroy /* destroy */ +}; + +static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); +static int console_input_flush( struct fd *fd, struct async *async ); +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_input_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + console_input_read, /* read */ + no_fd_write, /* write */ + console_input_flush, /* flush */ + console_get_file_info, /* get_file_info */ + console_get_volume_info, /* get_volume_info */ + console_input_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ }; static void console_output_dump( struct object *obj, int verbose ); @@ -1213,8 +1239,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) { + struct console_input *console_input; name->len = 0; - return alloc_object( &console_input_ops ); + if (!(console_input = alloc_object( &console_input_ops ))) return NULL; + console_input->fd = alloc_pseudo_fd( &console_input_fd_ops, &console_input->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + if (!console_input->fd) + { + release_object( console_input ); + return NULL; + } + return &console_input->obj; } if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) @@ -1285,12 +1320,9 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry static struct fd *console_input_get_fd( struct object *obj ) { - if (!current->process->console) - { - set_error( STATUS_ACCESS_DENIED ); - return 0; - } - return get_obj_fd( &current->process->console->obj ); + struct console_input *console_input = (struct console_input *)obj; + assert( obj->ops == &console_input_ops ); + return (struct fd *)grab_object( console_input->fd ); } static struct object *console_input_open_file( struct object *obj, unsigned int access, @@ -1299,6 +1331,50 @@ static struct object *console_input_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static void console_input_destroy( struct object *obj ) +{ + struct console_input *console_input = (struct console_input *)obj; + + assert( obj->ops == &console_input_ops ); + if (console_input->fd) release_object( console_input->fd ); +} + +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_ioctl( console->fd, code, async ); +} + +static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_read( console->fd, async, pos ); +} + +static int console_input_flush( struct fd *fd, struct async *async ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_flush( console->fd, async ); +} + static void console_output_dump( struct object *obj, int verbose ) { fputs( "console Output device\n", stderr );

1 0

Jacek Caban : server: Rename unbound devices to console_input and console_output.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 946da4f3d86202ca2cfc6b59cb37d5602802c9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=946da4f3d86202ca2cfc6b59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:51 2020 +0100 server: Rename unbound devices to console_input and console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/server/console.c b/server/console.c index f1ce9b27dbd..91a00df0998 100644 --- a/server/console.c +++ b/server/console.c @@ -290,23 +290,23 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; -static void input_device_dump( struct object *obj, int verbose ); -static struct object *input_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ); -static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *input_device_get_fd( struct object *obj ); +static void console_input_dump( struct object *obj, int verbose ); +static struct object *console_input_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_input_get_fd( struct object *obj ); -static const struct object_ops input_device_ops = +static const struct object_ops console_input_ops = { sizeof(struct object), /* size */ - input_device_dump, /* dump */ + console_input_dump, /* dump */ console_device_get_type, /* get_type */ - input_device_add_queue, /* add_queue */ + console_input_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - input_device_get_fd, /* get_fd */ + console_input_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -314,29 +314,29 @@ static const struct object_ops input_device_ops = no_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ - input_device_open_file, /* open_file */ + console_input_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ no_destroy /* destroy */ }; -static void output_device_dump( struct object *obj, int verbose ); -static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *output_device_get_fd( struct object *obj ); -static struct object *output_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ); +static void console_output_dump( struct object *obj, int verbose ); +static int console_output_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_output_get_fd( struct object *obj ); +static struct object *console_output_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); -static const struct object_ops output_device_ops = +static const struct object_ops console_output_ops = { sizeof(struct object), /* size */ - output_device_dump, /* dump */ + console_output_dump, /* dump */ console_device_get_type, /* get_type */ - output_device_add_queue, /* add_queue */ + console_output_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - output_device_get_fd, /* get_fd */ + console_output_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -344,7 +344,7 @@ static const struct object_ops output_device_ops = no_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ - output_device_open_file, /* open_file */ + console_output_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -1214,13 +1214,13 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) { name->len = 0; - return alloc_object( &input_device_ops ); + return alloc_object( &console_input_ops ); } if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) { name->len = 0; - return alloc_object( &output_device_ops ); + return alloc_object( &console_output_ops ); } if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) @@ -1268,12 +1268,12 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } -static void input_device_dump( struct object *obj, int verbose ) +static void console_input_dump( struct object *obj, int verbose ) { fputs( "console Input device\n", stderr ); } -static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ) { if (!current->process->console) { @@ -1283,7 +1283,7 @@ static int input_device_add_queue( struct object *obj, struct wait_queue_entry * return add_queue( &current->process->console->obj, entry ); } -static struct fd *input_device_get_fd( struct object *obj ) +static struct fd *console_input_get_fd( struct object *obj ) { if (!current->process->console) { @@ -1293,18 +1293,18 @@ static struct fd *input_device_get_fd( struct object *obj ) return get_obj_fd( &current->process->console->obj ); } -static struct object *input_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ) +static struct object *console_input_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) { return grab_object( obj ); } -static void output_device_dump( struct object *obj, int verbose ) +static void console_output_dump( struct object *obj, int verbose ) { fputs( "console Output device\n", stderr ); } -static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +static int console_output_add_queue( struct object *obj, struct wait_queue_entry *entry ) { if (!current->process->console || !current->process->console->active) { @@ -1314,7 +1314,7 @@ static int output_device_add_queue( struct object *obj, struct wait_queue_entry return add_queue( &current->process->console->obj, entry ); } -static struct fd *output_device_get_fd( struct object *obj ) +static struct fd *console_output_get_fd( struct object *obj ) { if (!current->process->console || !current->process->console->active) { @@ -1325,8 +1325,8 @@ static struct fd *output_device_get_fd( struct object *obj ) return get_obj_fd( &current->process->console->active->obj ); } -static struct object *output_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ) +static struct object *console_output_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) { return grab_object( obj ); }

1 0

Robert Wilhelm : vbscript: Add parameters to FIXME in VBScript_AddTypeLib.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 21890eb3e31311dd203e2e2a224bcdcadcc6a466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21890eb3e31311dd203e2e2a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 18:52:15 2020 +0100 vbscript: Add parameters to FIXME in VBScript_AddTypeLib. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f31bdf2d351..4b57b4b2b93 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -739,7 +739,7 @@ static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTyp DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %d %d %d)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags); return E_NOTIMPL; }

1 0

Piotr Caban : msvcp60: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 5beff5209ee049556c6b683bfae1f76faf8a0f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beff5209ee049556c6b683b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:18 2020 +0100 msvcp60: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 15b1f74b811..93bd693890c 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2878,21 +2878,20 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) /* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { - static const wchar_t rW[] = {'r',0}; static const struct { int mode; const wchar_t str[4]; const wchar_t str_bin[4]; } str_mode[] = { - {OPENMODE_out, {'w',0}, {'w','b',0}}, - {OPENMODE_out|OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_out|OPENMODE_trunc, {'w',0}, {'w','b',0}}, - {OPENMODE_in, {'r',0}, {'r','b',0}}, - {OPENMODE_in|OPENMODE_out, {'r','+',0}, {'r','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, {'w','+',0}, {'w','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_app, {'a','+',0}, {'a','+','b',0}}, - {OPENMODE_in|OPENMODE_app, {'a','+',0}, {'a','+','b',0}} + {OPENMODE_out, L"w", L"wb"}, + {OPENMODE_out|OPENMODE_app, L"a", L"ab"}, + {OPENMODE_app, L"a", L"ab"}, + {OPENMODE_out|OPENMODE_trunc, L"w", L"wb"}, + {OPENMODE_in, L"r", L"rb"}, + {OPENMODE_in|OPENMODE_out, L"r+", L"r+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, L"w+", L"w+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_app, L"a+", L"a+b"}, + {OPENMODE_in|OPENMODE_app, L"a+", L"a+b"} }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); @@ -2907,13 +2906,13 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; - if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) + if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, L"r"))) return NULL; else if(f) fclose(f); if((mode & OPENMODE__Noreplace) && (mode & (OPENMODE_out|OPENMODE_app)) - && (f = _wfopen(name, rW))) { + && (f = _wfopen(name, L"r"))) { fclose(f); return NULL; }

1 0

Piotr Caban : msvcp60: Remove MSVCP_size_t type.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 5087759e4ce26f177e8d6092761e96c6486ff41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5087759e4ce26f177e8d6092… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:14 2020 +0100 msvcp60: Remove MSVCP_size_t type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 70 +++--- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/msvcp.h | 41 ++-- dlls/msvcp60/string.c | 578 +++++++++++++++++++++++++------------------------- 4 files changed, 345 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5087759e4ce26f177e8d…

1 0