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

Alexandre Julliard : Release 6.15.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 7f144646ffac6f3632d0c39b217dbd433c1154a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f144646ffac6f3632d0c39b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:42:33 2021 +0200 Release 6.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 853 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 5 +- VERSION | 2 +- configure | 18 +- 4 files changed, 524 insertions(+), 354 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f144646ffac6f3632d0…

1 0

Rémi Bernon : winebus.sys: Fix duplicate lnxev / hidraw device lookup.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 5d6419a53c325b5e5b02d5862a0c1f9d87c1b98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6419a53c325b5e5b02d586… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:16 2021 +0200 winebus.sys: Fix duplicate lnxev / hidraw device lookup. The comparison result was wrong, and the device syspath always differs anyway between two different subsystems. We need to compare the parent device syspath. The input subsystem devices also needs to be deduplicated between eventX devices and jsX devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 48 +++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b9466b0178b..887996daf49 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -976,9 +976,23 @@ static const platform_vtbl lnxev_vtbl = { }; #endif -static int check_same_device(DEVICE_OBJECT *device, void* context) +static const char *get_device_syspath(struct udev_device *dev) { - return !compare_platform_device(device, context); + struct udev_device *parent; + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) + return udev_device_get_syspath(parent); + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) + return udev_device_get_syspath(parent); + + return ""; +} + +static int check_device_syspath(DEVICE_OBJECT *device, void* context) +{ + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + return strcmp(get_device_syspath(private->udev_device), context); } static int parse_uevent_info(const char *uevent, DWORD *vendor_id, @@ -1078,28 +1092,24 @@ static void try_add_device(struct udev_device *dev) return; } + TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); + +#ifdef HAS_PROPER_INPUT_HEADER + device = bus_enumerate_hid_devices(&lnxev_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); + if (!device) device = bus_enumerate_hid_devices(&hidraw_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); + if (device) + { + TRACE("duplicate device found, not adding the new one\n"); + close(fd); + return; + } +#endif + subsystem = udev_device_get_subsystem(dev); hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { const char *bcdDevice = NULL; -#ifdef HAS_PROPER_INPUT_HEADER - const platform_vtbl *other_vtbl = NULL; - DEVICE_OBJECT *dup = NULL; - if (strcmp(subsystem, "hidraw") == 0) - other_vtbl = &lnxev_vtbl; - else if (strcmp(subsystem, "input") == 0) - other_vtbl = &hidraw_vtbl; - - if (other_vtbl) - dup = bus_enumerate_hid_devices(other_vtbl, check_same_device, dev); - if (dup) - { - TRACE("Duplicate cross bus device (%p) found, not adding the new one\n", dup); - close(fd); - return; - } -#endif parse_uevent_info(udev_device_get_sysattr_value(hiddev, "uevent"), &vid, &pid, &input, &serial); if (serial == NULL)

1 0

