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

Rémi Bernon : winebus.sys: Remove the now useless bus_remove_hid_device.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 8f065f97c91433eab9d6141e5cce118d00701210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f065f97c91433eab9d6141e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:20 2021 +0200 winebus.sys: Remove the now useless bus_remove_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/main.c | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index f46daa7144d..d07b33e86b3 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -56,7 +56,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; -void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3bb534a7d8a..4b246b0059a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -378,24 +378,6 @@ void bus_unlink_hid_device(DEVICE_OBJECT *device) LeaveCriticalSection(&device_list_cs); } -void bus_remove_hid_device(DEVICE_OBJECT *device) -{ - struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct pnp_device *pnp_device = ext->pnp_device; - - TRACE("(%p)\n", device); - - ext->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&ext->cs); - - HeapFree(GetProcessHeap(), 0, ext->serial); - HeapFree(GetProcessHeap(), 0, ext->last_report); - IoDeleteDevice(device); - - /* pnp_device must be released after the device is gone */ - HeapFree(GetProcessHeap(), 0, pnp_device); -} - static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) { int i;

1 0

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

Aug. 18, 2021

Module: wine Branch: master Commit: 817f116e9522d5f0cb333010cfe9fd783aca025e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817f116e9522d5f0cb333010… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:59:24 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/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 12 ------------ 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 +--- 12 files changed, 1 insertion(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=817f116e9522d5f0cb33…

1 0

Jacek Caban : gdi32: Use NtGdiSelectClipPath for SelectClipPath.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 617cab35686c3254ce02821e3be54f9df6275fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=617cab35686c3254ce02821e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:54 2021 +0200 gdi32: Use NtGdiSelectClipPath for SelectClipPath. 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 | 16 +++------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 23 +++++++---------------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f424b459fb3..bf8f1a85ad9 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -386,24 +386,14 @@ BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) +BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) { EMRSELECTCLIPPATH emr; - BOOL ret = FALSE; - HRGN hrgn; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); - emr.iMode = iMode; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - hrgn = PathToRegion( dev->hdc ); - if (hrgn) - { - ret = NtGdiExtSelectClipRgn( dev->hdc, hrgn, iMode ); - DeleteObject( hrgn ); - } - return ret; + emr.iMode = mode; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index fb108c15be5..ea60aa6cf29 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -93,7 +93,6 @@ extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5421f6009ce..57d538f3597 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -111,7 +111,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_RoundRect, /* pRoundRect */ EMFDRV_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ - EMFDRV_SelectClipPath, /* pSelectClipPath */ + NULL, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0a894e9ec3d..1e0e4d2dd0a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -184,6 +184,7 @@ extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_denom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 85744cc5c11..067a7e7f588 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/*********************************************************************** + * SelectClipPath (GDI32.@) + */ +BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SelectClipPath( dc_attr, mode )) return FALSE; + return NtGdiSelectClipPath( hdc, mode ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 54e93ca74db..2badf2874f2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -714,18 +714,17 @@ BOOL WINAPI NtGdiFillPath( HDC hdc ) /*********************************************************************** - * SelectClipPath (GDI32.@) + * NtGdiSelectClipPath (win32u.@) */ -BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) +BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + HRGN rgn; - if (dc) + if ((rgn = PathToRegion( hdc ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectClipPath ); - ret = physdev->funcs->pSelectClipPath( physdev, iMode ); - release_dc_ptr( dc ); + ret = NtGdiExtSelectClipRgn( hdc, rgn, mode ) != ERROR; + DeleteObject( rgn ); } return ret; } @@ -2005,15 +2004,7 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { - BOOL ret = FALSE; - HRGN hrgn = PathToRegion( dev->hdc ); - - if (hrgn) - { - ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; - DeleteObject( hrgn ); - } - return ret; + return TRUE; } BOOL CDECL nulldrv_FillPath( PHYSDEV dev )

1 0

Jacek Caban : gdi32: Merge mfdrv/text.c into metadc.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: b47fb9081d4cf2802d64b29b06ed1a377191dbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47fb9081d4cf2802d64b29b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:05 2021 +0200 gdi32: Merge mfdrv/text.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/gdi32/mfdrv/metafiledrv.h | 65 ----------------- dlls/gdi32/mfdrv/text.c | 153 --------------------------------------- 4 files changed, 143 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b47fb9081d4cf2802d64…

