December 2021 - Wine-commits

Eric Pouech : winedbg: Support 'run' command with arguments to restart current debuggee.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 4448ef5031a9e3ac6f4208d238d9c27e7e0d6fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4448ef5031a9e3ac6f4208d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:29 2021 +0100 winedbg: Support 'run' command with arguments to restart current debuggee. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 10 ++++++-- programs/winedbg/debug.l | 8 +++--- programs/winedbg/debugger.h | 7 +++++- programs/winedbg/tgt_active.c | 55 +++++++++++++++++++++++++++++++---------- programs/winedbg/winedbg.man.in | 8 ++++++ 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 612e6a4106d..c5e7b2b43ca 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -43,6 +43,7 @@ static void parser(const char*); IMAGEHLP_LINE64 listing; struct expr* expression; struct type_expr_t type; + struct list_string* strings; } %token tCONT tPASS tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tALL tINFO tUP tDOWN @@ -85,6 +86,7 @@ static void parser(const char*); %type <string> pathname identifier cpp_identifier %type <listing> list_arg %type <type> type_expr +%type <strings> list_of_words %% @@ -183,8 +185,12 @@ list_arg: ; run_command: - tRUN { dbg_run_debuggee(NULL); } - | tRUN tSTRING { dbg_run_debuggee($2); } + tRUN list_of_words { dbg_run_debuggee($2); } + ; + +list_of_words: + %empty { $$ = NULL; } + | tSTRING list_of_words { $$ = (struct list_string*)lexeme_alloc_size(sizeof(*$$)); $$->next = $2; $$->string = $1; } ; list_command: diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 280dcbfbc6b..dc93901a71c 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -115,6 +115,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" %x PATH_EXPECTED %x ASTRING_EXPECTED +%x AWORD_EXPECTED %x NOPROCESS %% /* set to special state when no process is loaded. */ @@ -153,10 +154,11 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <FORMAT_EXPECTED>"/"{FORMAT} { dbg_lval.integer = (1 << 8) | yytext[1]; return tFORMAT; } -{STRING} { dbg_lval.string = unescape_string(yytext); return tSTRING;} +<*>{STRING} { dbg_lval.string = unescape_string(yytext); return tSTRING;} <ASTRING_EXPECTED>[^\n]+ { char* p = yytext; while (*p == ' ' || *p == '\t') p++; dbg_lval.string = lexeme_alloc(p); return tSTRING; } - +<AWORD_EXPECTED>[^ \t\n]+ { char* p = yytext; while (*p == ' ' || *p == '\t') p++; + dbg_lval.string = lexeme_alloc(p); return tSTRING; } <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } <INITIAL>up { BEGIN(NOCMD); return tUP; } <INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; } @@ -200,7 +202,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } <INITIAL>rwatch|rwatc|rwat { BEGIN(NOCMD); return tRWATCH; } <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } -<INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} +<INITIAL,NOPROCESS>run|ru|r { BEGIN(AWORD_EXPECTED); return tRUN;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } <INITIAL>kill|kil|ki|k { BEGIN(NOCMD); return tKILL; } <INITIAL,NOPROCESS>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c511f3f76bc..0e6d715a2d1 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -421,7 +421,12 @@ extern enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv struct dbg_lvalue* rtn); /* tgt_active.c */ -extern void dbg_run_debuggee(const char* args); +struct list_string +{ + char* string; + struct list_string* next; +}; +extern void dbg_run_debuggee(struct list_string* ls); extern void dbg_wait_next_exception(DWORD cont, int count, int mode); extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern BOOL dbg_set_curr_thread(DWORD tid); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 4bcd5ba659e..0993bddc985 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); +static char* dbg_executable; static char* dbg_last_cmd_line; static struct be_process_io be_process_active_io; @@ -632,6 +633,11 @@ static BOOL dbg_start_debuggee(LPSTR cmdLine) dbg_curr_pid = info.dwProcessId; if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, dbg_curr_pid, 0))) return FALSE; dbg_curr_process->active_debuggee = TRUE; + if (cmdLine != dbg_last_cmd_line) + { + free(dbg_last_cmd_line); + dbg_last_cmd_line = cmdLine; + } return TRUE; } @@ -718,24 +724,46 @@ static char *dbg_build_command_line( char **argv ) } -void dbg_run_debuggee(const char* args) +void dbg_run_debuggee(struct list_string* ls) { - if (args) + if (dbg_curr_process) { - WINE_FIXME("Re-running current program with %s as args is broken\n", wine_dbgstr_a(args)); + dbg_printf("Already attached to a process. Use 'detach' or 'kill' before using 'run'\n"); return; } - else + if (!dbg_executable) { - if (!dbg_last_cmd_line) + dbg_printf("No active target to be restarted\n"); + return; + } + if (ls) + { + char* cl; + char** argv; + unsigned argc = 2, i; + struct list_string* cls; + + for (cls = ls; cls; cls = cls->next) argc++; + if (!(argv = malloc(argc * sizeof(argv[0])))) return; + argv[0] = dbg_executable; + for (i = 1, cls = ls; cls; cls = cls->next, i++) argv[i] = cls->string; + argv[i] = NULL; + cl = dbg_build_command_line(argv); + free(argv); + + if (!cl || !dbg_start_debuggee(cl)) { - dbg_printf("Cannot find previously used command line.\n"); - return; - } - dbg_start_debuggee(dbg_last_cmd_line); - dbg_active_wait_for_first_exception(); - source_list_from_addr(NULL, 0); + free(cl); + return; + } + } + else + { + if (!dbg_last_cmd_line) dbg_last_cmd_line = strdup(dbg_executable); + dbg_start_debuggee(dbg_last_cmd_line); } + dbg_active_wait_for_first_exception(); + source_list_from_addr(NULL, 0); } static BOOL str2int(const char* str, DWORD_PTR* val) @@ -893,14 +921,15 @@ enum dbg_start dbg_active_launch(int argc, char* argv[]) if (argc == 0) return start_error_parse; + dbg_executable = strdup(argv[0]); cmd_line = dbg_build_command_line(argv); + if (!dbg_start_debuggee(cmd_line)) { free(cmd_line); return start_error_init; } - free(dbg_last_cmd_line); - dbg_last_cmd_line = cmd_line; + return start_ok; } diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 6ed8d4474c4..871b7ad6764 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -109,6 +109,8 @@ of variations from \fBgdb\fR commands. Aborts the debugger. .IP \fBquit\fR Exits the debugger. +.PP +\fIProcess handling\fR .IP \fBattach\ \fIN\fR Attach to a Wine process (\fIN\fR is its Windows ID, numeric or hexadecimal). IDs can be obtained using the \fBinfo\ process\fR command. Note the @@ -119,6 +121,12 @@ Detach from a Wine-process. .IP \fBthread\ \fIN\fR Change the current thread to \fIN\fR (its Windows TID, numeric or hexadecimal). .IP +.IP \fBrun\fR +Re-run the same process with the same arguments. +Note: all breakpoints of precedent process are no longer available. +.IP \fBrun\ \fIarg1\ arg2...\fR +Re-run the same process with arguments \fIarg1\ arg2...\fR. +Note: all breakpoints of precedent process are no longer available. .PP \fIHelp commands\fR .IP \fBhelp\fR

