November 2021 - Wine-commits

Gabriel Ivăncescu : nsiproxy: Fill the reply when it's not pending on the unix-side.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 5cd42975c370504e89261745f19b9839f588912e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cd42975c370504e89261745… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:03 2021 +0200 nsiproxy: Fill the reply when it's not pending on the unix-side. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 8 ++------ dlls/nsiproxy.sys/icmp_echo.c | 2 +- dlls/nsiproxy.sys/nsiproxy_private.h | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 90a7a3ded7c..dd082820b78 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -353,13 +353,13 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; NTSTATUS status; TRACE( "\n" ); params.request = in->data + ((in->opt_size + 3) & ~3); params.request_size = in->req_size; + params.reply = irp->AssociatedIrp.SystemBuffer; params.ttl = in->ttl; params.tos = in->tos; params.dst = &in->dst; @@ -371,11 +371,7 @@ static void handle_queued_send_echo( IRP *irp ) { irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) - { - memset( reply, 0, sizeof(*reply) ); - reply->status = params.ip_status; - irp->IoStatus.Information = sizeof(*reply); - } + irp->IoStatus.Information = params.reply_len; IoCompleteRequest( irp, IO_NO_INCREMENT ); } else diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index a4ef02a4a10..a9bdb8251f5 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -586,7 +586,7 @@ NTSTATUS icmp_send_echo( void *args ) { TRACE( "sendto() rets %d errno %d\n", ret, errno ); icmp_data_free( data ); - params->ip_status = errno_to_ip_status( errno ); + params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->reply ); return STATUS_SUCCESS; } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 91dd393e41e..8a9f2dd1a55 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -28,9 +28,8 @@ struct icmp_listen_params struct icmp_send_echo_params { SOCKADDR_INET *dst; - void *request; - DWORD request_size; + void *request, *reply; + DWORD request_size, reply_len; BYTE ttl, tos; HANDLE handle; - ULONG ip_status; };

1 0

Gabriel Ivăncescu : nsiproxy: Use a context and fill the reply using a family op.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 2b13a6be44d5b7586bb57f3fa6414f4e31292f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b13a6be44d5b7586bb57f3f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:04 2021 +0200 nsiproxy: Use a context and fill the reply using a family op. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 132 ++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b13a6be44d5b7586bb5…

1 0

Gabriel Ivăncescu : nsiproxy: Fill the reply with the exact ICMP_ECHO_REPLY in the output buffer.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 215c9275a891e767293fc24878548ad18f2b9783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=215c9275a891e767293fc248… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:05 2021 +0200 nsiproxy: Fill the reply with the exact ICMP_ECHO_REPLY in the output buffer. Because iphlpapi has no opportunity to convert the reply in async mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 44 ++--------------- dlls/nsiproxy.sys/device.c | 12 ++++- dlls/nsiproxy.sys/icmp_echo.c | 93 ++++++++++++++++++++++++------------ dlls/nsiproxy.sys/nsiproxy_private.h | 42 +++++++++++++++- include/wine/nsi.h | 21 +------- 5 files changed, 120 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=215c9275a891e767293f…

1 0

Gabriel Ivăncescu : iphlpapi: Implement async requests for IcmpSendEcho2Ex.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 5cc085975f8836d6092c9ca470b11b9453dd3085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc085975f8836d6092c9ca4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 8 18:18:06 2021 +0200 iphlpapi: Implement async requests for IcmpSendEcho2Ex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 19 ++-- dlls/iphlpapi/tests/iphlpapi.c | 248 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc085975f8836d6092c…

1 0

Dmitry Timoshkov : ole32: Add CreateObjrefMoniker() stub implementation..
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 21cf2dd15fa37b866fbf020e20e7f64be7c44f7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=21cf2dd15fa37b866fbf020e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 22 10:48:29 2021 +0300 ole32: Add CreateObjrefMoniker() stub implementation.. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.h | 4 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_objidl.idl | 6 + dlls/ole32/oleproxy.c | 13 ++ dlls/ole32/pointermoniker.c | 418 +++++++++++++++++++++++++++++++++++++++++++- dlls/ole32/tests/moniker.c | 249 +++++++++++++++++++++++++- include/objidl.idl | 5 +- 7 files changed, 691 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21cf2dd15fa37b866fbf…

1 0

