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

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

July 10, 2021

Module: wine Branch: master Commit: 38a6ac7a3255a15fa71a1fe1b83e26babcef158a URL: https://source.winehq.org/git/wine.git/?a=commit;h=38a6ac7a3255a15fa71a1fe1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:40 2021 -0500 ws2_32: Move the setsockopt(IP_PKTINFO) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 ++++++ dlls/ws2_32/socket.c | 6 +++--- include/wine/afd.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f862aa3e21b..a727841e917 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1773,9 +1773,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_PKTINFO case IOCTL_AFD_WINE_GET_IP_PKTINFO: return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_PKTINFO: + return do_setsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, in_buffer, in_size ); #elif defined(IP_RECVDSTADDR) case IOCTL_AFD_WINE_GET_IP_PKTINFO: return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_PKTINFO: + return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1cd1934a11e..37f72c9d62e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3666,6 +3666,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_OPTIONS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_OPTIONS, optval, optlen ); + case WS_IP_PKTINFO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_PKTINFO, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3679,9 +3682,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } -#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) - case WS_IP_PKTINFO: -#endif case WS_IP_TOS: case WS_IP_TTL: #ifdef IP_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 3522e2444f5..fde0fe6db94 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -199,6 +199,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254) #define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255) #define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) +#define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257) struct afd_create_params {

1 0

Jacek Caban : gdi32: Use NtGdiCreateClientObj for enhmetafile objects.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: e33bdb87493ce2a55ec5e2a0884074d0ca7e26ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=e33bdb87493ce2a55ec5e2a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 9 15:28:51 2021 +0200 gdi32: Use NtGdiCreateClientObj for enhmetafile 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/enhmetafile.c | 49 +++++++++++++++++++++++++++++++++------------ dlls/gdi32/tests/metafile.c | 10 +++++++++ 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 75db4cb24fb..1053a2ea104 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -41,13 +41,23 @@ #include "winnls.h" #include "winerror.h" #include "ntgdi_private.h" +#include "gdi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); + +static CRITICAL_SECTION enhmetafile_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &enhmetafile_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": enhmetafile_cs") } +}; +static CRITICAL_SECTION enhmetafile_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + typedef struct { - struct gdi_obj_header obj; ENHMETAHEADER *emh; BOOL on_disk; /* true if metafile is on disk */ } ENHMETAFILEOBJ; @@ -277,7 +287,9 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on metaObj->emh = emh; metaObj->on_disk = on_disk; - if (!(hmf = alloc_gdi_handle( &metaObj->obj, NTGDI_OBJ_ENHMETAFILE, NULL ))) + if ((hmf = NtGdiCreateClientObj( NTGDI_OBJ_ENHMETAFILE ))) + set_gdi_client_ptr( hmf, metaObj ); + else HeapFree( GetProcessHeap(), 0, metaObj ); return hmf; } @@ -287,15 +299,23 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on */ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) { - ENHMETAFILEOBJ *metaObj = free_gdi_handle( hmf ); + ENHMETAFILEOBJ *metafile; - if(!metaObj) return FALSE; + EnterCriticalSection( &enhmetafile_cs ); + if (!(metafile = get_gdi_client_ptr( hmf, NTGDI_OBJ_ENHMETAFILE )) || + !NtGdiDeleteClientObj( hmf )) + { + LeaveCriticalSection( &enhmetafile_cs ); + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } - if(metaObj->on_disk) - UnmapViewOfFile( metaObj->emh ); + if (metafile->on_disk) + UnmapViewOfFile( metafile->emh ); else - HeapFree( GetProcessHeap(), 0, metaObj->emh ); - HeapFree( GetProcessHeap(), 0, metaObj ); + HeapFree( GetProcessHeap(), 0, metafile->emh ); + HeapFree( GetProcessHeap(), 0, metafile ); + LeaveCriticalSection( &enhmetafile_cs ); return TRUE; } @@ -307,13 +327,16 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) static ENHMETAHEADER *EMF_GetEnhMetaHeader( HENHMETAFILE hmf ) { ENHMETAHEADER *ret = NULL; - ENHMETAFILEOBJ *metaObj = GDI_GetObjPtr( hmf, NTGDI_OBJ_ENHMETAFILE ); - TRACE("hmf %p -> enhmetaObj %p\n", hmf, metaObj); - if (metaObj) + ENHMETAFILEOBJ *metafile; + + EnterCriticalSection( &enhmetafile_cs ); + if ((metafile = get_gdi_client_ptr( hmf, NTGDI_OBJ_ENHMETAFILE ))) { - ret = metaObj->emh; - GDI_ReleaseObj( hmf ); + TRACE( "hmf %p -> enhmetafile %p\n", hmf, metafile ); + ret = metafile->emh; } + else SetLastError( ERROR_INVALID_HANDLE ); + LeaveCriticalSection( &enhmetafile_cs ); return ret; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 10c99304c74..574ccc3d98f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3137,6 +3137,16 @@ static void test_enhmetafile_file(void) ret = DeleteFileA(mf_name); ok(ret, "Could not delete file: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteEnhMetaFile(ULongToHandle(0xdeadbeef)); + ok(!ret, "DeleteEnhMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = GetEnhMetaFileBits(ULongToHandle(0xdeadbeef), 0, NULL); + ok(!size, "GetEnhMetaFileBitsEx returned %u\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } static void test_CopyMetaFile(void)