1 0

Eric Pouech : winedbg: When enumerating symbols, only search for locals when name doesn't refer to a module.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 0c474b9fc2d04336ee0f3ac48efbe5a02b4a1380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c474b9fc2d04336ee0f3ac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:35 2021 +0100 winedbg: When enumerating symbols, only search for locals when name doesn't refer to a module. Fixed listing twice the same symbol in some commands like 'break foo!bar'. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index a3b9cb38995..13a61774c4b 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -421,7 +421,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); /* now grab local symbols */ - if ((frm = stack_get_curr_frame()) && sgv.num < NUMDBGV) + if ((frm = stack_get_curr_frame()) && sgv.num < NUMDBGV && !strchr(name, '!')) { sgv.frame_offset = frm->linear_frame; SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv);

1 0

Eric Pouech : winedbg: Fixed missing test.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 8dec81fb6f6e0e251b38d3514a6885886a96270a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dec81fb6f6e0e251b38d351… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:41 2021 +0100 winedbg: Fixed missing test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 0ee6ab05f0f..ebee3449a37 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -757,6 +757,7 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v DWORD ret, tag, bt; ret = SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); if (!ret && + ti == TI_GET_SYMNAME && SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_SYMTAG, &tag) && tag == SymTagBaseType && SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_BASETYPE, &bt))

1 0

Eric Pouech : winedbg: Use %ls to print wide character strings.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: d81e757075e6dc2dde497c69b15e93739d2ca609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81e757075e6dc2dde497c69… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:47 2021 +0100 winedbg: Use %ls to print wide character strings. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 9 ++----- programs/winedbg/symbol.c | 3 +-- programs/winedbg/types.c | 67 ++++++++++++++++++----------------------------- 3 files changed, 29 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d81e757075e6dc2dde49…

