wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Gijs Vermeulen : qdvd: Add a stub IDvdControl2 interface.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: b9261c0f7822edc9d4284a35a518eb4811cb3b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9261c0f7822edc9d4284a35… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:20 2020 +0200 qdvd: Add a stub IDvdControl2 interface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/navigator.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 454 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9261c0f7822edc9d428…

1 0

Gijs Vermeulen : qdvd: Add a stub dvd navigator filter.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 36d5ec90572ec4691ade99b97600a1ab54b3c9b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d5ec90572ec4691ade99b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:19 2020 +0200 qdvd: Add a stub dvd navigator filter. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 3 +- dlls/qdvd/navigator.c | 67 ++++++++++++++++ dlls/qdvd/qdvd_classes.idl | 7 ++ dlls/qdvd/qdvd_main.c | 3 + dlls/qdvd/qdvd_private.h | 1 + dlls/qdvd/tests/Makefile.in | 3 +- dlls/qdvd/tests/navigator.c | 191 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36d5ec90572ec4691ade…

1 0

Piotr Caban : comctl32: Offset client area when toolbar divider is present.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 378548581d8799e7f9453f93ed4a7d6faa0377a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=378548581d8799e7f9453f93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:29 2020 +0200 comctl32: Offset client area when toolbar divider is present. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 5 +++++ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f973d9cfff..b1ac1cd8bf 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1649,6 +1649,11 @@ static void test_sizes(void) ok(rect.top == 0, "rect.top = %d\n", rect.top); ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2711a3eb8..c9ea56c078 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3104,9 +3104,9 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; - - if (!(infoPtr->dwStyle & CCS_NODIVIDER)) - cy += GetSystemMetrics(SM_CYEDGE); + + if (!(infoPtr->dwStyle & CCS_NOMOVEY) && !(infoPtr->dwStyle & CCS_NODIVIDER)) + y += GetSystemMetrics(SM_CYEDGE); x += border.left; y += border.top;

1 0

Piotr Caban : comctl32: Compute border size from client and window rectangles.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 659b0d7017cc899a4858cc5d3bd3c63befdc180d URL: https://source.winehq.org/git/wine.git/?a=commit;h=659b0d7017cc899a4858cc5d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:24 2020 +0200 comctl32: Compute border size from client and window rectangles. Fixes toolbar size when WS_EX_DLGMODALFRAME is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 26 ++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3688394d71..f973d9cfff 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -434,18 +434,23 @@ static void basic_test(void) DestroyWindow(hToolbar); } -static void rebuild_toolbar(HWND *hToolbar) +static void rebuild_toolbar_ex(HWND *hToolbar, DWORD exstyle) { if (*hToolbar) DestroyWindow(*hToolbar); - *hToolbar = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, - hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); + *hToolbar = CreateWindowExA(exstyle, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); ok(*hToolbar != NULL, "Toolbar creation problem\n"); ok(SendMessageA(*hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); ok(SendMessageA(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); ok(SendMessageA(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); } +static void rebuild_toolbar(HWND *hToolbar) +{ + rebuild_toolbar_ex(hToolbar, 0); +} + static void rebuild_toolbar_with_buttons(HWND *hToolbar) { TBBUTTON buttons[5]; @@ -1022,7 +1027,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 28 +#define tbsize_results_num 29 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -1277,6 +1282,9 @@ static void init_tbsize_results(void) { tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); + + tbsize_results[28] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[28], 0, 2, 23, 24); } static void free_tbsize_results(void) { @@ -1360,6 +1368,7 @@ static void test_sizes(void) int style; int i; int fontheight = system_font_height(); + RECT rect; init_tbsize_results(); @@ -1631,6 +1640,15 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes(); + /* Toolbar with borders around client area */ + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + SetWindowLongA(hToolbar, GWL_STYLE, CCS_NODIVIDER | GetWindowLongA(hToolbar, GWL_STYLE)); + SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)buttons1); + check_sizes(); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b869cc4d7b..b2711a3eb8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3069,7 +3069,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { - RECT window_rect, parent_rect; + RECT window_rect, client_rect, parent_rect, border; UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; HWND parent; INT x, y, cx, cy; @@ -3079,6 +3079,13 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!parent || !infoPtr->bDoRedraw) return 0; + GetWindowRect(infoPtr->hwndSelf, &window_rect); + GetClientRect(infoPtr->hwndSelf, &client_rect); + border = window_rect; + MapWindowPoints(0, infoPtr->hwndSelf, (POINT *)&border, 2); + border.right -= border.left + client_rect.right - client_rect.left; + border.bottom -= border.top + client_rect.bottom - client_rect.top; + GetClientRect(parent, &parent_rect); x = parent_rect.left; @@ -3089,15 +3096,11 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { - GetWindowRect(infoPtr->hwndSelf, &window_rect); MapWindowPoints( 0, parent, (POINT *)&window_rect, 2 ); y = window_rect.top; } if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_BOTTOM) - { - GetWindowRect(infoPtr->hwndSelf, &window_rect); y = parent_rect.bottom - ( window_rect.bottom - window_rect.top); - } if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; @@ -3105,11 +3108,10 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NODIVIDER)) cy += GetSystemMetrics(SM_CYEDGE); - if (infoPtr->dwStyle & WS_BORDER) - { - cx += 2 * GetSystemMetrics(SM_CXBORDER); - cy += 2 * GetSystemMetrics(SM_CYBORDER); - } + x += border.left; + y += border.top; + cx += border.right; + cy += border.bottom; SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); }