1 0

Jacek Caban : gdi32: Use NtGdiCreateClientObj for metafile objects.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: 3d8a8fc13268dd27c1a8e113c6f3dd2d3d14176a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8a8fc13268dd27c1a8e113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 9 15:28:39 2021 +0200 gdi32: Use NtGdiCreateClientObj for metafile 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/gdi_private.h | 28 +++++++++++++++ dlls/gdi32/gdiobj.c | 24 +++++++++++++ dlls/gdi32/metafile.c | 83 ++++++++++++++++++++++++++++----------------- dlls/gdi32/objects.c | 14 ++++++++ dlls/gdi32/tests/metafile.c | 10 ++++++ include/ntgdi.h | 1 + 6 files changed, 128 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h new file mode 100644 index 00000000000..db33f33110f --- /dev/null +++ b/dlls/gdi32/gdi_private.h @@ -0,0 +1,28 @@ +/* + * GDI definitions + * + * Copyright 1993 Alexandre Julliard + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_GDI_PRIVATE_H +#define __WINE_GDI_PRIVATE_H + +void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; +void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; + +#endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 40d67fb1b1f..9059f817636 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -952,6 +952,30 @@ BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) return TRUE; } +/*********************************************************************** + * NtGdiCreateClientObj (win32u.@) + */ +HANDLE WINAPI NtGdiCreateClientObj( ULONG type ) +{ + struct gdi_obj_header *obj; + HGDIOBJ handle; + + if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) + return 0; + + handle = alloc_gdi_handle( obj, type, NULL ); + if (!handle) HeapFree( GetProcessHeap(), 0, obj ); + return handle; +} + +/*********************************************************************** + * NtGdiDeleteClientObj (win32u.@) + */ +BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ) +{ + return NtGdiDeleteObjectApp( obj ); +} + /*********************************************************************** * GDI_hdc_using_object * diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index a4aa3d61508..1b31e40bc14 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -55,16 +55,21 @@ #include "winreg.h" #include "winnls.h" #include "winternl.h" +#include "gdi_private.h" #include "ntgdi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(metafile); -struct metafile + +static CRITICAL_SECTION metafile_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = { - struct gdi_obj_header obj; - METAHEADER *data; + 0, 0, &metafile_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": metafile_cs") } }; +static CRITICAL_SECTION metafile_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /****************************************************************** * MF_AddHandle @@ -96,13 +101,13 @@ static int MF_AddHandle(HANDLETABLE *ht, UINT htlen, HGDIOBJ hobj) */ HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) { - struct metafile *metafile; + HANDLE handle; - if (!(metafile = HeapAlloc(GetProcessHeap(), 0, sizeof(*metafile)))) - return NULL; - metafile->data = mh; + if (!(handle = NtGdiCreateClientObj( NTGDI_OBJ_METAFILE ))) + return 0; - return alloc_gdi_handle( &metafile->obj, NTGDI_OBJ_METAFILE, NULL ); + set_gdi_client_ptr( handle, mh ); + return handle; } /****************************************************************** @@ -134,12 +139,19 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { - struct metafile *metafile = free_gdi_handle( hmf ); + METAHEADER *data; + BOOL ret = FALSE; - if (!metafile) return FALSE; - HeapFree( GetProcessHeap(), 0, metafile->data ); - HeapFree( GetProcessHeap(), 0, metafile ); - return TRUE; + EnterCriticalSection( &metafile_cs ); + if ((data = get_gdi_client_ptr( hmf, NTGDI_OBJ_METAFILE ))) + { + ret = NtGdiDeleteClientObj( hmf ); + if (ret) HeapFree( GetProcessHeap(), 0, data ); + } + LeaveCriticalSection( &metafile_cs ); + + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; } /****************************************************************** @@ -237,14 +249,17 @@ HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename ) /* return a copy of the metafile bits, to be freed with HeapFree */ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) { - struct metafile *metafile = GDI_GetObjPtr( hmf, NTGDI_OBJ_METAFILE ); - METAHEADER *ret; + METAHEADER *ret = NULL, *metafile; - if (!metafile) return NULL; + EnterCriticalSection( &metafile_cs ); + if ((metafile = get_gdi_client_ptr( hmf, NTGDI_OBJ_METAFILE ))) + { + ret = HeapAlloc( GetProcessHeap(), 0, metafile->mtSize * 2 ); + if (ret) memcpy( ret, metafile, metafile->mtSize * 2 ); + } + else SetLastError( ERROR_INVALID_HANDLE ); + LeaveCriticalSection( &metafile_cs ); - ret = HeapAlloc( GetProcessHeap(), 0, metafile->data->mtSize * 2 ); - if (ret) memcpy( ret, metafile->data, metafile->data->mtSize * 2 ); - GDI_ReleaseObj( hmf ); return ret; } @@ -1033,24 +1048,28 @@ HMETAFILE WINAPI SetMetaFileBitsEx( UINT size, const BYTE *lpData ) * If _buf_ is zero, returns size of buffer required. Otherwise, * returns number of bytes copied. */ -UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) +UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT buf_size, void *buf ) { - struct metafile *metafile = GDI_GetObjPtr( hmf, NTGDI_OBJ_METAFILE ); - UINT mfSize; + METAHEADER *metafile; + UINT size = 0; - TRACE("(%p,%d,%p)\n", hmf, nSize, buf); + TRACE( "(%p,%d,%p)\n", hmf, buf_size, buf ); - if (!metafile) return 0; /* FIXME: error code */ - - mfSize = metafile->data->mtSize * 2; - if (buf) + EnterCriticalSection( &metafile_cs ); + if ((metafile = get_gdi_client_ptr( hmf, NTGDI_OBJ_METAFILE ))) { - if(mfSize > nSize) mfSize = nSize; - memmove(buf, metafile->data, mfSize); + size = metafile->mtSize * 2; + if (buf) + { + if(size > buf_size) size = buf_size; + memmove( buf, metafile, size ); + } } - GDI_ReleaseObj( hmf ); - TRACE("returning size %d\n", mfSize); - return mfSize; + else SetLastError( ERROR_INVALID_HANDLE ); + LeaveCriticalSection( &metafile_cs ); + + TRACE( "returning size %d\n", size ); + return size; } /****************************************************************** diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index bc2ecb917fb..63a79255224 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -65,6 +65,20 @@ static WORD get_object_type( HGDIOBJ obj ) return entry ? entry->ExtType : 0; } +void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) +{ + GDI_HANDLE_ENTRY *entry = handle_entry( obj ); + if (entry) entry->UserPointer = (UINT_PTR)ptr; +} + +void *get_gdi_client_ptr( HGDIOBJ obj, WORD type ) +{ + GDI_HANDLE_ENTRY *entry = handle_entry( obj ); + if (!entry || entry->ExtType != type || !entry->UserPointer) + return NULL; + return (void *)(UINT_PTR)entry->UserPointer; +} + /*********************************************************************** * GetObjectType (GDI32.@) */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 61e20072591..10c99304c74 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3042,6 +3042,16 @@ static void test_metafile_file(void) ret = DeleteFileA(mf_name); ok(ret, "Could not delete file: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteMetaFile(ULongToHandle(0xdeadbeef)); + ok(!ret, "DeleteMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = GetMetaFileBitsEx(ULongToHandle(0xdeadbeef), 0, NULL); + ok(!size, "GetMetaFileBitsEx returned %u\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } static void test_enhmetafile_file(void) diff --git a/include/ntgdi.h b/include/ntgdi.h index 7e8954468fb..d8adc327548 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -99,6 +99,7 @@ HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ); HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color ); +BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ); BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ); LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, DWORD func, BOOL inbound );

1 0

Jacek Caban : gdi32: Rename gdi_private.h to ntgdi_private.h.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: b0240461f11b3b1eeefb738a1316de786dea0331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0240461f11b3b1eeefb738a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 9 15:28:26 2021 +0200 gdi32: Rename gdi_private.h to ntgdi_private.h. 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/bidi.c | 2 +- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 2 +- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/dibdrv/opengl.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 2 +- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/icm.c | 2 +- dlls/gdi32/mapping.c | 2 +- dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/{gdi_private.h => ntgdi_private.h} | 6 +++--- dlls/gdi32/opengl.c | 2 +- dlls/gdi32/opentype.c | 2 +- dlls/gdi32/painting.c | 2 +- dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 2 +- dlls/gdi32/pen.c | 2 +- dlls/gdi32/printdrv.c | 2 +- dlls/gdi32/region.c | 2 +- dlls/gdi32/vulkan.c | 2 +- 37 files changed, 39 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0240461f11b3b1eeefb…

1 0

Hugh McMaster : reg/tests: Add registry view syntax tests for the 'import' operation.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: 49cde0995827b24aa9c1ef1b6a0372797f4166e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49cde0995827b24aa9c1ef1b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 9 21:30:19 2021 +1000 reg/tests: Add registry view syntax tests for the 'import' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/import.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 976dd381f07..ffc29d5cf1b 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -130,6 +130,15 @@ static void test_command_syntax(void) run_reg_exe("reg import a.reg b.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_import(void)

1 0

Biswapriyo Nath : include: Add some function declarations in propvarutil.h.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: 4f52e32205fc3cc3f09adf6d7ff961c36e3b1f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f52e32205fc3cc3f09adf6d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 9 19:30:42 2021 +0530 include: Add some function declarations in propvarutil.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 77 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index e0a21faf8c7..972cf48a019 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -74,6 +74,7 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); +HRESULT WINAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); @@ -92,8 +93,17 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); #ifdef __cplusplus HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar); -HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromInt16(SHORT nVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromUInt16(USHORT uiVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromInt32(LONG lVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromUInt32(ULONG ulVal, PROPVARIANT *ppropvar); HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromUInt64(ULONGLONG ullVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromDouble(DOUBLE dblVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromGUIDAsBuffer(REFGUID guid, PROPVARIANT *ppropvar); +BOOL IsPropVariantVector(REFPROPVARIANT propvar); +BOOL IsPropVariantString(REFPROPVARIANT propvar); #ifndef NO_PROPVAR_INLINES @@ -104,6 +114,55 @@ inline HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar) return S_OK; } +inline HRESULT InitPropVariantFromInt16(SHORT nVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_I2; + ppropvar->iVal = nVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromUInt16(USHORT uiVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_UI2; + ppropvar->uiVal = uiVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromInt32(LONG lVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_I4; + ppropvar->lVal = lVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromUInt32(ULONG ulVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_UI4; + ppropvar->ulVal = ulVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_I8; + ppropvar->hVal.QuadPart = llVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromUInt64(ULONGLONG ullVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_UI8; + ppropvar->uhVal.QuadPart = ullVal; + return S_OK; +} + +inline HRESULT InitPropVariantFromDouble(DOUBLE dblVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_R8; + ppropvar->dblVal = dblVal; + return S_OK; +} + inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) { HRESULT hres; @@ -117,11 +176,19 @@ inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) return hres; } -inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) +inline HRESULT InitPropVariantFromGUIDAsBuffer(REFGUID guid, PROPVARIANT *ppropvar) { - ppropvar->vt = VT_I8; - ppropvar->hVal.QuadPart = llVal; - return S_OK; + return InitPropVariantFromBuffer(guid, sizeof(GUID), ppropvar); +} + +inline BOOL IsPropVariantVector(REFPROPVARIANT propvar) +{ + return (propvar.vt & (VT_ARRAY | VT_VECTOR)); +} + +inline BOOL IsPropVariantString(REFPROPVARIANT propvar) +{ + return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } #endif /* NO_PROPVAR_INLINES */