1 0

Eric Pouech : winedbg: In print_hex, don't print bits not included in size.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 24eb754af6991ca45f141b5ba5e6bbf7c03456cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=24eb754af6991ca45f141b5b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:53 2021 +0100 winedbg: In print_hex, don't print bits not included in size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index f7baf3e6381..1653736e919 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -337,7 +337,8 @@ static void dbg_print_hex(DWORD size, ULONGLONG sv) if (!sv) dbg_printf("0"); else - dbg_printf("%#I64x", sv); + /* clear unneeded high bits, esp. sign extension */ + dbg_printf("%#I64x", sv & (~0LLU >> (64 - 8 * size))); } static void print_typed_basic(const struct dbg_lvalue* lvalue)

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 1221722ed3825a515e741e99193e142d34d9fe7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1221722ed3825a515e741e99… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Dec 1 16:20:55 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/po/nl.po b/po/nl.po index 40227b8c909..e2b195fc896 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-10 00:03+0100\n" +"PO-Revision-Date: 2021-12-01 16:10+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -13263,13 +13263,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Actieve codetabel: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Ongeldig bericht.\n" +msgstr "Ongeldige codetabel\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13282,6 +13280,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [nummer]\n" +"\n" +" De actieve codetabel weergeven of instellen.\n" +"\n" +" nummer Stel het nummer van de codetabel in.\n" +"\n" +" Gebruik CHCP zonder nummer om de huidige codetabel te laten zien.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log"

1 0

Jacek Caban : user32: Use NtUserGetDisplayConfigBufferSizes.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 8b9b2580a5e7d624e3e826384b06f482fea131e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9b2580a5e7d624e3e82638… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 16:02:37 2021 +0100 user32: Use NtUserGetDisplayConfigBufferSizes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 57 ------------------------------------------------- dlls/user32/user32.spec | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82dd0f4c664..592b4e2fdd5 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4201,63 +4201,6 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) return TRUE; } -/********************************************************************** - * GetDisplayConfigBufferSizes (USER32.@) - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - LONG ret = ERROR_GEN_FAILURE; - HANDLE mutex; - HDEVINFO devinfo; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - DWORD monitor_index = 0, state_flags, type; - - FIXME("(0x%x %p %p): semi-stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - - if (flags != QDC_ALL_PATHS && - flags != QDC_ONLY_ACTIVE_PATHS && - flags != QDC_DATABASE_CURRENT) - return ERROR_INVALID_PARAMETER; - - if (flags != QDC_ONLY_ACTIVE_PATHS) - FIXME("only returning active paths\n"); - - wait_graphics_driver_ready(); - mutex = get_display_device_init_mutex(); - - /* Iterate through "targets"/monitors. - * Each target corresponds to a path, and each path references a source and a target mode. - */ - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); - if (devinfo == INVALID_HANDLE_VALUE) - goto done; - - while (SetupDiEnumDeviceInfo(devinfo, monitor_index++, &device_data)) - { - /* Only count active monitors */ - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, - &type, (BYTE *)&state_flags, sizeof(state_flags), NULL, 0)) - goto done; - - if (state_flags & DISPLAY_DEVICE_ACTIVE) - (*num_path_info)++; - } - - *num_mode_info = *num_path_info * 2; - ret = ERROR_SUCCESS; - TRACE("returning %u path(s) %u mode(s)\n", *num_path_info, *num_mode_info); - -done: - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - return ret; -} - static DISPLAYCONFIG_ROTATION get_dc_rotation(const DEVMODEW *devmode) { if (devmode->dmFields & DM_DISPLAYORIENTATION) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 78946be86b3..9955add4252 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -291,7 +291,7 @@ @ stdcall GetDesktopWindow() @ stdcall GetDialogBaseUnits() @ stdcall GetDisplayAutoRotationPreferences(ptr) -@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) NtUserGetDisplayConfigBufferSizes @ stdcall GetDlgCtrlID(long) @ stdcall GetDlgItem(long long) @ stdcall GetDlgItemInt(long long ptr long)

1 0

Jacek Caban : win32u: Move NtUserEnumDisplaySettings implementation from user32.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 1f2c3e8538b088f678a588121fc0bf7811336efc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2c3e8538b088f678a58812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 16:02:43 2021 +0100 win32u: Move NtUserEnumDisplaySettings implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +------ dlls/user32/sysparams.c | 39 ++++++--------------------------------- dlls/win32u/driver.c | 35 +++++++++++++++++++---------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 33 +++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 10 +++++++++- dlls/win32u/wrappers.c | 15 ++++++--------- include/ntuser.h | 2 ++ 9 files changed, 78 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2c3e8538b088f678a5…