1 0

Jacek Caban : gdi32: Merge mfdrv/graphics.c into metadc.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 2f71b42f07f9960f103d176cd44aa8a106c5dada URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f71b42f07f9960f103d176c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:57:06 2021 +0200 gdi32: Merge mfdrv/graphics.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 322 +++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 430 -------------------------------------------- 3 files changed, 322 insertions(+), 431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f71b42f07f9960f103d…

1 0

Huw Davies : nsiproxy: Implement UDP endpoint enumerate_all.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 7841c8af1abf35440ea579a552497fa59f8fa92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7841c8af1abf35440ea579a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 18 08:54:44 2021 +0100 nsiproxy: Implement UDP endpoint enumerate_all. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 65 ++++++++ dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 19 +++ dlls/nsiproxy.sys/tcp.c | 20 +-- dlls/nsiproxy.sys/udp.c | 291 +++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 +++ 7 files changed, 400 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7841c8af1abf35440ea5…

1 0

Jacek Caban : gdi32: Merge mfdrv/dc.c into metadc.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 1b86e52ec465942602997eb0410f2f6931487f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b86e52ec465942602997eb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:56:51 2021 +0200 gdi32: Merge mfdrv/dc.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 130 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 151 ------------------------------------------------- 3 files changed, 130 insertions(+), 152 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 633def9c6c2..cab0623a56c 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -38,7 +38,6 @@ C_SRCS = \ metadc.c \ metafile.c \ mfdrv/bitblt.c \ - mfdrv/dc.c \ mfdrv/graphics.c \ mfdrv/objects.c \ mfdrv/text.c \ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index 324fe7e2535..903b80854c4 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -167,6 +167,136 @@ BOOL metadc_param8( HDC hdc, short func, short param1, short param2, return metadc_record( hdc, mr, sizeof(buffer) ); } +BOOL METADC_SaveDC( HDC hdc ) +{ + return metadc_param0( hdc, META_SAVEDC ); +} + +BOOL METADC_RestoreDC( HDC hdc, INT level ) +{ + return metadc_param1( hdc, META_RESTOREDC, level ); +} + +BOOL METADC_SetTextAlign( HDC hdc, UINT align ) +{ + return metadc_param2( hdc, META_SETTEXTALIGN, HIWORD(align), LOWORD(align) ); +} + +BOOL METADC_SetBkMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETBKMODE, (WORD)mode ); +} + +BOOL METADC_SetBkColor( HDC hdc, COLORREF color ) +{ + return metadc_param2( hdc, META_SETBKCOLOR, HIWORD(color), LOWORD(color) ); +} + +BOOL METADC_SetTextColor( HDC hdc, COLORREF color ) +{ + return metadc_param2( hdc, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color) ); +} + +BOOL METADC_SetROP2( HDC hdc, INT rop ) +{ + return metadc_param1( hdc, META_SETROP2, (WORD)rop ); +} + +BOOL METADC_SetRelAbs( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); +} + +BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); +} + +BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode ); +} + +BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); +} + +BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); +} + +BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); +} + +BOOL METADC_SetLayout( HDC hdc, DWORD layout ) +{ + return metadc_param2( hdc, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); +} + +BOOL METADC_SetMapMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETMAPMODE, mode ); +} + +BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); +} + +BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); +} + +BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); +} + +BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETWINDOWORG, x, y ); +} + +BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); +} + +BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETWINDOWORG, x, y ); +} + +BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) +{ + return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); +} + +BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) +{ + return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); +} + +BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) +{ + return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); +} + +BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) +{ + return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); +} + +BOOL METADC_SetMapperFlags( HDC hdc, DWORD flags ) +{ + return metadc_param2( hdc, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ); +} + BOOL METADC_ExtEscape( HDC hdc, INT escape, INT input_size, const void *input, INT output_size, void *output ) { diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c deleted file mode 100644 index 1fe36127676..00000000000 --- a/dlls/gdi32/mfdrv/dc.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * MetaFile driver DC value functions - * - * Copyright 1999 Huw D M Davies - * - * 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 - */ - -#include "mfdrv/metafiledrv.h" - -BOOL METADC_SaveDC( HDC hdc ) -{ - return metadc_param0( hdc, META_SAVEDC ); -} - -BOOL METADC_RestoreDC( HDC hdc, INT level ) -{ - return metadc_param1( hdc, META_RESTOREDC, level ); -} - -BOOL METADC_SetTextAlign( HDC hdc, UINT align ) -{ - return metadc_param2( hdc, META_SETTEXTALIGN, HIWORD(align), LOWORD(align) ); -} - -BOOL METADC_SetBkMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETBKMODE, (WORD)mode ); -} - -BOOL METADC_SetBkColor( HDC hdc, COLORREF color ) -{ - return metadc_param2( hdc, META_SETBKCOLOR, HIWORD(color), LOWORD(color) ); -} - -BOOL METADC_SetTextColor( HDC hdc, COLORREF color ) -{ - return metadc_param2( hdc, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color) ); -} - -BOOL METADC_SetROP2( HDC hdc, INT rop ) -{ - return metadc_param1( hdc, META_SETROP2, (WORD)rop ); -} - -BOOL METADC_SetRelAbs( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); -} - -BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); -} - -BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode ); -} - -BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) -{ - return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); -} - -BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) -{ - return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); -} - -BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); -} - -BOOL METADC_SetLayout( HDC hdc, DWORD layout ) -{ - return metadc_param2( hdc, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); -} - -BOOL METADC_SetMapMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETMAPMODE, mode ); -} - -BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); -} - -BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); -} - -BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); -} - -BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETWINDOWORG, x, y ); -} - -BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); -} - -BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETWINDOWORG, x, y ); -} - -BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) -{ - return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); -} - -BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) -{ - return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); -} - -BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) -{ - return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); -} - -BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) -{ - return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); -} - -BOOL METADC_SetMapperFlags( HDC hdc, DWORD flags ) -{ - return metadc_param2( hdc, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ); -}

1 0

Jacek Caban : gdi32: Move mfdrv/init.c to new metadc.c file.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 293678f123699a43308f5d37a2b3093cc37883be URL: https://source.winehq.org/git/wine.git/?a=commit;h=293678f123699a43308f5d37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:56:38 2021 +0200 gdi32: Move mfdrv/init.c to new metadc.c file. 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/Makefile.in | 2 +- dlls/gdi32/{mfdrv/init.c => metadc.c} | 344 ++++++++++++++++------------------ 2 files changed, 158 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=293678f123699a43308f…

1 0

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

Aug. 18, 2021

Module: wine Branch: master Commit: e91b19bf38e13c7a31d553a5593088c5609b0aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91b19bf38e13c7a31d553a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 18 08:54:48 2021 +0100 iphlpapi: Implement GetUdpStatisticsEx() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 4 +- dlls/iphlpapi/ifenum.c | 395 ------------------------------------------ dlls/iphlpapi/ifenum.h | 66 ------- dlls/iphlpapi/iphlpapi_main.c | 48 ++++- dlls/iphlpapi/ipstats.c | 370 --------------------------------------- dlls/nsi/tests/nsi.c | 1 - 6 files changed, 48 insertions(+), 836 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e91b19bf38e13c7a31d5…

1 0

Huw Davies : nsiproxy: Implement UDP stats get_all_parameters.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: d6278ea0216a36027d7ba9ddd9b32fba898fb39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6278ea0216a36027d7ba9dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 18 08:54:47 2021 +0100 nsiproxy: Implement UDP stats get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 36 ++++++++++++++ dlls/nsiproxy.sys/udp.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 11 +++++ 3 files changed, 175 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index ce09bbf8a22..bd7992f6916 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -938,6 +938,40 @@ static void test_tcp_tables( int family, int table_type ) winetest_pop_context(); } +static void test_udp_stats( int family ) +{ + DWORD err; + USHORT key = family; + struct nsi_udp_stats_dynamic dyn, dyn2; + MIB_UDPSTATS table; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + ok( !err, "got %x\n", err ); + + err = GetUdpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn2, sizeof(dyn2), NULL, 0 ); + ok( !err, "got %x\n", err ); + + ok( bounded( table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); + ok( bounded( table.dwNoPorts, dyn.no_ports, dyn2.no_ports ), "%d vs [%d %d]\n", + table.dwNoPorts, dyn.no_ports, dyn2.no_ports); + ok( bounded( table.dwInErrors, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", + table.dwInErrors, dyn.in_errs, dyn2.in_errs ); + ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); +todo_wine_if(!unstable(0) && table.dwNumAddrs != dyn.num_addrs) + ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); + + winetest_pop_context(); +} + static void test_udp_tables( int family ) { DWORD i, err, count, size; @@ -1030,6 +1064,8 @@ START_TEST( nsi ) test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_CONNECTIONS ); test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_LISTENER ); + test_udp_stats( AF_INET ); + test_udp_stats( AF_INET6 ); test_udp_tables( AF_INET ); test_udp_tables( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 454aefe95aa..49acedcf214 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -73,6 +73,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static DWORD udp_num_addrs( USHORT family ) +{ + DWORD endpoint_count = 0; + + nsi_enumerate_all( 1, 0, &NPI_MS_UDP_MODULEID, NSI_UDP_ENDPOINT_TABLE, + NULL, 0, NULL, 0, NULL, 0, NULL, 0, &endpoint_count ); + /* FIXME: actually retrieve the keys and only count endpoints which match family */ + return endpoint_count; +} + +static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_udp_stats_dynamic dyn; + const USHORT *family = key; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + if (*family != WS_AF_INET && *family != WS_AF_INET6) return STATUS_NOT_SUPPORTED; + + memset( &dyn, 0, sizeof(dyn) ); + + dyn.num_addrs = udp_num_addrs( *family ); + +#ifdef __linux__ + if (*family == WS_AF_INET) + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Udp:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + /* last line was a header, get another */ + if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + { + unsigned int in_dgrams, out_dgrams; + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %u %u %u", + &in_dgrams, &dyn.no_ports, &dyn.in_errs, &out_dgrams, &dyn.num_addrs ); + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } + else + { + unsigned int in_dgrams = 0, out_dgrams = 0; + struct + { + const char *name; + DWORD *elem; + } udp_stat_list[] = + { + { "Udp6InDatagrams", &in_dgrams }, + { "Udp6NoPorts", &dyn.no_ports }, + { "Udp6InErrors", &dyn.in_errs }, + { "Udp6OutDatagrams", &out_dgrams }, + }; + char buf[512], *ptr, *value; + DWORD res, i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value==' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr='\0'; + + for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) + if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + *udp_stat_list[i].elem = res; + } + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + fclose( fp ); + return STATUS_SUCCESS; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS }; + struct udpstat udp_stat; + size_t needed = sizeof(udp_stat); + + if (sysctl( mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_dgrams = udp_stat.udps_ipackets; + dyn.out_dgrams = udp_stat.udps_opackets; + dyn.no_ports = udp_stat.udps_noport; + dyn.in_errs = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#endif + FIXME( "Not implemented\n" ); + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD_PTR *count ) @@ -271,6 +390,15 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void static struct module_table udp_tables[] = { + { + NSI_UDP_STATS_TABLE, + { + sizeof(USHORT), 0, + sizeof(struct nsi_udp_stats_dynamic), 0 + }, + NULL, + udp_stats_get_all_parameters, + }, { NSI_UDP_ENDPOINT_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8bf3bc1d5d0..7b8cb29e9d5 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -347,8 +347,19 @@ struct nsi_tcp_conn_static }; /* Undocumented NSI UDP tables */ +#define NSI_UDP_STATS_TABLE 0 #define NSI_UDP_ENDPOINT_TABLE 1 +struct nsi_udp_stats_dynamic +{ + ULONGLONG in_dgrams; + DWORD no_ports; + DWORD in_errs; + ULONGLONG out_dgrams; + DWORD num_addrs; + DWORD unk[5]; +}; + struct nsi_udp_endpoint_key { SOCKADDR_INET local;

1 0