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

Zebediah Figura : ws2_32: Dump the flow label and scope ID in debugstr_sockaddr().
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: a5f787ac445a682ea7ced5dd78c3516d4b8b9311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5f787ac445a682ea7ced5dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 23 11:39:11 2021 -0500 ws2_32: Dump the flow label and scope ID in debugstr_sockaddr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 16bece395b8..7fb48698d2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -192,8 +192,8 @@ const char *debugstr_sockaddr( const struct WS_sockaddr *a ) p = WS_inet_ntop( WS_AF_INET6, &sin->sin6_addr, buf, sizeof(buf) ); if (!p) p = "(unknown IPv6 address)"; - return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", - p, ntohs(sin->sin6_port)); + return wine_dbg_sprintf("{ family AF_INET6, address %s, flow label %#x, port %d, scope %u }", + p, sin->sin6_flowinfo, ntohs(sin->sin6_port), sin->sin6_scope_id ); } case WS_AF_IPX: {

1 0

Jacek Caban : gdi32: Remove no longer used EMF path driver.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 0bc43b3a920288b6c39fd1492440d0805f49f5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc43b3a920288b6c39fd149… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:50:59 2021 +0200 gdi32: Remove no longer used EMF path driver. 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 | 204 ----------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - 2 files changed, 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bc43b3a920288b6c39f…

1 0

Jacek Caban : gdi32: Use NtGdiSetPixel for SetPixel implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 5a71d8415e82f62661006431d92139bbc5349093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a71d8415e82f62661006431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:51:16 2021 +0200 gdi32: Use NtGdiSetPixel for SetPixel 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/graphics.c | 24 ++++++++------ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 ++++++++ dlls/gdi32/mfdrv/graphics.c | 7 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 6 ++-- dlls/gdi32/tests/metafile.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 108 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index d4fd2b482ef..fcaf432b57e 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -524,9 +524,9 @@ BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, } /*********************************************************************** - * EMFDRV_SetPixel + * EMFDC_SetPixel */ -COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) { EMRSETPIXELV emr; @@ -535,15 +535,19 @@ COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) emr.ptlPixel.x = x; emr.ptlPixel.y = y; emr.crColor = color; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); +} - if (EMFDRV_WriteRecord( dev, &emr.emr )) { - RECTL bounds; - bounds.left = bounds.right = x; - bounds.top = bounds.bottom = y; - EMFDRV_UpdateBBox( dev, &bounds ); - return color; - } - return -1; +/*********************************************************************** + * EMFDRV_SetPixel + */ +COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +{ + RECTL bounds; + bounds.left = bounds.right = x; + bounds.top = bounds.bottom = y; + EMFDRV_UpdateBBox( dev, &bounds ); + return CLR_INVALID; } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a95053ea44c..481bc14d7f3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -60,6 +60,7 @@ extern BOOL METADC_Polyline( HDC hdc, const POINT *points,INT count) DECLSPEC_HI extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -92,5 +93,6 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 04d90a5e0ba..0bfc48f3fcc 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -57,6 +57,19 @@ BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * SetPixel (GDI32.@) + */ +COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetPixel( hdc, x, y, color ); + if (!(dc_attr = get_dc_attr( hdc ))) return CLR_INVALID; + if (dc_attr->emf && !EMFDC_SetPixel( dc_attr, x, y, color )) return CLR_INVALID; + return NtGdiSetPixel( hdc, x, y, color ); +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index d5f256346f9..8b74c1a3696 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -116,12 +116,11 @@ BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, } /*********************************************************************** - * MFDRV_SetPixel + * METADC_SetPixel */ -COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) { - return MFDRV_MetaParam4(dev, META_SETPIXEL, x, y,HIWORD(color), - LOWORD(color)); + return metadc_param4( hdc, META_SETPIXEL, x, y, HIWORD(color), LOWORD(color) ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index b37dc5c6d92..f53f8304a8e 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -202,7 +202,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetLayout, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ - MFDRV_SetPixel, /* pSetPixel */ + NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ MFDRV_SetROP2, /* pSetROP2 */ MFDRV_SetRelAbs, /* pSetRelAbs */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 3fad2970e64..6b4984854ed 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -112,7 +112,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 803b9797736..1e03a2046d9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -399,15 +399,15 @@ BOOL WINAPI NtGdiRoundRect( HDC hdc, INT left, INT top, INT right, } /*********************************************************************** - * SetPixel (GDI32.@) + * NtGdiSetPixel (win32u.@) */ -COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) +COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) { PHYSDEV physdev; COLORREF ret; DC * dc = get_dc_ptr( hdc ); - if (!dc) return ~0; + if (!dc) return CLR_INVALID; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pSetPixel ); ret = physdev->funcs->pSetPixel( physdev, x, y, color ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 34de9518f2a..d310eb47fa2 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3077,6 +3077,42 @@ static void test_metafile_file(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } +static void test_mf_SetPixel(void) +{ + HMETAFILE mf; + COLORREF c; + BOOL ret; + HDC hdc; + + hdc = CreateMetaFileW(NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == 1, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == 1, "c = %x\n", c); + + ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); + ok(ret, "ret = %x\n", ret); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = Rectangle(hdc, 1, 1, 10, 10); + ok(ret, "Rectangle failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + mf = CloseMetaFile(hdc); + ok(mf != 0, "CloseEnhMetaFile failed\n"); + DeleteMetaFile(mf); +} + static void test_enhmetafile_file(void) { char temp_path[MAX_PATH]; @@ -3178,6 +3214,40 @@ static void test_enhmetafile_file(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } +static void test_emf_SetPixel(void) +{ + HENHMETAFILE emf; + COLORREF c; + BOOL ret; + HDC hdc; + + hdc = CreateEnhMetaFileW(NULL, L"test.emf", NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFile failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + c = SetPixel(hdc, 5, 5, RGB(1,2,3)); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); + todo_wine + ok(!ret, "ret = %x\n", ret); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + ret = Rectangle(hdc, 1, 1, 10, 10); + ok(ret, "Rectangle failed\n"); + + c = GetPixel(hdc, 5, 5); + ok(c == CLR_INVALID, "c = %x\n", c); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile failed\n"); + DeleteEnhMetaFile(emf); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6272,6 +6342,7 @@ START_TEST(metafile) test_emf_WorldTransform(); test_emf_text_extents(); test_enhmetafile_file(); + test_emf_SetPixel(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6286,6 +6357,7 @@ START_TEST(metafile) test_mf_GetPath(); test_mf_SetLayout(); test_metafile_file(); + test_mf_SetPixel(); /* For metafile conversions */ test_mf_conversions();

1 0

Jacek Caban : gdi32: Use SetPixel for SetPixelV implementation.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: e7b9a16bc2d3beb457c219be7878cded46b738c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b9a16bc2d3beb457c219be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:51:51 2021 +0200 gdi32: Use SetPixel for SetPixelV 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/gdidc.c | 8 ++++++++ dlls/gdi32/painting.c | 16 ---------------- dlls/gdi32/tests/metafile.c | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0bfc48f3fcc..74280bc34b5 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -70,6 +70,14 @@ COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) return NtGdiSetPixel( hdc, x, y, color ); } +/*********************************************************************** + * SetPixelV (GDI32.@) + */ +BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color ) +{ + return SetPixel( hdc, x, y, color ) != CLR_INVALID; +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1e03a2046d9..21c3c853998 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -415,22 +415,6 @@ COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) return ret; } -/*********************************************************************** - * SetPixelV (GDI32.@) - */ -BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color ) -{ - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pSetPixel ); - physdev->funcs->pSetPixel( physdev, x, y, color ); - release_dc_ptr( dc ); - return TRUE; -} - /*********************************************************************** * GetPixel (GDI32.@) */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d310eb47fa2..5f626e83901 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3231,7 +3231,6 @@ static void test_emf_SetPixel(void) ok(c == CLR_INVALID, "c = %x\n", c); ret = SetPixelV(hdc, 5, 5, RGB(1,2,3)); - todo_wine ok(!ret, "ret = %x\n", ret); c = GetPixel(hdc, 5, 5);

