November 2019 - Wine-commits

Alexandre Julliard : wbemprox: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 7026b59b48abecfe51444df491ff40b33f53d3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7026b59b48abecfe51444df4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:54 2019 +0100 wbemprox: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 12f4cb5104..0fae44da2e 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -216,7 +216,7 @@ static int wql_lex( void *val, struct parser *parser ); %lex-param { struct parser *ctx } %parse-param { struct parser *ctx } %define parse.error verbose -%pure-parser +%define api.pure %union {

1 0

Chip Davis : ntdll: Implement SystemBatteryState for Mac OS.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: eea87600d21adcd910f72f1cdaf698451884f582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea87600d21adcd910f72f1c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:09:31 2019 -0600 ntdll: Implement SystemBatteryState for Mac OS. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c9b278d3fc..f59aba0358 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -38,6 +38,9 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <IOKit/IOKitLib.h> +# include <IOKit/pwr_mgt/IOPM.h> +# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPowerSources.h> #endif #include <ctype.h> @@ -3291,6 +3294,73 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) return STATUS_SUCCESS; } +#elif defined(HAVE_IOKIT_IOKITLIB_H) + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + CFArrayRef batteries; + CFDictionaryRef battery; + CFNumberRef prop; + uint32_t value, voltage; + CFTimeInterval remain; + + if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + return STATUS_ACCESS_DENIED; + + if (CFArrayGetCount( batteries ) == 0) + { + /* Just assume we're on AC with no battery. */ + bs->AcOnLine = TRUE; + return STATUS_SUCCESS; + } + /* Just use the first battery. */ + battery = CFArrayGetValueAtIndex( batteries, 0 ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + + if (value & kIOBatteryInstalled) + bs->BatteryPresent = TRUE; + else + /* Since we are executing code, we must have AC power. */ + bs->AcOnLine = TRUE; + if (value & kIOBatteryChargerConnect) + { + bs->AcOnLine = TRUE; + if (value & kIOBatteryCharge) + bs->Charging = TRUE; + } + else + bs->Discharging = TRUE; + + /* We'll need the voltage to be able to interpret the other values. */ + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->MaxCapacity = value * voltage; + /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow + * Windows for now (5% and 33%). */ + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = bs->MaxCapacity / 3; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->RemainingCapacity = value * voltage; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->Rate = value * voltage; + + remain = IOPSGetTimeRemainingEstimate(); + if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) + bs->EstimatedTime = (ULONG)remain; + + CFRelease( batteries ); + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs)

1 0

Jeff Smith : msvcrt: Call invalid parameter handler for out-of-range integer.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8fe3d7c9134eaac35def84ed4ead50c571469529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fe3d7c9134eaac35def84ed… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 25 08:10:05 2019 -0600 msvcrt: Call invalid parameter handler for out-of-range integer. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 3 +-- dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 84e725747f..0d5b64a4aa 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -996,9 +996,8 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_s #endif MSVCRT_size_t len; - if(src<l || src>h) { + if(!MSVCRT_CHECK_PMT(src>=l && src<=h)) { *str = 0; - *MSVCRT__errno() = MSVCRT_EINVAL; return FALSE; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 93a78a5de7..6314662eac 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -937,10 +937,10 @@ static void test_strftime(void) {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, @@ -948,10 +948,10 @@ static void test_strftime(void) {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},

1 0

Vijay Kiran Kamuju : shcore: Add stub for GetScaleFactorForMonitor.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: bbdc670931e5473b8c11895489636ae1ab8b6ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdc670931e5473b8c118954… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Nov 25 09:00:26 2019 +0100 shcore: Add stub for GetScaleFactorForMonitor. Based on a patch by Esdras Tarsis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 ++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 3 +++ include/shtypes.idl | 21 +++++++++++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9d..9ebda5164c 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..3f95c1ffd8 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..82a1daaa62 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -36,6 +38,7 @@ typedef enum PROCESS_DPI_AWARENESS HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */ diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c80381..c83562a24b 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR;

1 0

Chip Davis : winegcc: Pass through -fuse-ld= to the linker.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 6c50dbd14ec1c652faecc5ca84d78dab74d89b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c50dbd14ec1c652faecc5ca… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:13:31 2019 -0600 winegcc: Pass through -fuse-ld= to the linker. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 140ca07822..939c1e5c91 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -73,7 +73,7 @@ * object-file-name -llibrary -nostartfiles -nodefaultlibs * -nostdlib -s -static -static-libgcc -static-libstdc++ * -shared -shared-libgcc -symbolic -Wl,option - * -Xlinker option -u symbol --image-base + * -Xlinker option -u symbol --image-base -fuse-ld * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1329,6 +1329,9 @@ static int is_linker_arg(const char* arg) case 'a': if (strcmp("-arch", arg) == 0) return 1; break; + case 'f': + if (strncmp("-fuse-ld=", arg, 9) == 0) return 1; + break; } for (j = 0; j < ARRAY_SIZE(link_switches); j++)

