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

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

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

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

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

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: 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 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

Serge Gautherie : tests: Remove now useless forced _WIN32_WINNT defines.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: be3cda6ec0856d143d4737ee9306844569b76e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3cda6ec0856d143d4737ee… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 21 04:48:50 2020 +0100 tests: Remove now useless forced _WIN32_WINNT defines. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/subclass.c | 2 -- dlls/kernel32/tests/file.c | 3 --- dlls/kernel32/tests/sync.c | 1 - dlls/kernel32/tests/thread.c | 3 --- dlls/kernel32/tests/timer.c | 2 -- dlls/kernel32/tests/version.c | 3 --- dlls/psapi/tests/psapi_main.c | 3 --- dlls/user32/tests/broadcast.c | 2 -- dlls/user32/tests/class.c | 3 --- dlls/user32/tests/menu.c | 2 -- dlls/user32/tests/win.c | 3 --- 11 files changed, 27 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index fc778d6711..b2b47319b1 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ - #include <assert.h> #include <stdarg.h> diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 785bd60c23..90338f52d1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -20,9 +20,6 @@ * */ -/* ReplaceFile requires Windows 2000 or newer */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h> #include <stdlib.h> #include <time.h> diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 40cad1c4c5..d05a038a58 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x500 #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 3b9a407e73..b14fea30d1 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0600 - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index bcc800c494..d2a6138c97 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include "wine/test.h" #include "winbase.h" diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 5fdc961542..861b870b56 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Needed for PRODUCT_* defines and GetProductInfo() */ -#define _WIN32_WINNT 0x0600 - #include "wine/test.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0ea1b1f6f1..da7524dd60 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ -#define _WIN32_WINNT 0x0500 - #include <stdarg.h> #include "ntstatus.h" diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 1a216955bb..f80d455cba 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 606a29a257..94dd8105a5 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get CS_DROPSHADOW with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 1ca4141957..cc0a9e6d9f 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 56072bebf7..25d643f54a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get ICON_SMALL2 with the MSVC headers */ -#define _WIN32_WINNT 0x0501 - #include <assert.h> #include <limits.h> #include <stdlib.h>

1 0

Zebediah Figura : qasf/tests: Fix a test failure with Windows 2003.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a336ae8fbbf19780485c12b3383ac6083c8ca9b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a336ae8fbbf19780485c12b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:19 2020 -0500 qasf/tests: Fix a test failure with Windows 2003. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 50546ec2a8..6f6cb77e52 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1707,7 +1707,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_FALSE /* 2003 */ || hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); got_Flush = 0; ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush);

1 0

Zebediah Figura : quartz/tests: Fix test failures when we can't create a 3D device.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: e417befc153e77a575f0092e46a06fd8288078ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e417befc153e77a575f0092e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:20 2020 -0500 quartz/tests: Fix test failures when we can't create a 3D device. It turns out my prior assumption was incorrect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1194fd8d17..3e9fccedf1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2376,11 +2376,14 @@ static IDirect3DDevice9 *create_device(HWND window) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - /* We can expect this to succeed, or we couldn't have created the VMR. */ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK, "Failed to create a 3D device, hr %#x.\n", hr); IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create a 3D device, hr %#x.\n", hr); + return NULL; + } return device; } @@ -2418,7 +2421,8 @@ static void test_allocate_surface_helper(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) @@ -2784,7 +2788,8 @@ static void test_renderless_formats(void) AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - device = create_device(window); + if (!(device = create_device(window))) + goto out; hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE)

1 0