Jacek Caban : gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: ce94982927ca0650462d00417fe930ab105d3988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce94982927ca0650462d0041… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:08:23 2021 +0200 gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation. 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/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/mapping.c | 30 ------------------------------ 6 files changed, 16 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 744ef47a97f..cab79d07aaf 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -300,22 +300,14 @@ BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) +BOOL EMFDC_SetWorldTransform( DC_ATTR *dc_attr, const XFORM *xform ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWorldTransform ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETWORLDTRANSFORM emr; - BOOL ret; emr.emr.iType = EMR_SETWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); emr.xform = *xform; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetWorldTransform( next, xform ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_ModifyWorldTransform( DC_ATTR *dc_attr, const XFORM *xform, DWORD mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d2db67cd03e..4ee00df6c9a 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -41,7 +41,6 @@ typedef struct HBRUSH dc_brush; HPEN dc_pen; INT restoring; /* RestoreDC counter */ - INT modifying_transform;/* Counter for functions that can change world transform */ BOOL path; INT dev_caps[COLORMGMTCAPS + 1]; } EMFDRV_PDEVICE; @@ -107,7 +106,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, BITMAPINFO *info, UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e6b501aaf77..267e4c4fe61 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -126,7 +126,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetWorldTransform, /* pSetWorldTransform */ + NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ NULL, /* pStretchBlt */ @@ -338,7 +338,6 @@ HDC WINAPI CreateEnhMetaFileW( physDev->dc_brush = 0; physDev->dc_pen = 0; physDev->restoring = 0; - physDev->modifying_transform = 0; physDev->path = FALSE; if (hdc) /* if no ref, use current display */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f3fb35c3834..2bfe23a42a5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -186,6 +186,7 @@ extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HI extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetWorldTransform( DC_ATTR *dc_attr, const XFORM *xform ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, DWORD rop ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e4f26742c9f..44ad3e798bf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -613,6 +613,18 @@ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) return NtGdiModifyWorldTransform( hdc, xform, mode ); } +/*********************************************************************** + * SetWorldTransform (GDI32.@) + */ +BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetWorldTransform( dc_attr, xform )) return FALSE; + return NtGdiModifyWorldTransform( hdc, xform, MWT_SET ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 381c29dd26f..d5beef70b1c 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -148,10 +148,6 @@ BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) { - DC *dc = get_nulldrv_dc( dev ); - - dc->xformWorld2Wnd = *xform; - DC_UpdateXforms( dc ); return TRUE; } @@ -379,32 +375,6 @@ BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) } -/*********************************************************************** - * SetWorldTransform (GDI32.@) - */ -BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) -{ - BOOL ret = FALSE; - DC *dc; - - if (!xform) return FALSE; - /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ - if (xform->eM11 * xform->eM22 == xform->eM12 * xform->eM21) return FALSE; - - TRACE("eM11 %f eM12 %f eM21 %f eM22 %f eDx %f eDy %f\n", - xform->eM11, xform->eM12, xform->eM21, xform->eM22, xform->eDx, xform->eDy); - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWorldTransform ); - if (dc->attr->graphics_mode == GM_ADVANCED) - ret = physdev->funcs->pSetWorldTransform( physdev, xform ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiSetVirtualResolution (win32u.@) *

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: eeecc2a39a1a4fd46e3d6ac539e28b835fe5c415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeecc2a39a1a4fd46e3d6ac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:08:35 2021 +0200 gdi32: Remove no longer used driver entry points. 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/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/mapping.c | 10 ---------- dlls/gdi32/mfdrv/init.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 2 -- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 14 files changed, 1 insertion(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eeecc2a39a1a4fd46e3d…

1 0

Jacek Caban : krnl386.exe: Convert 16-bit GDI handles to full 32-bit handles.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: f05e9b1e26653c3c3a4df5f7e077ac9de76761be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05e9b1e26653c3c3a4df5f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 14:59:39 2021 +0200 krnl386.exe: Convert 16-bit GDI handles to full 32-bit handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/wowthunk.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 5bd9d7aecd4..0e9e9b6744c 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -28,6 +28,7 @@ #include "wownt32.h" #include "excpt.h" #include "winternl.h" +#include "ntgdi.h" #include "kernel16_private.h" #include "wine/exception.h" #include "wine/debug.h" @@ -309,6 +310,24 @@ VOID WINAPI K32WOWDirectedYield16( WORD htask16 ) DirectedYield16( (HTASK16)htask16 ); } +static HANDLE gdi_handle32( WORD handle ) +{ + static GDI_SHARED_MEMORY *gdi_shared; + + if (!gdi_shared) + { + if (NtCurrentTeb()->GdiBatchCount) + { + TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; + PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; + gdi_shared = (GDI_SHARED_MEMORY *)(UINT_PTR)peb64->GdiSharedHandleTable; + } + else gdi_shared = (GDI_SHARED_MEMORY *)NtCurrentTeb()->Peb->GdiSharedHandleTable; + if (!gdi_shared) return ULongToHandle( handle ); + } + + return ULongToHandle( (gdi_shared->Handles[handle].Unique << 16) | handle ); +} /*********************************************************************** * K32WOWHandle32 (KERNEL32.57) @@ -321,6 +340,9 @@ HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) case WOW_TYPE_HMENU: case WOW_TYPE_HDWP: case WOW_TYPE_HDROP: + case WOW_TYPE_HACCEL: + return (HANDLE)(ULONG_PTR)handle; + case WOW_TYPE_HDC: case WOW_TYPE_HFONT: case WOW_TYPE_HRGN: @@ -328,12 +350,8 @@ HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) case WOW_TYPE_HBRUSH: case WOW_TYPE_HPALETTE: case WOW_TYPE_HPEN: - case WOW_TYPE_HACCEL: - return (HANDLE)(ULONG_PTR)handle; - case WOW_TYPE_HMETAFILE: - FIXME( "conversion of metafile handles not supported yet\n" ); - return (HANDLE)(ULONG_PTR)handle; + return gdi_handle32( handle ); case WOW_TYPE_HTASK: return ((TDB *)GlobalLock16(handle))->teb->ClientId.UniqueThread;

1 0

Rémi Bernon : winebus.sys: Read irp->IoStatus.Status before leaving the CS.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 28f797ec8b90ab6baf7a322d2f83a1fd9f69a53d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f797ec8b90ab6baf7a322d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:12 2021 +0200 winebus.sys: Read irp->IoStatus.Status before leaving the CS. Or we may have a race condition where a pending IRP may be completed after we left the CS but before we read its status. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 001f775e230..b7230cf2e33 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -982,9 +982,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } + status = irp->IoStatus.Status; LeaveCriticalSection(&ext->cs); - status = irp->IoStatus.Status; if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT); return status; }

