wine-devel May 2022

wine-devel@winehq.org

77 participants
705 discussions

[PATCH v4 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 23 May '22

23 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v4: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

6 17

[PATCH] conhost: Split first font code path from font update code path
by Hugh McMaster 23 May '22

23 May '22

This change prevents calls to update_console_font() setting any defaults. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 120 ++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index c115e42a282..582badf43b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -736,6 +736,8 @@ struct font_chooser { struct console *console; int pass; + unsigned int font_height; + unsigned int font_width; BOOL done; }; @@ -791,93 +793,82 @@ static BOOL validate_font( struct console *console, const LOGFONTW *lf, int pass return TRUE; } -/* helper functions to get a decent font for the renderer */ -static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam) +static int CALLBACK enum_first_font_proc( const LOGFONTW *lf, const TEXTMETRICW *tm, + DWORD font_type, LPARAM lparam ) { struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW mlf; + + if (font_type != TRUETYPE_FONTTYPE) return 1; + + TRACE( "%s\n", debugstr_logfont( lf, font_type )); + + if (!validate_font( fc->console, lf, fc->pass )) + return 1; TRACE( "%s\n", debugstr_textmetric( tm, font_type )); - if (validate_font_metric( fc->console, tm, font_type, fc->pass )) - { - LOGFONTW mlf = *lf; + if (!validate_font_metric( fc->console, tm, font_type, fc->pass )) + return 1; - /* Use the default sizes for the font (this is needed, especially for - * TrueType fonts, so that we get a decent size, not the max size) - */ - mlf.lfWidth = fc->console->active->font.width; - mlf.lfHeight = fc->console->active->font.height; - if (!mlf.lfHeight) - mlf.lfHeight = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + /* set default font size */ + mlf = *lf; + mlf.lfHeight = fc->font_height; + mlf.lfWidth = fc->font_width; - if (set_console_font( fc->console, &mlf )) - { - struct console_config config; + if (!set_console_font( fc->console, &mlf )) + return 1; - fc->done = 1; + fc->done = TRUE; - /* since we've modified the current config with new font information, - * set this information as the new default. - */ - load_config( fc->console->window->config_key, &config ); - config.cell_width = fc->console->active->font.width; - config.cell_height = fc->console->active->font.height; - config.font_pitch_family = fc->console->active->font.pitch_family; - memcpy( config.face_name, fc->console->active->font.face_name, - fc->console->active->font.face_len * sizeof(WCHAR) ); - config.face_name[fc->console->active->font.face_len] = 0; - - /* Force also its writing back to the registry so that we can get it - * the next time. - */ - save_config( fc->console->window->config_key, &config ); - return 0; - } - } - return 1; + return 0; } -static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam ) +static void set_first_font( struct console *console, struct console_config *config ) { - struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW lf; + struct font_chooser fc; - TRACE("%s\n", debugstr_logfont( lf, font_type )); + TRACE("Looking for a suitable console font\n"); - if (validate_font( fc->console, lf, fc->pass )) + memset( &lf, 0, sizeof(lf) ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + + fc.console = console; + fc.font_height = config->cell_height; + fc.font_width = config->cell_width; + fc.done = FALSE; + + for (fc.pass = 0; fc.pass <= 5; fc.pass++) { - EnumFontFamiliesW( fc->console->window->mem_dc, lf->lfFaceName, - get_first_font_sub_enum, lparam ); - return !fc->done; /* we just need the first matching one... */ + EnumFontFamiliesExW( console->window->mem_dc, &lf, enum_first_font_proc, (LPARAM)&fc, 0); + if (fc.done) break; } - return 1; -} + if (fc.pass > 5) + ERR("Unable to find a valid console font\n"); + + /* Save font configuration to the registry */ + config->cell_width = console->active->font.width; + config->cell_height = console->active->font.height; + config->font_pitch_family = console->active->font.pitch_family; + memcpy( config->face_name, console->active->font.face_name, + console->active->font.face_len * sizeof(WCHAR) ); + config->face_name[console->active->font.face_len] = 0; + + save_config( console->window->config_key, config ); +} -/* sets logfont as the new font for the console */ +/* Sets the font specified in the LOGFONT as the new console font */ void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, unsigned int height, unsigned int weight ) { - struct font_chooser fc; LOGFONTW lf; - if (face_name[0] && height && weight) - { - fill_logfont( &lf, face_name, face_name_size, height, weight ); - if (set_console_font( console, &lf )) return; - } + fill_logfont( &lf, face_name, face_name_size, height, weight ); - /* try to find an acceptable font */ - WARN( "Couldn't match the font from registry, trying to find one\n" ); - fc.console = console; - fc.done = FALSE; - for (fc.pass = 0; fc.pass <= 5; fc.pass++) - { - EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); - if (fc.done) return; - } - ERR( "Couldn't find a decent font\n" ); + set_console_font( console, &lf ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ @@ -2440,6 +2431,9 @@ BOOL init_window( struct console *console ) 0, 0, 0, 0, wndclass.hInstance, console )) return FALSE; + if (!config.face_name[0]) + set_first_font( console, &config ); + apply_config( console, &config ); return TRUE; } -- 2.36.1

