August 2021 - Wine-devel - list.winehq.org

[PATCH] ntdll: Fix calling convention of pointer array to .so init functions.
by Torge Matthies 13 Aug '21

13 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51596 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f126249c01..c0fd8217405 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1345,7 +1345,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) static void init_builtin_dll( HMODULE module ) { void *buffer[16]; - void (**funcs)(int, char **, char **) = (void *)buffer; + void (__attribute__ ((__sysv_abi__)) **funcs)(int, char **, char **) = (void *)buffer; SIZE_T i, size; NTSTATUS status; -- 2.32.0

1 0

[PATCH] api-ms-win-core-psm-appnotify-l1-1-0: Add dll.
by Esdras Tarsis 13 Aug '21

13 Aug '21

Needed for The Riftbreaker Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-psm-appnotify-l1-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec diff --git a/configure b/configure index e8c1cb9e3a8..7178c1cd30f 100755 --- a/configure +++ b/configure @@ -1018,6 +1018,7 @@ enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +enable_api_ms_win_core_psm_appnotify_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 @@ -20186,6 +20187,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-psm-appnotify-l1-1-0 enable_api_ms_win_core_psm_appnotify_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 diff --git a/configure.ac b/configure.ac index 065b3f231bf..d32ceae5011 100644 --- a/configure.ac +++ b/configure.ac @@ -2846,6 +2846,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) diff --git a/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in new file mode 100644 index 00000000000..8a3d2ad98cb --- /dev/null +++ b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-psm-appnotify-l1-1-0.dll diff --git a/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec new file mode 100644 index 00000000000..8b069d66e62 --- /dev/null +++ b/dlls/api-ms-win-core-psm-appnotify-l1-1-0/api-ms-win-core-psm-appnotify-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stub RegisterAppStateChangeNotification +@ stub UnregisterAppStateChangeNotification -- 2.32.0

1 0

[PATCH v2] conhost: Use font face length as number of characters, not size
by Hugh McMaster 13 Aug '21