1 0

Huw Davies : iphlpapi: Implement GetTcpStatisticsEx() on top of nsi.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 4716138d0724cf52251ee6b780131f32940722af URL: https://source.winehq.org/git/wine.git/?a=commit;h=4716138d0724cf52251ee6b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:50 2021 +0100 iphlpapi: Implement GetTcpStatisticsEx() 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 | 62 ++++++++++++++++ dlls/iphlpapi/ipstats.c | 161 ----------------------------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/nsi/tests/nsi.c | 3 - 4 files changed, 64 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4716138d0724cf52251e…

1 0

Zebediah Figura : ntdll: Make alloc_fs_sel() a hidden symbol.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 7c10730e04d0ac199f553dcc31c28e089e1870fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c10730e04d0ac199f553dcc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:48:08 2021 -0500 ntdll: Make alloc_fs_sel() a hidden symbol. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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 d02a7946945..390121726ad 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -92,7 +92,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ); +extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t"

1 0

Zebediah Figura : ntdll: Make wine_build a hidden symbol.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: a8d2de6092bb58cd0d0c3cdc27eb429843f08bf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8d2de6092bb58cd0d0c3cdc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:48:09 2021 -0500 ntdll: Make wine_build a hidden symbol. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/system.c | 1 - dlls/ntdll/unix/unix_private.h | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7d9635db535..5edc845009f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2220,7 +2220,6 @@ static void check_command_line( int argc, char *argv[] ) } if (!strcmp( argv[1], "--version" )) { - extern const char wine_build[]; printf( "%s\n", wine_build ); exit(0); } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 94961ed524e..cc4b283ffc7 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2886,7 +2886,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemWineVersionInformation: /* 1000 */ { static const char version[] = PACKAGE_VERSION; - extern const char wine_build[]; struct utsname buf; uname( &buf ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9c6c323298c..18c58a6431e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -116,6 +116,8 @@ extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; +extern const char wine_build[] DECLSPEC_HIDDEN; + extern const char *home_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *build_dir DECLSPEC_HIDDEN;

1 0

Huw Davies : nsiproxy: Add an #ifdef guard for SIN_ROUTER.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: ab31bf5d8c5f8bcd818134b11cc34a1e23b915a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab31bf5d8c5f8bcd818134b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:48 2021 +0100 nsiproxy: Add an #ifdef guard for SIN_ROUTER. It's not defined in FreeBSD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c5d98fa93f2..e2e292f4b59 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -962,7 +962,11 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo memcpy( entry.phys_addr, &sdl->sdl_data[sdl->sdl_nlen], entry.phys_addr_len ); if (rtm->rtm_rmx.rmx_expire == 0) entry.state = NlnsPermanent; else entry.state = NlnsReachable; +#ifdef SIN_ROUTER entry.is_router = sinarp->sin_other & SIN_ROUTER; +#else + entry.is_router = 0; +#endif entry.is_unreachable = 0; /* FIXME */ if (num < *count)

1 0