1 0

Jacek Caban : gdi32: Use ntgdi name for GetPixel.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: ccb6fbba76d4259adafa634874219672ec6c6d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb6fbba76d4259adafa6348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 10:52:06 2021 +0200 gdi32: Use ntgdi name for GetPixel. 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/gdi32.spec | 2 +- dlls/gdi32/painting.c | 4 ++-- include/ntgdi.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6974f3cb873..299b84268a5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -327,7 +327,7 @@ @ stdcall GetOutlineTextMetricsW(long long ptr) @ stdcall GetPaletteEntries(long long long ptr) @ stdcall GetPath(long ptr ptr long) -@ stdcall GetPixel(long long long) +@ stdcall GetPixel(long long long) NtGdiGetPixel @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @ stdcall GetROP2(long) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 21c3c853998..c879aeb9582 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -416,9 +416,9 @@ COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) } /*********************************************************************** - * GetPixel (GDI32.@) + * NtGdiGetPixel (win32u.@) */ -COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ) { PHYSDEV physdev; COLORREF ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index 56921d68fc3..2cf0a6f681e 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -166,8 +166,9 @@ BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, - OUTLINETEXTMETRICW *otm, ULONG opts); + OUTLINETEXTMETRICW *otm, ULONG opts ); INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ); +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ); INT WINAPI NtGdiGetRandomRgn( HDC hdc, HRGN region, INT code ); DWORD WINAPI NtGdiGetRegionData( HRGN hrgn, DWORD count, RGNDATA *data ); INT WINAPI NtGdiGetRgnBox( HRGN hrgn, RECT *rect );