13 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in version 2: * Negate lstrcmpW. * Fix argument order when saving config in get_first_font_sub_enum(). programs/conhost/conhost.c | 11 +++++++---- programs/conhost/window.c | 28 +++++++++++----------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ecfdd082a81..7c410f80375 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -97,9 +97,12 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->popup_attr = console->active->attr; screen_buffer->font = console->active->font; - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; - memcpy( screen_buffer->font.face_name, console->active->font.face_name, - screen_buffer->font.face_len ); + if (screen_buffer->font.face_len) + { + screen_buffer->font.face_name = malloc((screen_buffer->font.face_len + 1) * sizeof(WCHAR)); + if (!screen_buffer->font.face_name) return NULL; + lstrcpyW(screen_buffer->font.face_name, console->active->font.face_name); + } } else { @@ -1728,7 +1731,7 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou { struct condrv_output_info *info; - *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); + *out_size = min(*out_size, sizeof(*info) + (screen_buffer->font.face_len * sizeof(WCHAR))); if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; info->cursor_size = screen_buffer->cursor_size; diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5881ad9c3ad..8d8002d51c1 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -242,7 +242,6 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); memcpy( config->color_map, color_map, sizeof(color_map) ); - memset( config->face_name, 0, sizeof(config->face_name) ); config->cursor_size = 25; config->cursor_visible = 1; config->font_pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -683,9 +682,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) if (console->window->font && logfont->lfHeight == console->active->font.height && logfont->lfWeight == console->active->font.weight && !logfont->lfItalic && !logfont->lfUnderline && !logfont->lfStrikeOut && - console->active->font.face_len == wcslen( logfont->lfFaceName ) * sizeof(WCHAR) && - !memcmp( logfont->lfFaceName, console->active->font.face_name, - console->active->font.face_len )) + console->active->font.face_len == wcslen(logfont->lfFaceName) && + !lstrcmpW(logfont->lfFaceName, console->active->font.face_name)) { TRACE( "equal to current\n" ); return TRUE; @@ -708,9 +706,9 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ) * sizeof(WCHAR); - font_info->face_name = malloc( font_info->face_len ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len ); + font_info->face_len = wcslen(logfont->lfFaceName); + font_info->face_name = malloc((font_info->face_len + 1) * sizeof(WCHAR)); + lstrcpyW(font_info->face_name, logfont->lfFaceName); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) @@ -819,9 +817,8 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; - fc->console->active->font.face_len = wcslen( config.face_name ) * sizeof(WCHAR); - memcpy( fc->console->active->font.face_name, config.face_name, - fc->console->active->font.face_len ); + lstrcpyW(config.face_name, fc->console->active->font.face_name); + /* Force also its writing back to the registry so that we can get it * the next time. */ @@ -1895,8 +1892,8 @@ static void apply_config( struct console *console, const struct console_config * console->active->font.height != config->cell_height || console->active->font.weight != config->font_weight || console->active->font.pitch_family != config->font_pitch_family || - console->active->font.face_len != wcslen( config->face_name ) * sizeof(WCHAR) || - memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len )) + console->active->font.face_len != wcslen(config->face_name) || + !lstrcmpW(console->active->font.face_name, config->face_name)) { update_console_font( console, config->face_name, config->cell_height, config->font_weight ); } @@ -1908,8 +1905,6 @@ static void apply_config( struct console *console, const struct console_config * static void current_config( struct console *console, struct console_config *config ) { - size_t len; - config->menu_mask = console->window->menu_mask; config->quick_edit = console->window->quick_edit; @@ -1930,9 +1925,8 @@ static void current_config( struct console *console, struct console_config *conf config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight; config->font_pitch_family = console->active->font.pitch_family; - len = min( ARRAY_SIZE(config->face_name) - 1, console->active->font.face_len / sizeof(WCHAR) ); - if (len) memcpy( config->face_name, console->active->font.face_name, len * sizeof(WCHAR) ); - config->face_name[len] = 0; + lstrcpyW(config->face_name, console->active->font.face_name); + config->face_name[console->active->font.face_len] = 0; config->sb_width = console->active->width; config->sb_height = console->active->height; -- 2.32.0

2 2

[PATCH 2/2] include: Use WOWHandle32 for HDC_32 on Wine.
by Jacek Caban 13 Aug '21

13 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wownt32.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] krnl386.exe: Convert 16-bit GDI handles to full 32-bit handles.
by Jacek Caban 13 Aug '21

13 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/krnl386.exe16/wowthunk.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)

1 0

[PATCH 8/8] gdi32: Move Escape to gdidc.c.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 97 --------------------------------------------- dlls/gdi32/gdidc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 97 deletions(-)

2 1

[PATCH 7/8] gdi32: Use NtGdiExtEscape for ExtEscape.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 21 ++++----------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mfdrv/init.c | 22 +++++++++++----------- include/ntgdi.h | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-)

2 1

[PATCH 6/8] gdi32: Use NtGdiStretchDIBitsInternal for StretchDIBits.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 10 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 44 ++++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 9 ++++++- dlls/gdi32/gdidc.c | 23 ++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 38 ++++++++++++++--------------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 3 --- include/ntgdi.h | 5 ++++ 8 files changed, 87 insertions(+), 47 deletions(-)

2 1

[PATCH 5/8] gdi32: Use NtGdiSetDIBitsToDeviceInternal for SetDIBitsToDevice.
by Jacek Caban 13 Aug '21

13 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 11 +++++----- dlls/gdi32/enhmfdrv/bitblt.c | 37 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 22 ++++++++++---------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 4 ---- include/ntgdi.h | 5 +++++ 8 files changed, 76 insertions(+), 35 deletions(-)

2 1

[PATCH 4/8] gdi32: Remove no longer used driver entry points.
by Jacek Caban 13 Aug '21

13 Aug '21

2 1