1 0

Jacek Caban : ntdll: Always use GNU _CI* functions implementation on clang.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 180f7cf412c486a4f2f769b44c0ccf1223226ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=180f7cf412c486a4f2f769b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 16:10:50 2020 +0200 ntdll: Always use GNU _CI* functions implementation on clang. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 6960b52dcb..4b7bb2296d 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -158,7 +158,7 @@ double CDECL tan( double d ) return unix_funcs->tan( d ); } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) @@ -220,7 +220,7 @@ LONGLONG CDECL _ftol(void) return (LONGLONG)x; } -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *),

1 0

Brendan Shanks : user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 894c6566ab25d0fb4a1a6d7e061041fc14906662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894c6566ab25d0fb4a1a6d7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:25 2020 -0700 user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8fe4701d00..6e8c9a275d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1309,6 +1309,15 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); + /* Test with an invalid adapter LUID */ + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId.LowPart = 0xFFFF; + source_name.header.adapterId.HighPart = 0xFFFF; + source_name.header.id = pi[i].sourceInfo.id; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "Expected GEN_FAILURE, got %d\n", ret); + todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; target_name.header.size = sizeof(target_name);

1 0

Brendan Shanks : user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 8949f570865fe72e28b4b7ef57c5c903d9a711b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8949f570865fe72e28b4b7ef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:24 2020 -0700 user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/monitor.c | 2 -- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3ec6c54023..6c0c3e76db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,23 +4815,67 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { + LONG ret = ERROR_GEN_FAILURE; + HANDLE mutex; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + DWORD index = 0, type; + LUID gpu_luid; + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; + wait_graphics_driver_ready(); switch (packet->type) { case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + WCHAR device_name[CCHDEVICENAME]; + LONG source_id; - FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + TRACE("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME\n"); if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; - return ERROR_NOT_SUPPORTED; + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + { + release_display_device_init_mutex(mutex); + return ret; + } + + while (SetupDiEnumDeviceInfo(devinfo, index++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + &type, (BYTE *)&gpu_luid, sizeof(gpu_luid), NULL, 0)) + continue; + + if ((source_name->header.adapterId.LowPart != gpu_luid.LowPart) || + (source_name->header.adapterId.HighPart != gpu_luid.HighPart)) + continue; + + /* QueryDisplayConfig() derives the source ID from the adapter name. */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, + &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) + continue; + + source_id = strtolW(device_name + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10); + source_id--; + if (source_name->header.id != source_id) + continue; + + lstrcpyW(source_name->viewGdiDeviceName, device_name); + ret = ERROR_SUCCESS; + break; + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + return ret; } case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f469111a26..8fe4701d00 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1300,7 +1300,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, for (i = 0; i < paths; i++) { - todo_wine { source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; source_name.header.size = sizeof(source_name); source_name.header.adapterId = pi[i].sourceInfo.adapterId; @@ -1309,7 +1308,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ret = pDisplayConfigGetDeviceInfo(&source_name.header); ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); - } todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;

1 0