2 1

[PATCH] vbscript: Handle negative argument in Space().
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 11 +++++++---- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 15c0bb0958e..80348a5288f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1586,14 +1586,17 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(arg, &n); if(FAILED(hres)) return hres; - if(n < 0) { - FIXME("n = %d\n", n); - return E_NOTIMPL; - } + if(n < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); if(!res) return S_OK; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b67e920c3d..617589053c6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -747,6 +747,21 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +Call ok(Space(Empty) = "", "Space(Empty) = " & Space(Empty) & """") + +sub testSpaceError() + on error resume next + call Err.clear() + call Space(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space("-1") + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space(Null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testSpaceError() sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ -- 2.35.1

2 1

[PATCH] vbscript: Fix a typo in sizeof() (Coverity).
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9a24657c848..15c0bb0958e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2028,7 +2028,7 @@ static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cn { /* vbUseSystemDayOfWeek */ GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, - sizeof(&first_day) / sizeof(WCHAR)); + sizeof(first_day) / sizeof(WCHAR)); first_day = (first_day + 1) % 7; } else if (first_day >= 1 && first_day <= 7) -- 2.35.1

2 1

[PATCH 1/3] include: Add some more process information classes constants.
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- include/winternl.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); diff --git a/include/winternl.h b/include/winternl.h index ca265cf074c..c992eaebf11 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1566,6 +1566,14 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, + ProcessImageFileMapping = 44, + ProcessAffinityUpdateMode = 45, + ProcessMemoryAllocationMode = 46, + ProcessGroupInformation = 47, + ProcessTokenVirtualizationEnabled = 48, + ProcessConsoleHostProcess = 49, + ProcessWindowInformation = 50, + ProcessHandleInformation = 51, MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, -- 2.35.1

2 4

[PATCH v2] msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Moore, Brandon A. 23 May '22

23 May '22

2 1

[PATCH 0/1] MR112: Revert "dbghelp: Don't bother trying to initialize loader backend if we can't...
by Jinoh Kang (＠iamahuman) 23 May '22

23 May '22

Revert "dbghelp: Don't bother trying to initialize loader backend if we can't get debug base address from PEB." This reverts commit 3047385437c7ef36996d0418ac378677f3e9d67c. ntdll.so puts the base address of the main Unix executable, called the "debug base address," inside an unused field of PEB. When debugging a WoW64 target process, obtaining the debug base address fails. This is because the architecture of PE modules differs from that of Unix modules. Specifically, dbghelp attempts to fetch it from the WoW64 PEB although it actually resides in the native PEB. However, this shouldn't be a reason to give up initializing dbghelp entirely. We do not expect a "user-mode" debugger to be able to debug Unix-side modules in a WoW64 process anyway. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/112

3 6

[PATCH v2 0/2] MR106: Avoid mpg123 functions with suffix
by André Zwing (＠AndreRH) 23 May '22

23 May '22

Otherwise I get: ld: dlls/l3codeca.acm/mpegl3.o: in function `MPEG3_DriverProc': mpegl3.c:(.text+0x977): undefined reference to `mpg123_feedseek_64' and MPG123_NO_LARGENAME is also defined for the builtin mpg123. With this patch the headers behave the same. Not sure why I am the first to spot this, maybe others mostly use the host mpg123? -- v2: mp3dmod: Avoid mpg123 functions with suffix l3codeca.acm: Avoid mpg123 functions with suffix https://gitlab.winehq.org/wine/wine/-/merge_requests/106

2 2

[PATCH v2 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 23 May '22

23 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: ntdll: Fake success for ThreadPowerThrottlingState include: Add THREAD_POWER_THROTTLING_STATE type winex11.drv: Define ControlMask when not available https://gitlab.winehq.org/wine/wine/-/merge_requests/115

4 5

[PATCH v2 0/6] MR117: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 23 May '22

23 May '22

Avoid using user32. -- v2: winemac: Directly use win32u for user functions in window.c. winemac: Directly use win32u for user functions in opengl.c. winemac: Directly use win32u for user functions in mouse.c. winemac: Directly use win32u in more places. winemac: Directly use win32u for user functions in clipboard.c. winemac: Directly use win32u for user functions in display.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/117

3 8

← Newer
1
...
22
23
24
25
26
27
28
...
71
Older →

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-devel May 2022