1 0

Alexandre Julliard : server: Don't generate dll load event for native binaries on Wow64.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: 649f70aba7bf393d3983d56774d6b54ffe5ef65f URL: https://source.winehq.org/git/wine.git/?a=commit;h=649f70aba7bf393d3983d567… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 22:13:57 2021 +0200 server: Don't generate dll load event for native binaries on Wow64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 36 +++++++++++++++++++++++++++++++++++- server/mapping.c | 23 ++++++++++++++++------- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index fc541e0c69f..1a258ad69a6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -38,6 +38,7 @@ static int myARGC; static char** myARGV; +static BOOL is_wow64; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); @@ -51,6 +52,7 @@ static NTSTATUS (WINAPI *pDbgUiConnectToDbg)(void); static HANDLE (WINAPI *pDbgUiGetThreadDebugObject)(void); static void (WINAPI *pDbgUiSetThreadDebugObject)(HANDLE); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE,void*,WCHAR*,DWORD); +static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static LONG child_failures; @@ -905,11 +907,33 @@ static void doChild(int argc, char **argv) CloseHandle( map ); UnmapViewOfFile( mod ); + if (sizeof(void *) > sizeof(int)) + { + GetSystemWow64DirectoryW( path, MAX_PATH ); + wcscat( path, L"\\oleacc.dll" ); + } + else if (is_wow64) + { + wcscpy( path, L"c:\\windows\\sysnative\\oleacc.dll" ); + } + else goto done; + + file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + child_ok( file != INVALID_HANDLE_VALUE, "failed to open %s: %u\n", debugstr_w(path), GetLastError()); + map = CreateFileMappingW( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); + child_ok( map != NULL, "failed to create mapping %s: %u\n", debugstr_w(path), GetLastError() ); + mod = MapViewOfFile( map, FILE_MAP_READ, 0, 0, 0 ); + child_ok( mod != NULL, "failed to map %s: %u\n", debugstr_w(path), GetLastError() ); + CloseHandle( file ); + CloseHandle( map ); + UnmapViewOfFile( mod ); + +done: blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox), NULL); } -static HMODULE ole32_mod, oleaut32_mod; +static HMODULE ole32_mod, oleaut32_mod, oleacc_mod; static void check_dll_event( HANDLE process, DEBUG_EVENT *ev ) { @@ -925,10 +949,12 @@ static void check_dll_event( HANDLE process, DEBUG_EVENT *ev ) else p = module; if (!wcsicmp( p, L"ole32.dll" )) ole32_mod = ev->u.LoadDll.lpBaseOfDll; else if (!wcsicmp( p, L"oleaut32.dll" )) oleaut32_mod = ev->u.LoadDll.lpBaseOfDll; + else if (!wcsicmp( p, L"oleacc.dll" )) oleacc_mod = ev->u.LoadDll.lpBaseOfDll; break; case UNLOAD_DLL_DEBUG_EVENT: if (ev->u.UnloadDll.lpBaseOfDll == ole32_mod) ole32_mod = (HMODULE)1; if (ev->u.UnloadDll.lpBaseOfDll == oleaut32_mod) oleaut32_mod = (HMODULE)1; + if (ev->u.UnloadDll.lpBaseOfDll == oleacc_mod) oleacc_mod = (HMODULE)1; break; } } @@ -996,6 +1022,11 @@ static void test_debug_loop(int argc, char **argv) ok( ole32_mod == (HMODULE)1, "ole32.dll was not reported\n" ); ok( oleaut32_mod == (HMODULE)1, "oleaut32.dll was not reported\n" ); +#ifdef _WIN64 + ok( oleacc_mod == (HMODULE)1, "oleacc.dll was not reported\n" ); +#else + ok( oleacc_mod == NULL, "oleacc.dll was reported\n" ); +#endif ret = CloseHandle(pi.hThread); ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); @@ -2120,6 +2151,7 @@ START_TEST(debugger) hdll=GetModuleHandleA("kernel32.dll"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); + pIsWow64Process=(void*)GetProcAddress(hdll, "IsWow64Process"); pGetMappedFileNameW = (void*)GetProcAddress(hdll, "GetMappedFileNameW"); if (!pGetMappedFileNameW) pGetMappedFileNameW = (void*)GetProcAddress(LoadLibraryA("psapi.dll"), "GetMappedFileNameW"); @@ -2133,6 +2165,8 @@ START_TEST(debugger) pDbgUiGetThreadDebugObject = (void*)GetProcAddress(ntdll, "DbgUiGetThreadDebugObject"); pDbgUiSetThreadDebugObject = (void*)GetProcAddress(ntdll, "DbgUiSetThreadDebugObject"); + if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); + myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0) { diff --git a/server/mapping.c b/server/mapping.c index 2df337a172c..a4bb000268a 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -361,6 +361,16 @@ static void set_process_machine( struct process *process, struct memory_view *vi process->machine = machine; } +static int generate_dll_event( struct thread *thread, int code, struct memory_view *view ) +{ + unsigned short process_machine = thread->process->machine; + + if (!(view->flags & SEC_IMAGE)) return 0; + if (process_machine != native_machine && process_machine != view->image.machine) return 0; + generate_debug_event( thread, code, view ); + return 1; +} + /* add a view to the process list */ static void add_process_view( struct thread *thread, struct memory_view *view ) { @@ -370,7 +380,9 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) if (view->flags & SEC_IMAGE) { if (is_process_init_done( process )) - generate_debug_event( thread, DbgLoadDllStateChange, view ); + { + generate_dll_event( thread, DbgLoadDllStateChange, view ); + } else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ @@ -1016,9 +1028,7 @@ void generate_startup_debug_events( struct process *process ) while (ptr && (ptr = list_next( &process->views, ptr ))) { view = LIST_ENTRY( ptr, struct memory_view, entry ); - if (!(view->flags & SEC_IMAGE)) continue; - generate_debug_event( first_thread, DbgLoadDllStateChange, view ); - break; + if (generate_dll_event( first_thread, DbgLoadDllStateChange, view )) break; } /* generate creation events */ @@ -1032,8 +1042,7 @@ void generate_startup_debug_events( struct process *process ) while (ptr && (ptr = list_next( &process->views, ptr ))) { view = LIST_ENTRY( ptr, struct memory_view, entry ); - if (!(view->flags & SEC_IMAGE)) continue; - generate_debug_event( first_thread, DbgLoadDllStateChange, view ); + generate_dll_event( first_thread, DbgLoadDllStateChange, view ); } } @@ -1244,7 +1253,7 @@ DECL_HANDLER(unmap_view) struct memory_view *view = find_mapped_view( current->process, req->base ); if (!view) return; - if (view->flags & SEC_IMAGE) generate_debug_event( current, DbgUnloadDllStateChange, view ); + generate_dll_event( current, DbgUnloadDllStateChange, view ); free_memory_view( view ); }