1 0

Gerald Pfeifer : nsiproxy: Include sys/socket.h.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 49a1f9cf282ed38c7b1e4d584e06cb06c0c01f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=49a1f9cf282ed38c7b1e4d58… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jul 22 12:21:43 2021 +0200 nsiproxy: Include sys/socket.h. This addresses invalid use of undefined type 'struct sock addr' and AF_INET being unknown when building on FreeBSD 11.x. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> 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 ab1b6294bea..93fdefa24cc 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -21,6 +21,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif

1 0

Francois Gouget : oleaut32/tests: Show the input string when VarFormatCurrency() fails.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: b0a7a6527c57d6c0b2266fb70f66f01f975162b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0a7a6527c57d6c0b2266fb7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 23 13:19:12 2021 +0200 oleaut32/tests: Show the input string when VarFormatCurrency() fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d1951b85a61..55190574ca9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -639,14 +639,14 @@ static void test_VarFormatCurrency(void) V_VT(&in) = VT_BSTR; V_BSTR(&in) = str; hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x for %s\n", hr, wine_dbgstr_w(str)); ok(lstrcmpW(str, str2), "Expected different string.\n"); SysFreeString(str2); V_VT(&in) = VT_BSTR | VT_BYREF; V_BSTRREF(&in) = &str; hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x for %s\n", hr, wine_dbgstr_w(str)); ok(lstrcmpW(str, str2), "Expected different string.\n"); SysFreeString(str);

1 0

Alexandre Julliard : ntdll: Always clear the returned handle in Nt object functions.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 3fb4d1f779770eab44d3f56fb9e95899b3791ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb4d1f779770eab44d3f56f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:14:08 2021 +0200 ntdll: Always clear the returned handle in Nt object functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 9 +- dlls/ntdll/tests/om.c | 310 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/file.c | 5 +- dlls/ntdll/unix/process.c | 2 + dlls/ntdll/unix/registry.c | 9 +- dlls/ntdll/unix/security.c | 5 + dlls/ntdll/unix/server.c | 2 + dlls/ntdll/unix/sync.c | 37 ++++-- dlls/ntdll/unix/thread.c | 2 + 9 files changed, 354 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fb4d1f779770eab44d3…

1 0