1 0

Francois Gouget : comctl32/tests: Trace the iteration counter when a tooltips test fails.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8b2d5c7c5a1a4476df39618d5b4c468bb2e056c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b2d5c7c5a1a4476df39618d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:19:56 2019 +0100 comctl32/tests: Trace the iteration counter when a tooltips test fails. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 0cb7afd688..6156bffa13 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -197,7 +197,7 @@ static void test_customdraw(void) { 50, 50, 300, 300, NULL, NULL, NULL, 0); - ok(parent != NULL, "Creation of main window failed\n"); + ok(parent != NULL, "%d: Creation of main window failed\n", iterationNumber); /* Make it show */ ShowWindow(parent, SW_SHOWNORMAL); @@ -209,7 +209,7 @@ static void test_customdraw(void) { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, GetModuleHandleA(NULL), 0); - ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + ok(hwndTip != NULL, "%d: Creation of tooltip window failed\n", iterationNumber); /* Set up parms for the wndproc to handle */ CD_Stages = 0; @@ -230,7 +230,7 @@ static void test_customdraw(void) { toolInfo.lParam = 0xdeadbeef; GetClientRect (parent, &toolInfo.rect); ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); - ok(ret, "Failed to add the tool.\n"); + ok(ret, "%d: Failed to add the tool.\n", iterationNumber); /* Make tooltip appear quickly */ SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); @@ -245,23 +245,23 @@ static void test_customdraw(void) { /* Check CustomDraw results */ ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ - "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages, + "%d: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0); - ok(ret, "Failed to get current tool %#lx.\n", ret); + ok(ret, "%d: Failed to get current tool %#lx.\n", iterationNumber, ret); memset(&toolInfo, 0xcc, sizeof(toolInfo)); toolInfo.cbSize = sizeof(toolInfo); toolInfo.lpszText = NULL; toolInfo.lpReserved = (void *)0xdeadbeef; SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo); - ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd); - ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst); - ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %lx.\n", toolInfo.uId); - ok(toolInfo.lParam == 0, "Unexpected lParam %lx.\n", toolInfo.lParam); - ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved); + ok(toolInfo.hwnd == parent, "%d: Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd); + ok(toolInfo.hinst == GetModuleHandleA(NULL), "%d: Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst); + ok(toolInfo.uId == 0x1234abcd, "%d: Unexpected uId %lx.\n", iterationNumber, toolInfo.uId); + ok(toolInfo.lParam == 0, "%d: Unexpected lParam %lx.\n", iterationNumber, toolInfo.lParam); + ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%d: Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved); /* Clean up */ DestroyWindow(hwndTip);

1 0

Gijs Vermeulen : server: Add support for additional fields in set_console_output_info.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 6ca93646be4538564e25f4aa03456c6da8c2115a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca93646be4538564e25f4aa… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Nov 20 11:45:28 2019 +0100 server: Add support for additional fields in set_console_output_info. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 8 +++++--- programs/wineconsole/wineconsole.c | 3 +++ server/console.c | 35 ++++++++++++++++++++++++++++++----- server/protocol.def | 5 ++++- server/request.h | 2 ++ server/trace.c | 5 ++++- tools/make_requests | 8 +++++++- 7 files changed, 55 insertions(+), 11 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d8f9816422..3213f433d9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2074,8 +2074,10 @@ struct set_console_output_info_request short int max_height; short int font_width; short int font_height; - /* VARARG(colors,uints); */ - char __pad_52[4]; + short int font_weight; + short int font_pitch_family; + /* VARARG(colors,uints,64); */ + /* VARARG(face_name,unicode_str); */ }; struct set_console_output_info_reply { @@ -6691,6 +6693,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 589 +#define SERVER_PROTOCOL_VERSION 590 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 439099c37a..ebcfce1011 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -458,6 +458,9 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; req->font_width = cfg->cell_width; req->font_height = cfg->cell_height; + req->font_weight = cfg->font_weight; + req->font_pitch_family = FIXED_PITCH | FF_DONTCARE; + wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) ); wine_server_call( req ); } SERVER_END_REQ; diff --git a/server/console.c b/server/console.c index 7d1fc5d268..97d247c98e 100644 --- a/server/console.c +++ b/server/console.c @@ -131,6 +131,10 @@ struct font_info { short int width; short int height; + short int weight; + short int pitch_family; + WCHAR *face_name; + data_size_t face_len; }; struct screen_buffer @@ -433,6 +437,10 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->data = NULL; screen_buffer->font.width = 0; screen_buffer->font.height = 0; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + screen_buffer->font.face_name = NULL; + screen_buffer->font.face_len = 0; memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); @@ -896,6 +904,8 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, const struct set_console_output_info_request *req ) { struct console_renderer_event evt; + data_size_t font_name_len, offset; + WCHAR *font_name; memset(&evt.u, 0, sizeof(evt.u)); if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM) @@ -1039,15 +1049,29 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = req->max_width; screen_buffer->max_height = req->max_height; } + if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, get_req_data(), min( get_req_data_size(), sizeof(screen_buffer->color_map) )); + } if (req->mask & SET_CONSOLE_OUTPUT_INFO_FONT) { screen_buffer->font.width = req->font_width; screen_buffer->font.height = req->font_height; - } - if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) - { - memcpy( screen_buffer->color_map, get_req_data(), - min( sizeof(screen_buffer->color_map), get_req_data_size() )); + screen_buffer->font.weight = req->font_weight; + screen_buffer->font.pitch_family = req->font_pitch_family; + offset = req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE ? sizeof(screen_buffer->color_map) : 0; + if (get_req_data_size() > offset) + { + font_name_len = (get_req_data_size() - offset) / sizeof(WCHAR) * sizeof(WCHAR); + font_name = mem_alloc( font_name_len ); + if (font_name) + { + memcpy( font_name, (char *)get_req_data() + offset, font_name_len ); + free( screen_buffer->font.face_name ); + screen_buffer->font.face_name = font_name; + screen_buffer->font.face_len = font_name_len; + } + } } return 1; @@ -1183,6 +1207,7 @@ static void screen_buffer_destroy( struct object *obj ) } if (screen_buffer->fd) release_object( screen_buffer->fd ); free( screen_buffer->data ); + free( screen_buffer->font.face_name ); } static struct fd *screen_buffer_get_fd( struct object *obj ) diff --git a/server/protocol.def b/server/protocol.def index 3a0df20bdb..1b4085ecbf 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1633,7 +1633,10 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; - VARARG(colors,uints); /* color table */ + short int font_weight; /* font weight */ + short int font_pitch_family; /* font pitch & family */ + VARARG(colors,uints,64); /* color table */ + VARARG(face_name,unicode_str); /* font face name */ @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 diff --git a/server/request.h b/server/request.h index 1303b35ef7..e7846b55b3 100644 --- a/server/request.h +++ b/server/request.h @@ -1204,6 +1204,8 @@ C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, max_width) == 44 C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, max_height) == 46 ); C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_width) == 48 ); C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_height) == 50 ); +C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_weight) == 52 ); +C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_pitch_family) == 54 ); C_ASSERT( sizeof(struct set_console_output_info_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_output_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 55d5e68962..94def43537 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2133,7 +2133,10 @@ static void dump_set_console_output_info_request( const struct set_console_outpu fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); - dump_varargs_uints( ", colors=", cur_size ); + fprintf( stderr, ", font_weight=%d", req->font_weight ); + fprintf( stderr, ", font_pitch_family=%d", req->font_pitch_family ); + dump_varargs_uints( ", colors=", min(cur_size,64) ); + dump_varargs_unicode_str( ", face_name=", cur_size ); } static void dump_get_console_output_info_request( const struct get_console_output_info_request *req ) diff --git a/tools/make_requests b/tools/make_requests index faeabe5852..4e39bb65a9 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -216,7 +216,13 @@ sub PARSE_REQUESTS() next; } - if (/^\s*VARARG$(\w+),(\w+),(\w+)$/) + if (/^\s*VARARG$(\w+),(\w+),(\d+)$/) + { + $var = $1; + $type = "dump_varargs_$2( \"%s\", min(cur_size,$3) )"; + s!(VARARG$.*$\s*;)!/* $1 */!; + } + elsif (/^\s*VARARG$(\w+),(\w+),(\w+)$/) { $var = $1; $type = "dump_varargs_" . $2 . "( \"%s\", min(cur_size,req->" . $3 . ") )";

1 0

Gijs Vermeulen : kernel32: Implement GetCurrentConsoleFontEx.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: ec810c84ab906f22dc0d00e52ab1a77c9932aaa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec810c84ab906f22dc0d00e5… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Nov 20 11:45:29 2019 +0100 kernel32: Implement GetCurrentConsoleFontEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47620 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/kernel32/kernel32.spec | 2 +- include/wine/server_protocol.h | 8 ++++++-- server/console.c | 17 +++++++++++++++-- server/protocol.def | 5 ++++- server/request.h | 4 +++- server/trace.c | 5 ++++- 7 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a698e53efe..0842bb71a6 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1639,17 +1639,28 @@ BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) } -BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo) +BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *fontinfo) { BOOL ret; + struct + { + unsigned int color_map[16]; + WCHAR face_name[LF_FACESIZE]; + } data; - memset(fontinfo, 0, sizeof(CONSOLE_FONT_INFO)); + if (fontinfo->cbSize != sizeof(CONSOLE_FONT_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } SERVER_START_REQ(get_console_output_info) { req->handle = console_handle_unmap(hConsole); + wine_server_set_reply( req, &data, sizeof(data) - sizeof(WCHAR) ); if ((ret = !wine_server_call_err(req))) { + fontinfo->nFont = 0; if (maxwindow) { fontinfo->dwFontSize.X = min(reply->width, reply->max_width); @@ -1660,12 +1671,39 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; } + if (wine_server_reply_size( reply ) > sizeof(data.color_map)) + { + data_size_t len = wine_server_reply_size( reply ) - sizeof(data.color_map); + memcpy( fontinfo->FaceName, data.face_name, len ); + fontinfo->FaceName[len / sizeof(WCHAR)] = 0; + } + else + fontinfo->FaceName[0] = 0; + fontinfo->FontFamily = reply->font_pitch_family; + fontinfo->FontWeight = reply->font_weight; } } SERVER_END_REQ; return ret; } +BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFO *fontinfo) +{ + BOOL ret; + CONSOLE_FONT_INFOEX res; + + res.cbSize = sizeof(CONSOLE_FONT_INFOEX); + + ret = GetCurrentConsoleFontEx(hConsole, maxwindow, &res); + if(ret) + { + fontinfo->nFont = res.nFont; + fontinfo->dwFontSize.X = res.dwFontSize.X; + fontinfo->dwFontSize.Y = res.dwFontSize.Y; + } + return ret; +} + static COORD get_console_font_size(HANDLE hConsole, DWORD index) { COORD c = {0,0}; diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f6c40a9c42..367f5d2373 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -623,7 +623,7 @@ @ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) @ stdcall -import GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) -# @ stub GetCurrentConsoleFontEx +@ stdcall GetCurrentConsoleFontEx(long long ptr) @ stdcall -import GetCurrentDirectoryA(long ptr) @ stdcall -import GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentPackageFamilyName(ptr ptr) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3213f433d9..0712170c80 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2119,7 +2119,11 @@ struct get_console_output_info_reply short int max_height; short int font_width; short int font_height; - /* VARARG(colors,uints); */ + short int font_weight; + short int font_pitch_family; + /* VARARG(colors,uints,64); */ + /* VARARG(face_name,unicode_str); */ + char __pad_44[4]; }; @@ -6693,6 +6697,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 590 +#define SERVER_PROTOCOL_VERSION 591 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 97d247c98e..59f8843a75 100644 --- a/server/console.c +++ b/server/console.c @@ -1756,6 +1756,8 @@ DECL_HANDLER(set_console_output_info) DECL_HANDLER(get_console_output_info) { struct screen_buffer *screen_buffer; + void *data; + data_size_t total; if ((screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->handle, FILE_READ_PROPERTIES, &screen_buffer_ops))) @@ -1776,8 +1778,19 @@ DECL_HANDLER(get_console_output_info) reply->max_height = screen_buffer->max_height; reply->font_width = screen_buffer->font.width; reply->font_height = screen_buffer->font.height; - set_reply_data( screen_buffer->color_map, - min( sizeof(screen_buffer->color_map), get_reply_max_size() )); + reply->font_weight = screen_buffer->font.weight; + reply->font_pitch_family = screen_buffer->font.pitch_family; + total = min( sizeof(screen_buffer->color_map) + screen_buffer->font.face_len, get_reply_max_size() ); + if (total) + { + data = set_reply_data_size( total ); + memcpy( data, screen_buffer->color_map, min( total, sizeof(screen_buffer->color_map) )); + if (screen_buffer->font.face_len && total > sizeof(screen_buffer->color_map)) + { + memcpy( (char *)data + sizeof(screen_buffer->color_map), screen_buffer->font.face_name, + min( total - sizeof(screen_buffer->color_map), screen_buffer->font.face_len )); + } + } release_object( screen_buffer ); } } diff --git a/server/protocol.def b/server/protocol.def index 1b4085ecbf..c5c15ea1d7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1669,7 +1669,10 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; - VARARG(colors,uints); /* color table */ + short int font_weight; /* font weight */ + short int font_pitch_family; /* font pitch & family */ + VARARG(colors,uints,64); /* color table */ + VARARG(face_name,unicode_str); /* font face name */ @END /* Add input records to a console input queue */ diff --git a/server/request.h b/server/request.h index e7846b55b3..f0d2003cd7 100644 --- a/server/request.h +++ b/server/request.h @@ -1225,7 +1225,9 @@ C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_width) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_height) == 34 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_width) == 36 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_height) == 38 ); -C_ASSERT( sizeof(struct get_console_output_info_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_weight) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_pitch_family) == 42 ); +C_ASSERT( sizeof(struct get_console_output_info_reply) == 48 ); C_ASSERT( FIELD_OFFSET(struct write_console_input_request, handle) == 12 ); C_ASSERT( sizeof(struct write_console_input_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct write_console_input_reply, written) == 8 ); diff --git a/server/trace.c b/server/trace.c index 94def43537..11df768755 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2162,7 +2162,10 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); - dump_varargs_uints( ", colors=", cur_size ); + fprintf( stderr, ", font_weight=%d", req->font_weight ); + fprintf( stderr, ", font_pitch_family=%d", req->font_pitch_family ); + dump_varargs_uints( ", colors=", min(cur_size,64) ); + dump_varargs_unicode_str( ", face_name=", cur_size ); } static void dump_write_console_input_request( const struct write_console_input_request *req )