Brendan Shanks : user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 27ed9c95a2bbdbf7d86309cf1b9c9fefc157a0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ed9c95a2bbdbf7d86309cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:23 2020 -0700 user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b2b3381dc..3ec6c54023 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,7 +4815,7 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { - FIXME("stub: %p\n", packet); + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; @@ -4825,6 +4825,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; @@ -4833,6 +4836,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: stub\n"); + if (packet->size < sizeof(*target_name)) return ERROR_INVALID_PARAMETER; @@ -4841,6 +4847,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: { DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: stub\n"); + if (packet->size < sizeof(*preferred_mode)) return ERROR_INVALID_PARAMETER; @@ -4849,6 +4858,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: { DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: stub\n"); + if (packet->size < sizeof(*adapter_name)) return ERROR_INVALID_PARAMETER;

1 0

Alex Henrie : ws2_32: Avoid depending on system getprotoby(name|number) functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a16f91ae366b9f3f8e371598e13f4ef242f50af3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16f91ae366b9f3f8e371598… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 15 01:19:04 2020 -0600 ws2_32: Avoid depending on system getprotoby(name|number) functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 - configure.ac | 2 - dlls/ws2_32/socket.c | 79 ++++++---------------------------- dlls/ws2_32/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 --- 5 files changed, 114 insertions(+), 75 deletions(-) diff --git a/configure b/configure index 24d0a1d8b4..35f8b63ae0 100755 --- a/configure +++ b/configure @@ -18332,8 +18332,6 @@ for ac_func in \ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ do : diff --git a/configure.ac b/configure.ac index d914e3eca8..928f8ebd1b 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..12126372d5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,23 +6534,14 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (_strnicmp( protocols[i].names[0], name, -1 )) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { @@ -6601,23 +6559,14 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..de5fe36d45 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,104 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +static void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +static void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +299,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } diff --git a/include/config.h.in b/include/config.h.in index 720cbd4a5d..3a3277e613 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -245,12 +245,6 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY -/* Define to 1 if you have the `getprotobyname' function. */ -#undef HAVE_GETPROTOBYNAME - -/* Define to 1 if you have the `getprotobynumber' function. */ -#undef HAVE_GETPROTOBYNUMBER - /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT

1 0

Jacek Caban : server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d2b0c10000ad53dbc0aa717b31f18f9078f35c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b0c10000ad53dbc0aa717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:56:09 2020 +0200 server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++--- server/console.c | 26 +------------------------- server/protocol.def | 2 -- server/request.h | 1 - server/trace.c | 1 - 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1176d9cbea..f50e6a213c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1833,7 +1833,7 @@ struct alloc_console_reply { struct reply_header __header; obj_handle_t handle_in; - obj_handle_t event; + char __pad_12[4]; }; @@ -1916,7 +1916,6 @@ struct set_console_input_info_reply { struct reply_header __header; }; -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 @@ -6452,7 +6451,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 628 +#define SERVER_PROTOCOL_VERSION 629 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 149a31dd57..3c562cb507 100644 --- a/server/console.c +++ b/server/console.c @@ -830,37 +830,13 @@ static int set_console_input_info( const struct set_console_input_info_request * struct condrv_renderer_event evt; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error; - if (console_input_is_bare(console) && - (req->mask & (SET_CONSOLE_INPUT_INFO_ACTIVE_SB| - SET_CONSOLE_INPUT_INFO_WIN))) + if (console_input_is_bare(console) && (req->mask & SET_CONSOLE_INPUT_INFO_WIN)) { set_error( STATUS_UNSUCCESSFUL ); goto error; } memset(&evt.u, 0, sizeof(evt.u)); - if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB) - { - struct screen_buffer *screen_buffer; - - screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->active_sb, - FILE_WRITE_PROPERTIES, &screen_buffer_ops ); - if (!screen_buffer || screen_buffer->input != console) - { - set_error( STATUS_INVALID_HANDLE ); - if (screen_buffer) release_object( screen_buffer ); - goto error; - } - - if (screen_buffer != console->active) - { - if (console->active) release_object( console->active ); - console->active = screen_buffer; - generate_sb_initial_events( console ); - } - else - release_object( screen_buffer ); - } if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE) { WCHAR *new_title = NULL; diff --git a/server/protocol.def b/server/protocol.def index 4a59c32728..a121c371c1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1464,7 +1464,6 @@ enum server_fd_type int input_fd; /* if pid=-1 (bare console to current process), fd for input */ @REPLY obj_handle_t handle_in; /* handle to console input */ - obj_handle_t event; /* handle to renderer events change notification */ @END @@ -1515,7 +1514,6 @@ enum server_fd_type user_handle_t win; /* console window if backend supports it */ VARARG(title,unicode_str); /* console title */ @END -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 diff --git a/server/request.h b/server/request.h index 31ca632669..1ddf21496b 100644 --- a/server/request.h +++ b/server/request.h @@ -1116,7 +1116,6 @@ C_ASSERT( FIELD_OFFSET(struct alloc_console_request, pid) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_request, input_fd) == 24 ); C_ASSERT( sizeof(struct alloc_console_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 ); -C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, event) == 12 ); C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 ); diff --git a/server/trace.c b/server/trace.c index c3cfd7de12..21468abd73 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2033,7 +2033,6 @@ static void dump_alloc_console_request( const struct alloc_console_request *req static void dump_alloc_console_reply( const struct alloc_console_reply *req ) { fprintf( stderr, " handle_in=%04x", req->handle_in ); - fprintf( stderr, ", event=%04x", req->event ); } static void dump_free_console_request( const struct free_console_request *req )

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
83
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-commits July 2020