July 2021 - Wine-Commits - list.winehq.org

Huw Davies : iphlpapi: Implement if_indextoname() using the ConvertInterface* functions.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 84a51219b538923df8aca1f2b9fbaac3de1c2bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a51219b538923df8aca1f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:35 2021 +0100 iphlpapi: Implement if_indextoname() using the ConvertInterface* functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aaa6a80c19e..8540b594e53 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3374,11 +3374,19 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) /****************************************************************** * if_indextoname (IPHLPAPI.@) */ -PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) { - TRACE("(%u, %p)\n", index, name); + NET_LUID luid; + DWORD err; + + TRACE( "(%u, %p)\n", index, name ); + + err = ConvertInterfaceIndexToLuid( index, &luid ); + if (err) return NULL; - return getInterfaceNameByIndex(index, name); + err = ConvertInterfaceLuidToNameA( &luid, name, IF_MAX_STRING_SIZE ); + if (err) return NULL; + return name; } /******************************************************************

1 0

Tag wine-6.12 : Alexandre Julliard : Release 6.12
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: refs/tags/wine-6.12 Tag: e78e2e92dc221332c3627b4a8a3e4583cc6e2701 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e78e2e92dc221332c3627b4a8a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:45:02 2021 +0200 Release 6.12

1 0

Jacek Caban : gdi32: Introduce NtGdiSelectBrush.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 966663a1d2af3d0f207b68caf41b8c9c122cb6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966663a1d2af3d0f207b68ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:47 2021 +0200 gdi32: Introduce NtGdiSelectBrush. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 4f968a048ce..acb0e67199a 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -417,19 +417,15 @@ BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) /*********************************************************************** - * BRUSH_SelectObject + * NtGdiSelectBrush (win32u.@) */ -static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectBrush( HDC hdc, HGDIOBJ handle ) { BRUSHOBJ *brush; HGDIOBJ ret = 0; - DC *dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + if (!(dc = get_dc_ptr( hdc ))) return 0; if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { @@ -457,6 +453,17 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) } +/*********************************************************************** + * BRUSH_SelectObject + */ +static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret = NtGdiSelectBrush( hdc, handle ); + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} + + /*********************************************************************** * BRUSH_DeleteObject */

1 0

Huw Davies : iphlpapi: Use ConvertInterfaceIndexToLuid() where possible.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 7bdd9894f43be40bfa6654c1a18f3c8ddbafd616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdd9894f43be40bfa6654c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:33 2021 +0100 iphlpapi: Use ConvertInterfaceIndexToLuid() where possible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7b104330ba7..a774e60c3d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1052,8 +1052,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); - aa->Luid.Info.NetLuidIndex = index; - aa->Luid.Info.IfType = aa->IfType; + ConvertInterfaceIndexToLuid( index, &aa->Luid ); if (output_gateways && num_v4_gateways) { @@ -1796,10 +1795,8 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) if ((ret = getInterfaceStatsByName( name, &row ))) return ret; memset( row2, 0, sizeof(*row2) ); - row2->InterfaceLuid.Info.Reserved = 0; - row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; - row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; + ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu;

1 0

Zhiyi Zhang : uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 064dad234295c2f5a2b95017dc280cac06afd614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064dad234295c2f5a2b95017… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:49 2021 +0800 uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/msg.h | 409 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 138 ++++++++++++++- 2 files changed, 545 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=064dad234295c2f5a2b9…

1 0

Zhiyi Zhang : uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: fe257dde58f03fe1fc9705caf24edbe16df7a1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe257dde58f03fe1fc9705ca… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:59 2021 +0800 uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51348 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 33e407fdf82..b18794740a8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -698,7 +698,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 38cccb3ec6f..7f2e6d04aa4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -233,8 +233,8 @@ static void test_SetWindowTheme(void) } DispatchMessageA(&msg); } - ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); - ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", FALSE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", FALSE); DestroyWindow(hWnd); UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0));

1 0

