wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Alexandre Julliard : server: Store length of console history lines instead of null-terminating them.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: ffe6548d6c55f81918e1aa63228b724cbe72e567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe6548d6c55f81918e1aa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:57:39 2020 +0100 server: Store length of console history lines instead of null-terminating them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/server/console.c b/server/console.c index e05bc9668c..5feb1c2ba7 100644 --- a/server/console.c +++ b/server/console.c @@ -42,6 +42,12 @@ struct screen_buffer; struct console_input_events; +struct history_line +{ + data_size_t len; + WCHAR text[1]; +}; + struct console_input { struct object obj; /* object header */ @@ -54,7 +60,7 @@ struct console_input struct console_input_events *evt; /* synchronization event with renderer */ WCHAR *title; /* console title */ data_size_t title_len; /* length of console title */ - WCHAR **history; /* lines history */ + struct history_line **history; /* lines history */ int history_size; /* number of entries in history array */ int history_index; /* number of used entries in history array */ int history_mode; /* mode of history (non zero means remove doubled strings */ @@ -342,7 +348,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; - console_input->history = calloc( console_input->history_size, sizeof(WCHAR*) ); + console_input->history = calloc( console_input->history_size, sizeof(*console_input->history) ); console_input->history_index = 0; console_input->history_mode = 0; console_input->edition_mode = 0; @@ -798,15 +804,13 @@ static int set_console_input_info( const struct set_console_input_info_request * if ((req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && console->history_size != req->history_size) { - WCHAR** mem = NULL; - int i; - int delta; + struct history_line **mem = NULL; + int i, delta; if (req->history_size) { - mem = mem_alloc( req->history_size * sizeof(WCHAR*) ); - if (!mem) goto error; - memset( mem, 0, req->history_size * sizeof(WCHAR*) ); + if (!(mem = mem_alloc( req->history_size * sizeof(*mem) ))) goto error; + memset( mem, 0, req->history_size * sizeof(*mem) ); } delta = (console->history_index > req->history_size) ? @@ -1081,31 +1085,26 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, /* appends a new line to history (history is a fixed size array) */ static void console_input_append_hist( struct console_input* console, const WCHAR* buf, data_size_t len ) { - WCHAR* ptr = mem_alloc( (len + 1) * sizeof(WCHAR) ); - - if (!ptr) - return; + struct history_line *ptr; if (!console || !console->history_size) { set_error( STATUS_INVALID_PARAMETER ); /* FIXME */ - free( ptr ); return; } - memcpy( ptr, buf, len * sizeof(WCHAR) ); - ptr[len] = 0; - + len = (len / sizeof(WCHAR)) * sizeof(WCHAR); if (console->history_mode && console->history_index && - !strcmpW( console->history[console->history_index - 1], ptr )) + console->history[console->history_index - 1]->len == len && + !memcmp( console->history[console->history_index - 1]->text, buf, len )) { - /* ok, mode ask us to not use twice the same string... - * so just free mem and returns - */ + /* don't duplicate entry */ set_error( STATUS_ALIAS_EXISTS ); - free(ptr); return; } + if (!(ptr = mem_alloc( offsetof( struct history_line, text[len / sizeof(WCHAR)] )))) return; + ptr->len = len; + memcpy( ptr->text, buf, len ); if (console->history_index < console->history_size) { @@ -1115,7 +1114,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA { free( console->history[0]) ; memmove( &console->history[0], &console->history[1], - (console->history_size - 1) * sizeof(WCHAR*) ); + (console->history_size - 1) * sizeof(*console->history) ); console->history[console->history_size - 1] = ptr; } } @@ -1128,8 +1127,8 @@ static data_size_t console_input_get_hist( struct console_input *console, int in if (index >= console->history_index) set_error( STATUS_INVALID_PARAMETER ); else { - ret = strlenW( console->history[index] ) * sizeof(WCHAR); - set_reply_data( console->history[index], min( ret, get_reply_max_size() )); + ret = console->history[index]->len; + set_reply_data( console->history[index]->text, min( ret, get_reply_max_size() )); } return ret; }

1 0

Alexandre Julliard : server: Store length of console title instead of null-terminating it.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 8d6d5a9bc6cb23290978066fe3ade991fe55d887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6d5a9bc6cb23290978066f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:44:03 2020 +0100 server: Store length of console title instead of null-terminating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/server/console.c b/server/console.c index c3b235d022..e05bc9668c 100644 --- a/server/console.c +++ b/server/console.c @@ -53,6 +53,7 @@ struct console_input INPUT_RECORD *records; /* input records */ struct console_input_events *evt; /* synchronization event with renderer */ WCHAR *title; /* console title */ + data_size_t title_len; /* length of console title */ WCHAR **history; /* lines history */ int history_size; /* number of entries in history array */ int history_index; /* number of used entries in history array */ @@ -339,6 +340,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->records = NULL; console_input->evt = renderer ? create_console_input_events() : NULL; console_input->title = NULL; + console_input->title_len = 0; console_input->history_size = 50; console_input->history = calloc( console_input->history_size, sizeof(WCHAR*) ); console_input->history_index = 0; @@ -779,16 +781,15 @@ static int set_console_input_info( const struct set_console_input_info_request * } if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE) { - WCHAR *new_title = mem_alloc( len + sizeof(WCHAR) ); - if (new_title) - { - memcpy( new_title, title, len ); - new_title[len / sizeof(WCHAR)] = 0; - free( console->title ); - console->title = new_title; - evt.event = CONSOLE_RENDERER_TITLE_EVENT; - console_input_events_append( console, &evt ); - } + WCHAR *new_title = NULL; + + len = (len / sizeof(WCHAR)) * sizeof(WCHAR); + if (len && !(new_title = memdup( title, len ))) goto error; + free( console->title ); + console->title = new_title; + console->title_len = len; + evt.event = CONSOLE_RENDERER_TITLE_EVENT; + console_input_events_append( console, &evt ); } if (req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) { @@ -1629,12 +1630,7 @@ DECL_HANDLER(get_console_input_info) struct console_input *console; if (!(console = console_input_get( req->handle, FILE_READ_PROPERTIES ))) return; - if (console->title) - { - data_size_t len = strlenW( console->title ) * sizeof(WCHAR); - if (len > get_reply_max_size()) len = get_reply_max_size(); - set_reply_data( console->title, len ); - } + if (console->title) set_reply_data( console->title, min( console->title_len, get_reply_max_size() )); reply->history_mode = console->history_mode; reply->history_size = console->history_size; reply->history_index = console->history_index;

1 0

Alexandre Julliard : server: Store length of window text instead of null-terminating it.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a88973a5f969eaa0ba0788c52977dd5100a80dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88973a5f969eaa0ba0788c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:40:18 2020 +0100 server: Store length of window text instead of null-terminating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/server/window.c b/server/window.c index c9b131cba5..3a88b7f34f 100644 --- a/server/window.c +++ b/server/window.c @@ -88,6 +88,7 @@ struct window DPI_AWARENESS dpi_awareness; /* DPI awareness mode */ lparam_t user_data; /* user-specific data */ WCHAR *text; /* window caption text */ + data_size_t text_len; /* length of window caption */ unsigned int paint_flags; /* various painting flags */ int prop_inuse; /* number of in-use window properties */ int prop_alloc; /* number of allocated window properties */ @@ -506,6 +507,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->dpi = 0; win->user_data = 0; win->text = NULL; + win->text_len = 0; win->paint_flags = 0; win->prop_inuse = 0; win->prop_alloc = 0; @@ -2407,10 +2409,10 @@ DECL_HANDLER(get_window_text) { struct window *win = get_window( req->handle ); - if (win && win->text) + if (win && win->text_len) { - reply->length = strlenW( win->text ); - set_reply_data( win->text, min( reply->length * sizeof(WCHAR), get_reply_max_size() )); + reply->length = win->text_len / sizeof(WCHAR); + set_reply_data( win->text, min( win->text_len, get_reply_max_size() )); } } @@ -2418,21 +2420,16 @@ DECL_HANDLER(get_window_text) /* set the window text */ DECL_HANDLER(set_window_text) { + data_size_t len; + WCHAR *text = NULL; struct window *win = get_window( req->handle ); - if (win) - { - WCHAR *text = NULL; - data_size_t len = get_req_data_size() / sizeof(WCHAR); - if (len) - { - if (!(text = mem_alloc( (len+1) * sizeof(WCHAR) ))) return; - memcpy( text, get_req_data(), len * sizeof(WCHAR) ); - text[len] = 0; - } - free( win->text ); - win->text = text; - } + if (!win) return; + len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + if (len && !(text = memdup( get_req_data(), len ))) return; + free( win->text ); + win->text = text; + win->text_len = len; }

1 0

Alexandre Julliard : server: Use byte length in dump_strW() for consistency.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 78846662ec718f8e80f3a5b5bb6edf539c792dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=78846662ec718f8e80f3a5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 11:36:33 2020 +0100 server: Use byte length in dump_strW() for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/object.c | 2 +- server/registry.c | 8 ++++---- server/symlink.c | 2 +- server/trace.c | 9 ++++----- server/unicode.c | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/server/atom.c b/server/atom.c index 35db8e3e91..cd1508322c 100644 --- a/server/atom.c +++ b/server/atom.c @@ -188,7 +188,7 @@ static void atom_table_dump( struct object *obj, int verbose ) if (!entry) continue; fprintf( stderr, " %04x: ref=%d pinned=%c hash=%d \"", entry->atom, entry->count, entry->pinned ? 'Y' : 'N', entry->hash ); - dump_strW( entry->str, entry->len / sizeof(WCHAR), stderr, "\"\""); + dump_strW( entry->str, entry->len, stderr, "\"\""); fprintf( stderr, "\"\n" ); } } diff --git a/server/object.c b/server/object.c index aeb30684a8..94a48c909b 100644 --- a/server/object.c +++ b/server/object.c @@ -373,7 +373,7 @@ static void dump_name( struct object *obj ) if (!name) return; if (name->parent) dump_name( name->parent ); fputs( "\\\\", stderr ); - dump_strW( name->name, name->len / sizeof(WCHAR), stderr, "[]" ); + dump_strW( name->name, name->len, stderr, "[]" ); } /* dump the name of an object to stderr */ diff --git a/server/registry.c b/server/registry.c index 964e2ebd58..bb65bb4818 100644 --- a/server/registry.c +++ b/server/registry.c @@ -198,7 +198,7 @@ static void dump_path( const struct key *key, const struct key *base, FILE *f ) dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[]" ); + dump_strW( key->name, key->namelen, f, "[]" ); } /* dump a value to a text file */ @@ -210,7 +210,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (value->namelen) { fputc( '\"', f ); - count = 1 + dump_strW( value->name, value->namelen / sizeof(WCHAR), f, "\"\"" ); + count = 1 + dump_strW( value->name, value->namelen, f, "\"\"" ); count += fprintf( f, "\"=" ); } else count = fprintf( f, "@=" ); @@ -226,7 +226,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (((WCHAR *)value->data)[value->len / sizeof(WCHAR) - 1]) break; if (value->type != REG_SZ) fprintf( f, "str(%x):", value->type ); fputc( '\"', f ); - dump_strW( (WCHAR *)value->data, value->len / sizeof(WCHAR), f, "\"\"" ); + dump_strW( (WCHAR *)value->data, value->len, f, "\"\"" ); fprintf( f, "\"\n" ); return; @@ -272,7 +272,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f if (key->class) { fprintf( f, "#class=\"" ); - dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "\"\"" ); + dump_strW( key->class, key->classlen, f, "\"\"" ); fprintf( f, "\"\n" ); } if (key->flags & KEY_SYMLINK) fputs( "#link\n", f ); diff --git a/server/symlink.c b/server/symlink.c index bc75ee9a7e..e5ee09f015 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -81,7 +81,7 @@ static void symlink_dump( struct object *obj, int verbose ) assert( obj->ops == &symlink_ops ); fputs( "Symlink target=\"", stderr ); - dump_strW( symlink->target, symlink->len / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( symlink->target, symlink->len, stderr, "\"\"" ); fputs( "\"\n", stderr ); } diff --git a/server/trace.c b/server/trace.c index 95db31b4cb..b60422c448 100644 --- a/server/trace.c +++ b/server/trace.c @@ -105,7 +105,7 @@ static void dump_rectangle( const char *prefix, const rectangle_t *rect ) static void dump_char_info( const char *prefix, const char_info_t *info ) { fprintf( stderr, "%s{'", prefix ); - dump_strW( &info->ch, 1, stderr, "\'\'" ); + dump_strW( &info->ch, sizeof(info->ch), stderr, "\'\'" ); fprintf( stderr, "',%04x}", info->attr ); } @@ -544,7 +544,7 @@ static void dump_varargs_string( const char *prefix, data_size_t size ) static void dump_varargs_unicode_str( const char *prefix, data_size_t size ) { fprintf( stderr, "%sL\"", prefix ); - dump_strW( cur_data, size / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( cur_data, size, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( size ); } @@ -824,9 +824,8 @@ static data_size_t dump_inline_unicode_string( const char *prefix, data_size_t p fputs( prefix, stderr ); if (pos >= total_size) return pos; if (len > total_size - pos) len = total_size - pos; - len /= sizeof(WCHAR); dump_strW( (const WCHAR *)cur_data + pos/sizeof(WCHAR), len, stderr, "\"\"" ); - return pos + len * sizeof(WCHAR); + return pos + (len / sizeof(WCHAR)) * sizeof(WCHAR); } static void dump_varargs_startup_info( const char *prefix, data_size_t size ) @@ -1133,7 +1132,7 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); fprintf( stderr, ",name=L\"" ); - dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); + dump_strW( str, objattr->name_len, stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( (sizeof(*objattr) + (objattr->sd_len & ~1) + (objattr->name_len & ~1) + 3) & ~3 ); } diff --git a/server/unicode.c b/server/unicode.c index 3be1f55fe1..02233e22cf 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -156,7 +156,7 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] char *pos = buffer; int count = 0; - for (; len; str++, len--) + for (len /= sizeof(WCHAR); len; str++, len--) { if (pos > buffer + sizeof(buffer) - 8) {

1 0

Nikolay Sivov : ole32: Add support for reading VT_CLSID properties.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 9eab89bec6011ded9fa76c08c2fecd71b9b17200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eab89bec6011ded9fa76c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 09:24:11 2020 +0300 ole32: Add support for reading VT_CLSID properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c5d2a42e1c..adf4c2f337 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1454,6 +1454,14 @@ static HRESULT propertystorage_read_scalar(PROPVARIANT *prop, const struct read_ else hr = STG_E_INVALIDPARAMETER; } + break; + case VT_CLSID: + if (!(prop->u.puuid = allocate(allocate_data, sizeof (*prop->u.puuid)))) + return STG_E_INSUFFICIENTMEMORY; + + if (SUCCEEDED(hr = buffer_test_offset(buffer, offset, sizeof(*prop->u.puuid)))) + StorageUtl_ReadGUID(buffer->data, offset, prop->u.puuid); + break; default: FIXME("unsupported type %d\n", prop->vt);

1 0

Zebediah Figura : ntdll: Fix the overflow check in read_changes_apc().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: cd2e053237bc0dfb3e9ddc074426b3eefb124389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2e053237bc0dfb3e9ddc07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 19:11:29 2020 -0500 ntdll: Fix the overflow check in read_changes_apc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5175e9d5ce..5b60c887e2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1768,16 +1768,17 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st while (size && left >= sizeof(*pfni)) { + DWORD len = (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR); + /* convert to an NT style path */ for (i = 0; i < event->len; i++) if (event->name[i] == '/') event->name[i] = '\\'; pfni->Action = event->action; - pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, - (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR)); + pfni->FileNameLength = ntdll_umbstowcs( event->name, event->len, pfni->FileName, len ); last_entry_offset = &pfni->NextEntryOffset; - if (pfni->FileNameLength == -1 || pfni->FileNameLength == -2) break; + if (pfni->FileNameLength == len) break; i = offsetof(FILE_NOTIFY_INFORMATION, FileName[pfni->FileNameLength]); pfni->FileNameLength *= sizeof(WCHAR);

1 0

Francois Gouget : advapi32/tests: The Everyone group name is sometimes translated.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: ad9fb96e5bc818c5cac3dded6af038a1b6c202d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9fb96e5bc818c5cac3dded… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 18:59:32 2020 +0100 advapi32/tests: The Everyone group name is sometimes translated. This depends on SystemPreferredUILanguages, which does not always match the language really used by the Windows interface (UserDefaultUILanguage). Also the group name is not translated in all languages. So just check the name that LsaLookupSids() returns in a few known languages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 57ec8994eb..f2e10671a4 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); + static void test_lsa(void) { NTSTATUS status; @@ -332,6 +334,7 @@ static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, co static void test_LsaLookupSids(void) { + WCHAR langW[32]; char user_buffer[64]; LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; @@ -341,7 +344,7 @@ static void test_LsaLookupSids(void) LSA_HANDLE policy; NTSTATUS status; HANDLE token; - DWORD size; + DWORD num, size; BOOL ret; PSID sid; @@ -387,7 +390,21 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, L"Everyone"); + + /* The group name gets translated... but not in all locales */ + size = ARRAY_SIZE(langW); + if (!pGetSystemPreferredUILanguages || + !pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + langW[0] = 0; + if (wcscmp(langW, L"0409") == 0 || wcscmp(langW, L"0411") == 0) + /* English and Japanese */ + check_unicode_string(&names[0].Name, L"Everyone"); + else if (wcscmp(langW, L"0407") == 0) /* German */ + check_unicode_string(&names[0].Name, L"Jeder"); + else if (wcscmp(langW, L"040C") == 0) /* French */ + check_unicode_string(&names[0].Name, L"Tout le monde"); + else + trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); LsaFreeMemory(names); LsaFreeMemory(list); @@ -448,6 +465,9 @@ static void test_LsaLookupPrivilegeName(void) START_TEST(lsa) { + HMODULE hkernel32 = GetModuleHandleA("kernel32"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids();

1 0

Francois Gouget : advapi32/tests: On Windows 7 GetServiceKeyName() fails for all localized display names.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 417814afcbfc6b9daf3a7053a900bc80e0127fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417814afcbfc6b9daf3a7053… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 18:59:20 2020 +0100 advapi32/tests: On Windows 7 GetServiceKeyName() fails for all localized display names. It's not just the service display names that contain a smart quote that Windows 7 fails to handle, it's all localized names. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 43d9738627..4bf9f4c34b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,17 +720,6 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } -static int is_printable_ascii_str(const char *s) -{ - while (*s) - { - if (*s < 32 || *s >= 127) - return 0; - s++; - } - return 1; -} - static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -872,10 +861,10 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); - if (!is_printable_ascii_str(displayname) && + if (strcmp(displayname, "Print Spooler") != 0 && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) { - win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + win_skip("GetServiceKeyName() does not support localized display names: %s\n", displayname); /* Windows 7 */ CloseServiceHandle(scm_handle); return; /* All the tests that follow will fail too */ }

1 0

Francois Gouget : kernel32/tests: Remove an unneeded sprintf() in the process tests.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: f08abe0811961d169e3512f186be98cdbcfc80c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08abe0811961d169e3512f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 14:19:36 2020 +0100 kernel32/tests: Remove an unneeded sprintf() in the process tests. The buffer content is not used before being overwritten again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1889939fff..0f0889073b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1036,7 +1036,6 @@ static void test_CommandLine(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); CloseHandle(info.hThread); CloseHandle(info.hProcess); - sprintf(buffer, "process dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2);

1 0

Francois Gouget : kernel32/tests: Fix a race condition in test_QueryInformationJobObject().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 9d38c4864c4800313812feef2c3bc6ca6551ce57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d38c4864c4800313812feef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 22 14:19:26 2020 +0100 kernel32/tests: Fix a race condition in test_QueryInformationJobObject(). The process must still be running for AssignProcessToJobObject() to succeed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e54c43ca94..1889939fff 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2572,21 +2572,26 @@ static void test_QueryInformationJobObject(void) PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; - DWORD dwret, ret_len; + DWORD ret_len; PROCESS_INFORMATION pi[2]; - HANDLE job; + char buffer[50]; + HANDLE job, sem; BOOL ret; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); /* Only active processes are returned */ - create_process("exit", &pi[0]); + sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); + sem = CreateSemaphoreA(NULL, 0, 1, buffer + 5); + ok(sem != NULL, "CreateSemaphoreA failed le=%u\n", GetLastError()); + create_process(buffer, &pi[0]); + ret = pAssignProcessToJobObject(job, pi[0].hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); - dwret = WaitForSingleObject(pi[0].hProcess, 1000); - ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + ReleaseSemaphore(sem, 1, NULL); + wait_child_process(pi[0].hProcess); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020