Florian Will : win32u: Only retrieve the dc size if needed.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 6dfad4c2fb238620296942ec57171136f8db4ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dfad4c2fb238620296942ec… Author: Florian Will <florian.will(a)gmail.com> Date: Fri Nov 26 09:20:26 2021 +0000 win32u: Only retrieve the dc size if needed. SetMapMode(.., MM_TEXT) is called a lot in common gdiplus use cases via gdi_transform_acquire(). Querying the size and resolution can be expensive, so skip it when its not needed. When running the "ZusiDisplay" ET423 diagnostic display, which uses gdiplus heavily, this change increases the "indicator blinking speed" from 0.6 per second to 1 per second and probably hits the FPS limit now. Also, CPU usage of the ZusiDisplay.exe process goes down from ~75% to ~42% of one core according to "top", and wineserver CPU usage goes down from ~48% to ~3%. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/mapping.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/mapping.c b/dlls/win32u/mapping.c index 6c20f50a302..6e7c42fe7cc 100644 --- a/dlls/win32u/mapping.c +++ b/dlls/win32u/mapping.c @@ -117,8 +117,6 @@ BOOL set_map_mode( DC *dc, int mode ) if (mode == dc->attr->map_mode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return TRUE; - virtual_size = get_dc_virtual_size( dc ); - virtual_res = get_dc_virtual_res( dc ); switch (mode) { case MM_TEXT: @@ -129,30 +127,40 @@ BOOL set_map_mode( DC *dc, int mode ) break; case MM_LOMETRIC: case MM_ISOTROPIC: + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); dc->attr->wnd_ext.cx = virtual_size.cx * 10; dc->attr->wnd_ext.cy = virtual_size.cy * 10; dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_HIMETRIC: + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); dc->attr->wnd_ext.cx = virtual_size.cx * 100; dc->attr->wnd_ext.cy = virtual_size.cy * 100; dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_LOENGLISH: + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); dc->attr->wnd_ext.cx = muldiv(1000, virtual_size.cx, 254); dc->attr->wnd_ext.cy = muldiv(1000, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_HIENGLISH: + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); dc->attr->wnd_ext.cx = muldiv(10000, virtual_size.cx, 254); dc->attr->wnd_ext.cy = muldiv(10000, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_TWIPS: + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); dc->attr->wnd_ext.cx = muldiv(14400, virtual_size.cx, 254); dc->attr->wnd_ext.cy = muldiv(14400, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx;

1 0

Alexandre Julliard : mountmgr: Return a Unix file name in the IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE request.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: c210a0e607e0508f9ba76a5da94c9f8d53bc5a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c210a0e607e0508f9ba76a5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 17:53:41 2021 +0100 mountmgr: Return a Unix file name in the IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 44 ++++++++++++++++--------------- dlls/mountmgr.sys/cred.c | 62 +++++++++----------------------------------- dlls/mountmgr.sys/mountmgr.c | 3 +-- 3 files changed, 36 insertions(+), 73 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 7d0d45b3a5a..50ae32bc826 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1236,39 +1236,41 @@ static const WCHAR dsym_subpath[] = L"'\\Contents\\Resources\\DWARF\\"; static WCHAR *query_dsym(const GUID *uuid, const WCHAR *filename) { - MOUNTMGR_TARGET_NAME *query; - WCHAR *ret = NULL; - char buf[1024]; + WCHAR *dos_name = NULL, *ret = NULL; + ULONG size = 1024; HANDLE mgr; - BOOL res; mgr = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (mgr == INVALID_HANDLE_VALUE) return NULL; - query = (void *)buf; - res = DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE, (void*)uuid, sizeof(*uuid), query, sizeof(buf), NULL, NULL ); - if (!res && GetLastError() == ERROR_MORE_DATA) + for (;;) { - size_t size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[query->DeviceNameLength]); - query = HeapAlloc(GetProcessHeap(), 0, size); - if (query) - res = DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE, (void*)uuid, sizeof(*uuid), query, size, NULL, NULL ); + char *buf = malloc( size ); + if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE, (void*)uuid, sizeof(*uuid), + buf, size, NULL, NULL )) + { + dos_name = wine_get_dos_file_name( buf ); + free( buf ); + break; + } + free( buf ); + if (GetLastError() != ERROR_MORE_DATA) break; + size *= 2; } + CloseHandle(mgr); - if (res && (ret = HeapAlloc(GetProcessHeap(), 0, - query->DeviceNameLength + sizeof(dsym_subpath) + lstrlenW(filename) * sizeof(WCHAR)))) + if (!dos_name) return NULL; + + if ((ret = HeapAlloc( GetProcessHeap(), 0, + sizeof(dsym_subpath) + (lstrlenW(dos_name) + lstrlenW(filename)) * sizeof(WCHAR)))) { - WCHAR *p = ret; - memcpy(p, query->DeviceName, query->DeviceNameLength); - p += query->DeviceNameLength / sizeof(WCHAR); - memcpy(p, dsym_subpath, sizeof(dsym_subpath)); - p += ARRAY_SIZE(dsym_subpath) - 1; - lstrcpyW(p, filename); + wcscpy( ret, dos_name ); + wcscat( ret, dsym_subpath ); + wcscat( ret, filename ); } - - if (query != (void *)buf) HeapFree(GetProcessHeap(), 0, query); + HeapFree( GetProcessHeap(), 0, dos_name ); return ret; } diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 8b7ad0f53df..22919341b5a 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -46,29 +46,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); /* implementation of Wine extension to use host APIs to find symbol file by GUID */ NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) { - MOUNTMGR_TARGET_NAME *result; + char *result = buff; CFStringRef query_cfstring; - WCHAR *filename, *unix_buf = NULL; - ANSI_STRING unix_path; - UNICODE_STRING path; MDQueryRef mdquery; - const GUID *id; - size_t size; + const GUID *id = buff; NTSTATUS status = STATUS_NO_MEMORY; - static const WCHAR formatW[] = { 'c','o','m','_','a','p','p','l','e','_','x','c','o','d','e', - '_','d','s','y','m','_','u','u','i','d','s',' ','=','=',' ', - '"','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','"',0 }; - WCHAR query_string[ARRAY_SIZE(formatW)]; - - id = buff; - sprintfW( query_string, formatW, id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - if (!(query_cfstring = CFStringCreateWithCharacters(NULL, query_string, lstrlenW(query_string)))) + if (!(query_cfstring = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, + CFSTR("com_apple_xcode_dsym_uuids == \"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X\""), + id->Data1, id->Data2, id->Data3, id->Data4[0], + id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], + id->Data4[5], id->Data4[6], id->Data4[7] ))) return STATUS_NO_MEMORY; mdquery = MDQueryCreate(NULL, query_cfstring, NULL, NULL); @@ -76,7 +64,6 @@ NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info if (!mdquery) return STATUS_NO_MEMORY; MDQuerySetMaxCount(mdquery, 1); - TRACE("Executing %s\n", debugstr_w(query_string)); if (MDQueryExecute(mdquery, kMDQuerySynchronous)) { if (MDQueryGetResultCount(mdquery) >= 1) @@ -86,44 +73,19 @@ NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info if (item_path) { - CFIndex item_path_len = CFStringGetLength(item_path); - if ((unix_buf = HeapAlloc(GetProcessHeap(), 0, (item_path_len + 1) * sizeof(WCHAR)))) + if (CFStringGetCString( item_path, result, outsize, kCFStringEncodingUTF8 )) { - CFStringGetCharacters(item_path, CFRangeMake(0, item_path_len), unix_buf); - unix_buf[item_path_len] = 0; - TRACE("found %s\n", debugstr_w(unix_buf)); + *info = strlen( result ) + 1; + status = STATUS_SUCCESS; + TRACE("found %s\n", debugstr_a(result)); } + else status = STATUS_BUFFER_OVERFLOW; CFRelease(item_path); } } else status = STATUS_NO_MORE_ENTRIES; } CFRelease(mdquery); - if (!unix_buf) return status; - - RtlInitUnicodeString( &path, unix_buf ); - status = RtlUnicodeStringToAnsiString( &unix_path, &path, TRUE ); - HeapFree( GetProcessHeap(), 0, unix_buf ); - if (status) return status; - - filename = wine_get_dos_file_name( unix_path.Buffer ); - RtlFreeAnsiString( &unix_path ); - if (!filename) return STATUS_NO_SUCH_FILE; - result = buff; - result->DeviceNameLength = lstrlenW(filename) * sizeof(WCHAR); - size = FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName[lstrlenW(filename)]); - if (size <= outsize) - { - memcpy( result->DeviceName, filename, lstrlenW(filename) * sizeof(WCHAR) ); - *info = size; - status = STATUS_SUCCESS; - } - else - { - *info = sizeof(*result); - status = STATUS_BUFFER_OVERFLOW; - } - RtlFreeHeap( GetProcessHeap(), 0, filename ); return status; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 0869e96766a..31ad073d8c7 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -512,8 +512,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_NO_MEMORY; break; case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: - if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(GUID) - || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTMGR_TARGET_NAME)) + if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(GUID)) { status = STATUS_INVALID_PARAMETER; break;

1 0

Alexandre Julliard : mountmgr: Move the DBus support to the Unix library.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 95615a4afbac69b171d54533a4494e43f7811b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95615a4afbac69b171d54533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 15:38:17 2021 +0100 mountmgr: Move the DBus support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 132 +++++++++++++++++++++---------------------- dlls/mountmgr.sys/mountmgr.c | 50 +++++++++++++++- dlls/mountmgr.sys/mountmgr.h | 3 +- dlls/mountmgr.sys/unixlib.c | 67 ++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 55 ++++++++++++++++++ 5 files changed, 237 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95615a4afbac69b171d5…

1 0

Zhiyi Zhang : explorerframe: Implement taskbar_list_DeleteTab() for x11 driver.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: d9b1df267a7e91efdba9cb2bdd2d3a7148ca88e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b1df267a7e91efdba9cb2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:35 2021 +0800 explorerframe: Implement taskbar_list_DeleteTab() for x11 driver. Partially fix Excel 2007 and 2010 showing an extra taskbar icon when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 7 +++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 26 ++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 6f24f359927..839ae210daa 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); +#define WM_WINE_DELETE_TAB (WM_USER + 1) + struct taskbar_list { ITaskbarList4 ITaskbarList4_iface; @@ -103,9 +105,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_DELETE_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index ed1bc44a6ac..9b2de996000 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -55,7 +55,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Call ITaskbarList::HrInit() */ @@ -88,7 +87,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::SetActiveAlt() */ @@ -116,7 +114,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::ActivateTab() */ @@ -144,21 +141,17 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::DeleteTab() */ /* Check invalid parameters */ hr = ITaskbarList_DeleteTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::DeleteTab() */ @@ -167,7 +160,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ref_count = ITaskbarList_Release(taskbarlist); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bcb0b8044bc..f3891fdd080 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,9 +994,9 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1858,6 +1858,7 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER +#define WM_WINE_DELETE_TAB (WM_USER + 1) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1877,6 +1878,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_WINE_DELETE_TAB: + SendNotifyMessageW( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2777,6 +2781,21 @@ done: return ret; } +/* Delete a window from taskbar */ +static void taskbar_delete_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->skip_taskbar = TRUE; + update_net_wm_states( data ); + release_win_data( data ); +} /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) @@ -2813,6 +2832,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); + case WM_X11DRV_DELETE_TAB: + taskbar_delete_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4b4ee8daaeb..6a38fc5a20e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -584,7 +584,8 @@ enum x11drv_window_messages WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, - WM_X11DRV_CLIP_CURSOR_REQUEST + WM_X11DRV_CLIP_CURSOR_REQUEST, + WM_X11DRV_DELETE_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -619,6 +620,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Zhiyi Zhang : explorerframe: Implement taskbar_list_AddTab() for x11 driver.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 1c1fe30cc50da2b0596096b04b75d8c1e598f8e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c1fe30cc50da2b0596096b0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:44 2021 +0800 explorerframe: Implement taskbar_list_AddTab() for x11 driver. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 6 ++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 36 ++++++++++++++++++++++++++++++---- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 839ae210daa..7e1f5b92c5b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) struct taskbar_list { @@ -98,9 +99,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList4 *iface) static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_ADD_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index 9b2de996000..5f5cc98c5b4 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -43,7 +43,6 @@ static void test_ITaskbarList(void) /* Test calling methods before calling ITaskbarList::HrInit() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -69,21 +68,17 @@ static void test_ITaskbarList(void) /* Test ITaskbarList::AddTab() */ /* Check invalid parameters */ hr = ITaskbarList_AddTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::AddTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Repeat ITaskbarList::AddTab() with the same hwnd */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); @@ -101,7 +96,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::SetActiveAlt() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -128,7 +122,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::ActivateTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); @@ -156,7 +149,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::DeleteTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f3891fdd080..b4b7357f245 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,10 +994,13 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + if (!data->add_taskbar) + { + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + } if (!data->mapped) /* set the _NET_WM_STATE atom directly */ { @@ -1859,6 +1862,7 @@ static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1881,6 +1885,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, case WM_WINE_DELETE_TAB: SendNotifyMessageW( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); break; + case WM_WINE_ADD_TAB: + SendNotifyMessageW( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2781,6 +2788,23 @@ done: return ret; } +/* Add a window to taskbar */ +static void taskbar_add_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->add_taskbar = TRUE; + data->skip_taskbar = FALSE; + update_net_wm_states( data ); + release_win_data( data ); +} + /* Delete a window from taskbar */ static void taskbar_delete_tab( HWND hwnd ) { @@ -2793,6 +2817,7 @@ static void taskbar_delete_tab( HWND hwnd ) return; data->skip_taskbar = TRUE; + data->add_taskbar = FALSE; update_net_wm_states( data ); release_win_data( data ); } @@ -2835,6 +2860,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_DELETE_TAB: taskbar_delete_tab( hwnd ); return 0; + case WM_X11DRV_ADD_TAB: + taskbar_add_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6a38fc5a20e..d678d93905d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,7 +585,8 @@ enum x11drv_window_messages WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST, - WM_X11DRV_DELETE_TAB + WM_X11DRV_DELETE_TAB, + WM_X11DRV_ADD_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -621,6 +622,7 @@ struct x11drv_win_data BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ + BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0