Jacek Caban : gdi32: Directly use ntgdi interface to select objects.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: dc73184c299a2998f9f2cc78a8056a9576b59946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc73184c299a2998f9f2cc78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:41:27 2021 +0200 gdi32: Directly use ntgdi interface to select objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 30 +++++++++++++++--------------- dlls/gdi32/dc.c | 26 +++++++++++++------------- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/font.c | 16 ++++++++-------- dlls/gdi32/painting.c | 8 ++++---- 5 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc73184c299a2998f9f2…

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_DONTFRAGMENT) implementation to ntdll.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 42e0155f5050b05c39dd7ed7f15016f5e9d47059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42e0155f5050b05c39dd7ed7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 1 17:10:28 2021 -0500 ws2_32: Move the setsockopt(IP_DONTFRAGMENT) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 19 +++++++++++++++++++ dlls/ws2_32/socket.c | 6 ++++-- include/wine/afd.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f9f701f734c..3f2dfe7c1f2 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1717,6 +1717,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT: +#ifdef IP_DONTFRAG + return do_setsockopt( handle, io, IPPROTO_IP, IP_DONTFRAG, in_buffer, in_size ); +#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) + { + int value = *(DWORD *)in_buffer ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; + + return do_setsockopt( handle, io, IPPROTO_IP, IP_MTU_DISCOVER, &value, sizeof(value) ); + } +#else + { + static int once; + + if (!once++) + FIXME( "IP_DONTFRAGMENT is not supported on this platform\n" ); + return STATUS_SUCCESS; /* fake success */ + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 963d55ead2c..10e79d3f8ff 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3634,6 +3634,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_BLOCK_SOURCE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE, optval, optlen ); + case WS_IP_DONTFRAGMENT: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT, optval, optlen ); + case WS_IP_DROP_SOURCE_MEMBERSHIP: case WS_IP_UNBLOCK_SOURCE: { @@ -3666,8 +3669,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif convert_sockopt(&level, &optname); break; - case WS_IP_DONTFRAGMENT: - return set_dont_fragment(s, IPPROTO_IP, *(BOOL *)optval) ? 0 : SOCKET_ERROR; + default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR; diff --git a/include/wine/afd.h b/include/wine/afd.h index 13ede0d2450..5b4114f4d77 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -185,6 +185,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP WINE_AFD_IOC(240) #define IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE WINE_AFD_IOC(241) #define IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT WINE_AFD_IOC(242) +#define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243) struct afd_create_params {

1 0

Zhiyi Zhang : winecfg: Don't convert font height to points when saving system font metrics.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 5cebefc24fe9dd944fd8656fd1b160d51bf7ec80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cebefc24fe9dd944fd8656f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:38:31 2021 +0800 winecfg: Don't convert font height to points when saving system font metrics. Fix tooltip font size becomes smaller after clicking the apply button in Desktop Integration tab. For example, the original non-client area tooltip font lfHeight is -11. 11 pixels is 8 points in 96 DPI. Setting font size to 8 points to SPI_SETNONCLIENTMETRICS will make SPI_GETNONCLIENTMETRICS report lfHeight as 8. With lfHeight being 8, CreateFontIndirectW() creates a smaller font. This behavior is added by 5b8fdb9. I assume the intention was to save font size in a DPI-independent way. However, when lfHeight is negative, lfHeight will still be scaled back to 96 DPI before saving it to registry and scaled to system DPI when it's read from registry. So I think converting to points is unnecessary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 687ea571311..e204a911516 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1035,12 +1035,6 @@ static void apply_sysparams(void) ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; - ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); - ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); - ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); - ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); - ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);

1 0

Jacek Caban : gdi32: Introduce NtGdiSelectBitmap.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 30550d2e6da6d0a166e65372acb3c4d537834a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30550d2e6da6d0a166e65372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:34 2021 +0200 gdi32: Introduce NtGdiSelectBitmap. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 15 ++++++++++++--- dlls/gdi32/dib.c | 54 +---------------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index bb1d7d4eebd..3d2c2e365e1 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -423,9 +423,9 @@ LONG WINAPI SetBitmapBits( /*********************************************************************** - * BITMAP_SelectObject + * NtGdiSelectBitmap (win32u.@) */ -static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) { HGDIOBJ ret; BITMAPOBJ *bitmap; @@ -456,7 +456,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->dib.dsBm.bmBitsPixel != 1 && + if (!is_bitmapobj_dib( bitmap ) && + bitmap->dib.dsBm.bmBitsPixel != 1 && bitmap->dib.dsBm.bmBitsPixel != GetDeviceCaps( hdc, BITSPIXEL )) { WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); @@ -491,6 +492,14 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) return ret; } +/*********************************************************************** + * BITMAP_SelectObject + */ +static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + return NtGdiSelectBitmap( hdc, handle ); +} + /*********************************************************************** * BITMAP_DeleteObject diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2e55579fb6e..fdd7c9bcfbc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1722,59 +1722,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *des */ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) { - HGDIOBJ ret; - BITMAPOBJ *bitmap; - DC *dc; - PHYSDEV physdev; - - if (!(dc = get_dc_ptr( hdc ))) return 0; - - if (GetObjectType( hdc ) != OBJ_MEMDC) - { - ret = 0; - goto done; - } - ret = dc->hBitmap; - if (handle == dc->hBitmap) goto done; /* nothing to do */ - - if (!(bitmap = GDI_GetObjPtr( handle, OBJ_BITMAP ))) - { - ret = 0; - goto done; - } - - if (GDI_get_ref_count( handle )) - { - WARN( "Bitmap already selected in another DC\n" ); - GDI_ReleaseObj( handle ); - ret = 0; - goto done; - } - - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if (!physdev->funcs->pSelectBitmap( physdev, handle )) - { - GDI_ReleaseObj( handle ); - ret = 0; - } - else - { - dc->hBitmap = handle; - GDI_inc_ref_count( handle ); - dc->dirty = 0; - dc->vis_rect.left = 0; - dc->vis_rect.top = 0; - dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; - dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; - dc->device_rect = dc->vis_rect; - GDI_ReleaseObj( handle ); - DC_InitDC( dc ); - GDI_dec_ref_count( ret ); - } - - done: - release_dc_ptr( dc ); - return ret; + return NtGdiSelectBitmap( hdc, handle ); }

1 0