Alexandre Julliard : wow64: Add thunks for the event syscalls.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 8b8b92e1ff553209a8eeb2bb8d78936fec9c98b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8b92e1ff553209a8eeb2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 16:43:28 2021 +0200 wow64: Add thunks for the event syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/struct32.h | 34 ++++++++++++ dlls/wow64/sync.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 9 ++- dlls/wow64/wow64_private.h | 63 +++++++++++++++++++++ 5 files changed, 239 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 8dc4dac5ba7..76e3ff97d6b 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f000000 C_SRCS = \ + sync.c \ syscall.c diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h new file mode 100644 index 00000000000..e8b2e22cdcf --- /dev/null +++ b/dlls/wow64/struct32.h @@ -0,0 +1,34 @@ +/* + * 32-bit version of ntdll structures + * + * Copyright 2021 Alexandre Julliard + * + * 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 __WOW64_STRUCT32_H +#define __WOW64_STRUCT32_H + +typedef struct +{ + ULONG Length; + ULONG RootDirectory; + ULONG ObjectName; + ULONG Attributes; + ULONG SecurityDescriptor; + ULONG SecurityQualityOfService; +} OBJECT_ATTRIBUTES32; + +#endif /* __WOW64_STRUCT32_H */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c new file mode 100644 index 00000000000..d61eed0a22d --- /dev/null +++ b/dlls/wow64/sync.c @@ -0,0 +1,133 @@ +/* + * WoW64 synchronization objects and functions + * + * Copyright 2021 Alexandre Julliard + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64_private.h" + + +/********************************************************************** + * wow64_NtClearEvent + */ +NTSTATUS WINAPI wow64_NtClearEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + + return NtClearEvent( handle ); +} + + +/********************************************************************** + * wow64_NtCreateEvent + */ +NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + EVENT_TYPE type = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateEvent( &handle, access, objattr_32to64( &attr, attr32 ), type, state ); + put_handle( handle_ptr, handle ); + return status; +} + + +/********************************************************************** + * wow64_NtOpenEvent + */ +NTSTATUS WINAPI wow64_NtOpenEvent( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenEvent( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + +/********************************************************************** + * wow64_NtPulseEvent + */ +NTSTATUS WINAPI wow64_NtPulseEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtPulseEvent( handle, prev_state ); +} + + +/********************************************************************** + * wow64_NtQueryEvent + */ +NTSTATUS WINAPI wow64_NtQueryEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + EVENT_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryEvent( handle, class, info, len, retlen ); +} + + +/********************************************************************** + * wow64_NtResetEvent + */ +NTSTATUS WINAPI wow64_NtResetEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtResetEvent( handle, prev_state ); +} + + +/********************************************************************** + * wow64_NtSetEvent + */ +NTSTATUS WINAPI wow64_NtSetEvent( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_state = get_ptr( &args ); + + return NtSetEvent( handle, prev_state ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 583af0db476..df9da2261bb 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,15 +25,22 @@ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ + SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtCreateEvent ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ - SYSCALL_ENTRY( NtSetDefaultUILanguage ) + SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ + SYSCALL_ENTRY( NtSetEvent ) #endif /* __WOW64_SYSCALL_H */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c441f1bf481..affd39df03b 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -22,6 +22,7 @@ #define __WOW64_PRIVATE_H #include "syscall.h" +#include "struct32.h" #define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN; ALL_SYSCALLS @@ -30,6 +31,13 @@ ALL_SYSCALLS extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; +struct object_attr64 +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + SECURITY_DESCRIPTOR sd; +}; + static inline void *get_rva( HMODULE module, DWORD va ) { return (void *)((char *)module + va); @@ -53,4 +61,59 @@ static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } +static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) +{ + if (!str32) return NULL; + str->Length = str32->Length; + str->MaximumLength = str32->MaximumLength; + str->Buffer = ULongToPtr( str32->Buffer ); + return str; +} + +static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, const SECURITY_DESCRIPTOR *in ) +{ + /* relative descr has the same layout for 32 and 64 */ + const SECURITY_DESCRIPTOR_RELATIVE *sd = (const SECURITY_DESCRIPTOR_RELATIVE *)in; + + if (!in) return NULL; + out->Revision = sd->Revision; + out->Sbz1 = sd->Sbz1; + out->Control = sd->Control & ~SE_SELF_RELATIVE; + if (sd->Control & SE_SELF_RELATIVE) + { + if (sd->Owner) out->Owner = (PSID)((BYTE *)sd + sd->Owner); + if (sd->Group) out->Group = (PSID)((BYTE *)sd + sd->Group); + if ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) out->Sacl = (PSID)((BYTE *)sd + sd->Sacl); + if ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) out->Dacl = (PSID)((BYTE *)sd + sd->Dacl); + } + else + { + out->Owner = ULongToPtr( sd->Owner ); + out->Group = ULongToPtr( sd->Group ); + if (sd->Control & SE_SACL_PRESENT) out->Sacl = ULongToPtr( sd->Sacl ); + if (sd->Control & SE_DACL_PRESENT) out->Dacl = ULongToPtr( sd->Dacl ); + } + return out; +} + +static inline OBJECT_ATTRIBUTES *objattr_32to64( struct object_attr64 *out, const OBJECT_ATTRIBUTES32 *in ) +{ + memset( out, 0, sizeof(*out) ); + if (!in) return NULL; + if (in->Length != sizeof(*in)) return &out->attr; + + out->attr.Length = sizeof(out->attr); + out->attr.RootDirectory = LongToHandle( in->RootDirectory ); + out->attr.Attributes = in->Attributes; + out->attr.ObjectName = unicode_str_32to64( &out->str, ULongToPtr( in->ObjectName )); + out->attr.SecurityQualityOfService = ULongToPtr( in->SecurityQualityOfService ); + out->attr.SecurityDescriptor = secdesc_32to64( &out->sd, ULongToPtr( in->SecurityDescriptor )); + return &out->attr; +} + +static inline void put_handle( ULONG *handle32, HANDLE handle ) +{ + *handle32 = HandleToULong( handle ); +} + #endif /* __WOW64_PRIVATE_H */

1 0

Alexandre Julliard : wow64: Add thunks for the mutant syscalls.
by Alexandre Julliard 23 Jul '21

23 Jul '21

Module: wine Branch: master Commit: 2b0931182b49d31db9987080cdcea872ca5c817b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0931182b49d31db9987080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 16:48:03 2021 +0200 wow64: Add thunks for the mutant syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 ++++ 2 files changed, 72 insertions(+) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index d61eed0a22d..2ca7764c3cd 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -62,6 +62,27 @@ NTSTATUS WINAPI wow64_NtCreateEvent( UINT *args ) } +/********************************************************************** + * wow64_NtCreateMutant + */ +NTSTATUS WINAPI wow64_NtCreateMutant( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + BOOLEAN owned = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateMutant( &handle, access, objattr_32to64( &attr, attr32 ), owned ); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtOpenEvent */ @@ -82,6 +103,26 @@ NTSTATUS WINAPI wow64_NtOpenEvent( UINT *args ) } +/********************************************************************** + * wow64_NtOpenMutant + */ +NTSTATUS WINAPI wow64_NtOpenMutant( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenMutant( &handle, access, objattr_32to64( &attr, attr32 )); + put_handle( handle_ptr, handle ); + return status; +} + + /********************************************************************** * wow64_NtPulseEvent */ @@ -109,6 +150,33 @@ NTSTATUS WINAPI wow64_NtQueryEvent( UINT *args ) } +/********************************************************************** + * wow64_NtQueryMutant + */ +NTSTATUS WINAPI wow64_NtQueryMutant( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + MUTANT_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + return NtQueryMutant( handle, class, info, len, retlen ); +} + + +/********************************************************************** + * wow64_NtReleaseMutant + */ +NTSTATUS WINAPI wow64_NtReleaseMutant( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + LONG *prev_count = get_ptr( &args ); + + return NtReleaseMutant( handle, prev_count ); +} + + /********************************************************************** * wow64_NtResetEvent */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index df9da2261bb..8481db2a587 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,16 +28,20 @@ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateMutant ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenMutant ) \ SYSCALL_ENTRY( NtPulseEvent ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ SYSCALL_ENTRY( NtQueryEvent ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtQueryMutant ) \ + SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtResetEvent ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \

1 0