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

[PATCH 5/9] gdi32: Don't use PHYSDEV for metafile helpers.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/graphics.c | 27 +++++---- dlls/gdi32/mfdrv/metafiledrv.h | 6 +- dlls/gdi32/mfdrv/objects.c | 102 ++++++++++++++++----------------- 3 files changed, 65 insertions(+), 70 deletions(-)

2 1

[PATCH 4/9] gdi32: Avoid using MFDRV_MetaParam* helpers.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 13 +++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 13 +------------ dlls/gdi32/mfdrv/objects.c | 24 ++++++++++++------------ 4 files changed, 29 insertions(+), 35 deletions(-)

2 1

[PATCH 3/9] gdi32: Rename METAFILEDRV_PDEVICE to metadc.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/graphics.c | 10 +++++----- dlls/gdi32/mfdrv/init.c | 36 +++++++++++++++++----------------- dlls/gdi32/mfdrv/metafiledrv.h | 6 +++--- dlls/gdi32/mfdrv/objects.c | 16 +++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-)

2 1

[PATCH 2/9] gdi32: Use NtGdiRestoreDC for RestoreDC.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

2 1

[PATCH 1/9] gdi32: Store save level in DC_ATTR.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 12 ++++++------ dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 149 ++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index bd5cad428bc..2097e8e53d3 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3536,6 +3536,154 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); } +static void test_SetCurrentConsoleFontEx(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetCurrentConsoleFontEx)(HANDLE, BOOL, CONSOLE_FONT_INFOEX *); + BOOL (WINAPI *pSetCurrentConsoleFontEx)(HANDLE, BOOL, CONSOLE_FONT_INFOEX *); + CONSOLE_FONT_INFOEX orig_cfix, cfix; + BOOL ret; + HANDLE pipe1, pipe2; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "GetCurrentConsoleFontEx"); + pSetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "SetCurrentConsoleFontEx"); + + if (!pGetCurrentConsoleFontEx || !pSetCurrentConsoleFontEx) + { + win_skip("GetCurrentConsoleFontEx and SetCurrentConsoleFontEx are not available\n"); + return; + } + + orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); + + ret = pGetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); + ok(ret, "got %d, expected non-zero\n", ret); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(pipe1, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(pipe1, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_output, FALSE, &cfix); + ok(!ret || broken(ret), "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ok(!ret || broken(ret), "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), "got %u, expected 87\n", GetLastError()); + + cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(pipe1, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(pipe1, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER /* 32-bit */ || + GetLastError() == ERROR_INVALID_HANDLE /* 64-bit */, + "got %u, expected 87 (32-bit) or 6 (64-bit)\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_output, TRUE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + /* Restore original console font parameters */ + SetLastError(0xdeadbeef); + ret = pSetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); +} + static void test_GetConsoleFontSize(HANDLE std_output) { COORD c; @@ -4688,6 +4836,7 @@ START_TEST(console) { test_GetCurrentConsoleFont(hConOut); test_GetCurrentConsoleFontEx(hConOut); + test_SetCurrentConsoleFontEx(hConOut); test_GetConsoleFontSize(hConOut); test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut); -- 2.32.0

2 1

[PATCH 2/2] conhost: Use message window to return a window for windowless consoles.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38640 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++ programs/conhost/conhost.c | 7 ++-- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 71 +++++++++++++++++++++++++---------- 4 files changed, 60 insertions(+), 23 deletions(-)

1 0

[PATCH 1/2] conhost: Use dedicated ioctl for GetConsoleWindow.
by Jacek Caban Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 6 +++--- include/wine/condrv.h | 2 +- programs/conhost/conhost.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 1/7] winebus.sys: Initialize device_id and instance_id on creation.
by Rémi Bernon Aug. 17, 2021

Aug. 17, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 67 ++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a60e3cc9a2c..5b15fd08a35 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -22,12 +22,16 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" #include "winternl.h" #include "winioctl.h" #include "hidusage.h" #include "ddk/wdm.h" #include "ddk/hidport.h" #include "ddk/hidtypes.h" +#include "cfgmgr32.h" + #include "wine/asm.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -118,10 +122,11 @@ struct device_extension struct pnp_device *pnp_device; WORD vid, pid, input; - DWORD uid, version, index; - BOOL is_gamepad; - WCHAR *serial; + DWORD version, index; + const WCHAR *busid; /* Expected to be a static constant */ + WCHAR device_id[MAX_DEVICE_ID_LEN]; + WCHAR instance_id[MAX_DEVICE_ID_LEN]; const platform_vtbl *vtbl; @@ -145,19 +150,6 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list pnp_devset = LIST_INIT(pnp_devset); -static const WCHAR zero_serialW[]= {'0','0','0','0',0}; -static const WCHAR miW[] = {'M','I',0}; -static const WCHAR igW[] = {'I','G',0}; - -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst; - if (!src) return NULL; - dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1)*sizeof(WCHAR)); - if (dst) strcpyW(dst, src); - return dst; -} - void *get_platform_private(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; @@ -181,40 +173,24 @@ static DWORD get_device_index(WORD vid, WORD pid, WORD input) static WCHAR *get_instance_id(DEVICE_OBJECT *device) { - static const WCHAR formatW[] = {'%','i','&','%','s','&','%','x','&','%','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - const WCHAR *serial = ext->serial ? ext->serial : zero_serialW; - DWORD len = strlenW(serial) + 33; + DWORD len = strlenW(ext->instance_id); WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - sprintfW(dst, formatW, ext->version, serial, ext->uid, ext->index); + strcpyW(dst, ext->instance_id); return dst; } static WCHAR *get_device_id(DEVICE_OBJECT *device) { - static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', - '&','p','i','d','_','%','0','4','x',0}; - static const WCHAR format_inputW[] = {'%','s','\\','v','i','d','_','%','0','4','x', - '&','p','i','d','_','%','0','4','x','&','%','s','_','%','0','2','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->busid) + 34; + DWORD len = strlenW(ext->device_id); WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - { - if (ext->input == (WORD)-1) - { - sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); - } - else - { - sprintfW(dst, format_inputW, ext->busid, ext->vid, ext->pid, - ext->is_gamepad ? igW : miW, ext->input); - } - } + strcpyW(dst, ext->device_id); return dst; } @@ -251,7 +227,15 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, const platform_vtbl *vtbl, DWORD platform_data_size) { + static const WCHAR device_id_formatW[] = + { + '%','s','\\','v','i','d','_','%','0','4','x','&','p','i','d','_','%','0','4','x',0 + }; static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; + static const WCHAR instance_id_formatW[] = {'%','i','&','%','s','&','%','x','&','%','i',0}; + static const WCHAR zero_serialW[]= {'0','0','0','0',0}; + static const WCHAR miW[] = {'&','M','I','_','%','0','2','i',0}; + static const WCHAR igW[] = {'&','I','G','_','%','0','2','i',0}; struct device_extension *ext; struct pnp_device *pnp_dev; DEVICE_OBJECT *device; @@ -286,11 +270,8 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, ext->vid = vid; ext->pid = pid; ext->input = input; - ext->uid = uid; ext->version = version; ext->index = get_device_index(vid, pid, input); - ext->is_gamepad = is_gamepad; - ext->serial = strdupW(serialW); ext->busid = busidW; ext->vtbl = vtbl; ext->last_report = NULL; @@ -298,6 +279,12 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, ext->last_report_read = TRUE; ext->buffer_size = 0; + length = sprintfW(ext->device_id, device_id_formatW, busidW, vid, pid); + if (input != (WORD)-1) sprintfW(ext->device_id + length, is_gamepad ? igW : miW, input); + + sprintfW(ext->instance_id, instance_id_formatW, version, + serialW ? serialW : zero_serialW, uid, ext->index); + memset(ext->platform_private, 0, platform_data_size); InitializeListHead(&ext->irp_queue); @@ -382,7 +369,6 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); - HeapFree(GetProcessHeap(), 0, ext->serial); HeapFree(GetProcessHeap(), 0, ext->last_report); IoDeleteDevice(device); @@ -718,7 +704,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); - HeapFree(GetProcessHeap(), 0, ext->serial); HeapFree(GetProcessHeap(), 0, ext->last_report); irp->IoStatus.Status = STATUS_SUCCESS; -- 2.32.0

1 7

[PATCH] winemac.drv: Use length returned from sprintfW().
by Zhiyi Zhang Aug. 17, 2021

Aug. 17, 2021

A minor optimization. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6706c88341c..5a87e2331be 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1630,6 +1630,7 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; WCHAR bufferW[MAX_PATH]; + DWORD length; HKEY hkey; RECT rect; BOOL ret = FALSE; @@ -1677,9 +1678,9 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m (const BYTE *)&rect, sizeof(rect), 0)) goto done; /* Adapter name */ - sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, - (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0)) goto done; ret = TRUE; -- 2.30.2

1 0