1 0

Jacek Caban : wineandroid.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: b5e3419dd116e43fa448cfe35824b9d4ee3ae777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e3419dd116e43fa448cfe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 16:02:53 2021 +0100 wineandroid.drv: Use UpdateDisplayDevices driver entry point for registering devices. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/init.c | 62 +++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 87818fd7499..7fcad453374 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineandroid.drv -IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl +IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl win32u EXTRADLLFLAGS = -mcygwin diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 2d7e4469831..ed9116eb47e 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -40,18 +40,11 @@ unsigned int screen_width = 0; unsigned int screen_height = 0; RECT virtual_screen_rect = { 0, 0, 0, 0 }; -MONITORINFOEXW default_monitor = -{ - sizeof(default_monitor), /* cbSize */ - { 0, 0, 0, 0 }, /* rcMonitor */ - { 0, 0, 0, 0 }, /* rcWork */ - MONITORINFOF_PRIMARY, /* dwFlags */ - { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 } /* szDevice */ -}; - static const unsigned int screen_bpp = 32; /* we don't support other modes */ +static RECT monitor_rc_work; static int device_init_done; +static BOOL force_display_devices_refresh; typedef struct { @@ -72,14 +65,22 @@ void init_monitors( int width, int height ) virtual_screen_rect.right = width; virtual_screen_rect.bottom = height; - default_monitor.rcMonitor = default_monitor.rcWork = virtual_screen_rect; + monitor_rc_work = virtual_screen_rect; if (!hwnd || !IsWindowVisible( hwnd )) return; if (!GetWindowRect( hwnd, &rect )) return; - if (rect.top) default_monitor.rcWork.bottom = rect.top; - else default_monitor.rcWork.top = rect.bottom; + if (rect.top) monitor_rc_work.bottom = rect.top; + else monitor_rc_work.top = rect.bottom; TRACE( "found tray %p %s work area %s\n", hwnd, - wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &default_monitor.rcWork )); + wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &monitor_rc_work )); + + if (*p_java_vm) /* if we're notified from Java thread, update registry */ + { + UINT32 num_path, num_mode; + force_display_devices_refresh = TRUE; + /* trigger refresh in win32u */ + NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); + } } @@ -199,30 +200,22 @@ LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, /*********************************************************************** - * ANDROID_GetMonitorInfo + * ANDROID_UpdateDisplayDevices */ -BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) +void CDECL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, + BOOL force, void *param ) { - if (handle != (HMONITOR)1) + if (force || force_display_devices_refresh) { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; + struct gdi_monitor gdi_monitor = + { + .rc_monitor = virtual_screen_rect, + .rc_work = monitor_rc_work, + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + }; + device_manager->add_monitor( &gdi_monitor, param ); + force_display_devices_refresh = FALSE; } - info->rcMonitor = default_monitor.rcMonitor; - info->rcWork = default_monitor.rcWork; - info->dwFlags = default_monitor.dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, default_monitor.szDevice ); - return TRUE; -} - - -/*********************************************************************** - * ANDROID_EnumDisplayMonitors - */ -BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - return proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp ); } @@ -294,9 +287,8 @@ static const struct user_driver_funcs android_drv_funcs = .pVkKeyScanEx = ANDROID_VkKeyScanEx, .pSetCursor = ANDROID_SetCursor, .pChangeDisplaySettingsEx = ANDROID_ChangeDisplaySettingsEx, - .pEnumDisplayMonitors = ANDROID_EnumDisplayMonitors, .pEnumDisplaySettingsEx = ANDROID_EnumDisplaySettingsEx, - .pGetMonitorInfo = ANDROID_GetMonitorInfo, + .pUpdateDisplayDevices = ANDROID_UpdateDisplayDevices, .pCreateWindow = ANDROID_CreateWindow, .pDestroyWindow = ANDROID_DestroyWindow, .pMsgWaitForMultipleObjectsEx = ANDROID_MsgWaitForMultipleObjectsEx,

1 0

Jacek Caban : winemac.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 95a106bc93c971a5de946fb43b26033cad74416b URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a106bc93c971a5de946fb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 18:58:18 2021 +0100 winemac.drv: Use UpdateDisplayDevices driver entry point for registering devices. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/display.c | 594 ++++------------------------------------- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_main.c | 2 +- 5 files changed, 64 insertions(+), 537 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95a106bc93c971a5de94…

1 0