1 0

Alexandre Julliard : ntdll: Use the 32-bit RtlUserThreadStart as initial Eip in the 32-bit context.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: 1ce08530c34b3760f8efe3f009efdb5cea8f1131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce08530c34b3760f8efe3f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 21:09:56 2021 +0200 ntdll: Use the 32-bit RtlUserThreadStart as initial Eip in the 32-bit context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4deeec37abb..6b668508d80 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2930,7 +2930,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B wow_context->Eax = (ULONG_PTR)entry; wow_context->Ebx = (ULONG_PTR)arg; wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; - wow_context->Eip = (ULONG_PTR)pRtlUserThreadStart; + wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; wow_context->SegCs = cs32_sel; wow_context->SegDs = context.SegDs; wow_context->SegEs = context.SegEs;

1 0

Huw Davies : iphlpapi: Implement GetIfTable() on top of nsi.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: e93053c344a7c467702e1e1cdc6274e282b5a6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93053c344a7c467702e1e1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 9 09:09:25 2021 +0100 iphlpapi: Implement GetIfTable() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 131 ++++++++++++++++++++++------------------- dlls/iphlpapi/tests/iphlpapi.c | 16 +++++ 2 files changed, 87 insertions(+), 60 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff534afa0f9..e5b6e72bde1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1775,6 +1775,38 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ); + +static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, + struct nsi_ndis_ifinfo_static *stat ) +{ + if_counted_string_copy( row->wszName, ARRAY_SIZE(row->wszName), &rw->alias ); + row->dwIndex = stat->if_index; + row->dwType = stat->type; + row->dwMtu = dyn->mtu; + row->dwSpeed = dyn->rcv_speed; + row->dwPhysAddrLen = rw->phys_addr.Length; + if (row->dwPhysAddrLen > sizeof(row->bPhysAddr)) row->dwPhysAddrLen = 0; + memcpy( row->bPhysAddr, rw->phys_addr.Address, row->dwPhysAddrLen ); + row->dwAdminStatus = rw->admin_status; + row->dwOperStatus = (dyn->oper_status == IfOperStatusUp) ? MIB_IF_OPER_STATUS_OPERATIONAL : MIB_IF_OPER_STATUS_NON_OPERATIONAL; + row->dwLastChange = 0; + row->dwInOctets = dyn->in_octets; + row->dwInUcastPkts = dyn->in_ucast_pkts; + row->dwInNUcastPkts = dyn->in_bcast_pkts + dyn->in_mcast_pkts; + row->dwInDiscards = dyn->in_discards; + row->dwInErrors = dyn->in_errors; + row->dwInUnknownProtos = 0; + row->dwOutOctets = dyn->out_octets; + row->dwOutUcastPkts = dyn->out_ucast_pkts; + row->dwOutNUcastPkts = dyn->out_bcast_pkts + dyn->out_mcast_pkts; + row->dwOutDiscards = dyn->out_discards; + row->dwOutErrors = dyn->out_errors; + row->dwOutQLen = 0; + row->dwDescrLen = WideCharToMultiByte( CP_ACP, 0, stat->descr.String, stat->descr.Length / sizeof(WCHAR), + (char *)row->bDescr, sizeof(row->bDescr) - 1, NULL, NULL ); + row->bDescr[row->dwDescrLen] = '\0'; +} /****************************************************************** * GetIfEntry (IPHLPAPI.@) @@ -1811,91 +1843,70 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) return ret; } -static int IfTableSorter(const void *a, const void *b) +static int ifrow_cmp( const void *a, const void *b ) { - int ret; - - if (a && b) - ret = ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; - else - ret = 0; - return ret; + return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; } - /****************************************************************** * GetIfTable (IPHLPAPI.@) * * Get a table of local interfaces. * * PARAMS - * pIfTable [Out] buffer for local interfaces table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for local interfaces table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * * NOTES - * If pdwSize is less than required, the function will return + * If size is less than required, the function will return * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte * size. - * If bOrder is true, the returned table will be sorted by interface index. + * If sort is true, the returned table will be sorted by interface index. */ -DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIfTable( MIB_IFTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; + DWORD i, count, needed, err; + NET_LUID *keys; + struct nsi_ndis_ifinfo_rw *rw; + struct nsi_ndis_ifinfo_dynamic *dyn; + struct nsi_ndis_ifinfo_static *stat; - TRACE("pIfTable %p, pdwSize %p, bOrder %d\n", pIfTable, pdwSize, bOrder); + if (!size) return ERROR_INVALID_PARAMETER; - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numInterfaces = get_interface_indices( FALSE, NULL ); - ULONG size = sizeof(MIB_IFTABLE); + /* While this could be implemented on top of GetIfTable2(), it would require + an additional copy of the data */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; + + needed = FIELD_OFFSET( MIB_IFTABLE, table[count] ); - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(MIB_IFROW); - if (!pIfTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; + if (!table || *size < needed) + { + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; } - else { - InterfaceIndexTable *table; - get_interface_indices( FALSE, &table ); - - if (table) { - size = sizeof(MIB_IFTABLE); - if (table->numIndexes > 1) - size += (table->numIndexes - 1) * sizeof(MIB_IFROW); - if (*pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - DWORD ndx; - *pdwSize = size; - pIfTable->dwNumEntries = 0; - for (ndx = 0; ndx < table->numIndexes; ndx++) { - pIfTable->table[ndx].dwIndex = table->indexes[ndx]; - GetIfEntry(&pIfTable->table[ndx]); - pIfTable->dwNumEntries++; - } - if (bOrder) - qsort(pIfTable->table, pIfTable->dwNumEntries, sizeof(MIB_IFROW), - IfTableSorter); - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); - } - else - ret = ERROR_OUTOFMEMORY; + table->dwNumEntries = count; + for (i = 0; i < count; i++) + { + MIB_IFROW *row = table->table + i; + + if_row_fill( row, rw + i, dyn + i, stat + i ); } - } - TRACE("returning %d\n", ret); - return ret; + + if (sort) qsort( table->table, count, sizeof(MIB_IFROW), ifrow_cmp ); + +err: + NsiFreeTable( keys, rw, dyn, stat ); + return err; } static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 784eafbd1ef..1e8950f3482 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -238,12 +238,16 @@ static void testGetIfTable(void) if (apiReturn == NO_ERROR) { + char descr[MAX_INTERFACE_NAME_LEN]; + WCHAR name[MAX_INTERFACE_NAME_LEN]; DWORD i, index; if (winetest_debug > 1) trace( "interface table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { MIB_IFROW *row = &buf->table[i]; + MIB_IF_ROW2 row2; + GUID *guid; if (winetest_debug > 1) { @@ -261,6 +265,18 @@ static void testGetIfTable(void) ok( index == row->dwIndex || broken( index != row->dwIndex && index ), /* Win8 can have identical guids for two different ifaces */ "got %d vs %d\n", index, row->dwIndex ); + memset( &row2, 0, sizeof(row2) ); + row2.InterfaceIndex = row->dwIndex; + GetIfEntry2( &row2 ); + WideCharToMultiByte( CP_ACP, 0, row2.Description, -1, descr, sizeof(descr), NULL, NULL ); + ok( !strcmp( (char *)row->bDescr, descr ), "got %s vs %s\n", row->bDescr, descr ); + guid = &row2.InterfaceGuid; + swprintf( name, ARRAY_SIZE(name), L"\\DEVICE\\TCPIP_{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); +todo_wine + ok( !wcscmp( row->wszName, name ), "got %s vs %s\n", debugstr_w( row->wszName ), debugstr_w( name ) ); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Huw Davies : iphlpapi: Implement GetAdapterIndex() on top of GetIfTable().
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: bdc48738ce8afed0d72836e48bf2656b3750bc0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdc48738ce8afed0d72836e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 9 09:09:24 2021 +0100 iphlpapi: Implement GetAdapterIndex() on top of GetIfTable(). Eventually this should just parse the Guid in the name. This is an intermediate step to keep the interface names in sync. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 37 ++++++++++++++++++++++--------------- dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7c537dc3f27..ff534afa0f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -628,28 +628,35 @@ void WINAPI FreeMibTable(void *ptr) * Get interface index from its name. * * PARAMS - * AdapterName [In] unicode string with the adapter name - * IfIndex [Out] returns found interface index + * adapter_name [In] unicode string with the adapter name + * index [Out] returns found interface index * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) +DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) { - char adapterName[MAX_ADAPTER_NAME]; - unsigned int i; - DWORD ret; + MIB_IFTABLE *if_table; + DWORD err, i; - TRACE("(AdapterName %p, IfIndex %p)\n", AdapterName, IfIndex); - /* The adapter name is guaranteed not to have any unicode characters, so - * this translation is never lossy */ - for (i = 0; i < sizeof(adapterName) - 1 && AdapterName[i]; i++) - adapterName[i] = (char)AdapterName[i]; - adapterName[i] = '\0'; - ret = getInterfaceIndexByName(adapterName, IfIndex); - TRACE("returning %d\n", ret); - return ret; + TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); + + err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + if (err) return err; + + err = ERROR_INVALID_PARAMETER; + for (i = 0; i < if_table->dwNumEntries; i++) + { + if (!strcmpW( adapter_name, if_table->table[i].wszName )) + { + *index = if_table->table[i].dwIndex; + err = ERROR_SUCCESS; + break; + } + } + heap_free( if_table ); + return err; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 61406090839..784eafbd1ef 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -236,27 +236,31 @@ static void testGetIfTable(void) "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (apiReturn == NO_ERROR) { - DWORD i, j; - char name[MAX_INTERFACE_NAME_LEN]; + DWORD i, index; - trace( "interface table: %u entries\n", buf->dwNumEntries ); + if (winetest_debug > 1) trace( "interface table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { MIB_IFROW *row = &buf->table[i]; - WideCharToMultiByte( CP_ACP, 0, row->wszName, -1, name, MAX_INTERFACE_NAME_LEN, NULL, NULL ); - trace( "%u: '%s' type %u mtu %u speed %u phys", - row->dwIndex, name, row->dwType, row->dwMtu, row->dwSpeed ); - for (j = 0; j < row->dwPhysAddrLen; j++) - printf( " %02x", row->bPhysAddr[j] ); - printf( "\n" ); - trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", - row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, - row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); - trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", - row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, - row->dwOutDiscards, row->dwOutErrors ); + + if (winetest_debug > 1) + { + trace( "%u: '%s' type %u mtu %u speed %u\n", + row->dwIndex, debugstr_w(row->wszName), row->dwType, row->dwMtu, row->dwSpeed ); + trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", + row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, + row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); + trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", + row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, + row->dwOutDiscards, row->dwOutErrors ); + } + apiReturn = GetAdapterIndex( row->wszName, &index ); + ok( !apiReturn, "got %d\n", apiReturn ); + ok( index == row->dwIndex || + broken( index != row->dwIndex && index ), /* Win8 can have identical guids for two different ifaces */ + "got %d vs %d\n", index, row->dwIndex ); } } HeapFree(GetProcessHeap(), 0, buf);

1 0