1 0

Gijs Vermeulen : kernel32/tests: Add GetCurrentConsoleFontEx tests.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: a507126ac48e3a74300b6fb12a4118218cb99487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a507126ac48e3a74300b6fb1… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Nov 20 11:45:30 2019 +0100 kernel32/tests: Add GetCurrentConsoleFontEx tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 99 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1ecb350673..5f8003760d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2694,6 +2694,104 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) "got %d, expected %d\n", cfi.dwFontSize.Y, csbi.dwMaximumWindowSize.Y); } +static void test_GetCurrentConsoleFontEx(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetCurrentConsoleFontEx)(HANDLE, BOOL, CONSOLE_FONT_INFOEX *); + CONSOLE_FONT_INFO cfi; + CONSOLE_FONT_INFOEX cfix; + BOOL ret; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "GetCurrentConsoleFontEx"); + if (!pGetCurrentConsoleFontEx) + { + win_skip("GetCurrentConsoleFontEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_output, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_output, FALSE, &cfix); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ok(cfix.dwFontSize.X == cfi.dwFontSize.X, "expected values to match\n"); + ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); + + SetLastError(0xdeadbeef); + ret = pGetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(std_output, TRUE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ok(cfix.dwFontSize.X == cfi.dwFontSize.X, "expected values to match\n"); + ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); +} + static void test_GetConsoleFontSize(HANDLE std_output) { COORD c; @@ -3294,6 +3392,7 @@ START_TEST(console) test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); test_GetCurrentConsoleFont(hConOut); + test_GetCurrentConsoleFontEx(hConOut); test_GetConsoleFontSize(hConOut); test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut);

1 0

Gijs Vermeulen : wineconsole: Add registry support for font pitch&family.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 228b9b7b520af15382841084482856ebf5553d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=228b9b7b520af15382841084… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Nov 20 11:45:31 2019 +0100 wineconsole: Add registry support for font pitch&family. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 13 +++++++++++-- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/wineconsole.c | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 359034f838..6bcc096d93 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -38,6 +38,7 @@ static const WCHAR wszCursorVisible[] = {'C','u','r','s','o','r','V','i','s' static const WCHAR wszEditionMode[] = {'E','d','i','t','i','o','n','M','o','d','e',0}; static const WCHAR wszExitOnDie[] = {'E','x','i','t','O','n','D','i','e',0}; static const WCHAR wszFaceName[] = {'F','a','c','e','N','a','m','e',0}; +static const WCHAR wszFontPitchFamily[] = {'F','o','n','t','P','i','t','c','h','F','a','m','i','l','y',0}; static const WCHAR wszFontSize[] = {'F','o','n','t','S','i','z','e',0}; static const WCHAR wszFontWeight[] = {'F','o','n','t','W','e','i','g','h','t',0}; static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u','f','f','e','r','S','i','z','e',0}; @@ -56,10 +57,10 @@ static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x pop-up=%02x font=%s/%u hist=%u/%d flags=%c%c%c " + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x pop-up=%02x font=%s/%u/%u hist=%u/%d flags=%c%c%c " "msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, - cfg->popup_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, + cfg->popup_attr, wine_dbgstr_w(cfg->face_name), cfg->font_pitch_family, cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, @@ -123,6 +124,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(cfg->face_name); RegQueryValueExW(hConKey, wszFaceName, 0, &type, (LPBYTE)&cfg->face_name, &count); + count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszFontPitchFamily, 0, &type, (LPBYTE)&val, &count)) + cfg->font_pitch_family = val; + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { @@ -211,6 +216,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->cursor_visible = 1; cfg->exit_on_die = 1; memset(cfg->face_name, 0, sizeof(cfg->face_name)); + cfg->font_pitch_family = FIXED_PITCH | FF_DONTCARE; cfg->cell_height = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); cfg->cell_width = MulDiv( 8, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); cfg->font_weight = FW_NORMAL; @@ -285,6 +291,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) RegSetValueExW(hConKey, wszFaceName, 0, REG_SZ, (LPBYTE)&cfg->face_name, sizeof(cfg->face_name)); + val = cfg->font_pitch_family; + RegSetValueExW(hConKey, wszFontPitchFamily, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + width = MulDiv( cfg->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); height = MulDiv( cfg->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); val = MAKELONG(width, height); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index d556299d62..54d8782a2a 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -35,6 +35,7 @@ struct config_data { DWORD def_attr; /* default fill attributes (screen colors) */ DWORD popup_attr; /* pop-up color attributes */ WCHAR face_name[32]; /* name of font (size is LF_FACESIZE) */ + DWORD font_pitch_family; DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ DWORD history_nodup; /* TRUE if commands are not stored twice in buffer */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index ebcfce1011..4b65e68939 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -445,7 +445,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.menu_mask = cfg->menu_mask; data->curcfg.quick_edit = cfg->quick_edit; if (strcmpiW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width || - data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_pitch_family != cfg->font_pitch_family || + data->curcfg.font_weight != cfg->font_weight) { RECT r; data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); @@ -459,7 +460,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf req->font_width = cfg->cell_width; req->font_height = cfg->cell_height; req->font_weight = cfg->font_weight; - req->font_pitch_family = FIXED_PITCH | FF_DONTCARE; + req->font_pitch_family = cfg->font_pitch_family; wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) ); wine_server_call( req ); }

1 0