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

Stefan Dösinger : d3d11/tests: Fix a gcc -Wmisleading-indentation warning.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 9e725a6d58db36d2cfe5a56fec9170b94f7b8ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e725a6d58db36d2cfe5a56f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 5 20:56:57 2021 +0300 d3d11/tests: Fix a gcc -Wmisleading-indentation warning. Because the ID3D11Asynchronous_Release(query) line is indented 4 spaces more than the if condition gcc thinks the code is misleading. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6073fae26d9..ae3020e130d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5856,9 +5856,11 @@ static void test_occlusion_query(void) get_query_data(context, query, &data, sizeof(data)); /* This test occasionally succeeds with CSMT enabled because of a race condition. */ -if (0) - todo_wine ok(data.dword[0] == 0x1000 && !data.dword[1], - "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + if (0) + { + todo_wine ok(data.dword[0] == 0x1000 && !data.dword[1], + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + } ID3D11Asynchronous_Release(query); ID3D11RenderTargetView_Release(rtv);

1 0

Paul Gofman : jscript: Avoid use after free in JSON_parse().
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 6b22f2bd6003ccc1849900dad0c356cb295d3469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b22f2bd6003ccc1849900da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 6 16:56:49 2021 +0200 jscript: Avoid use after free in JSON_parse(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index a8014f95b4f..f2fbb80dc09 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -291,16 +291,14 @@ static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign parse_ctx.end = buf + jsstr_length(str); parse_ctx.ctx = ctx; hres = parse_json_value(&parse_ctx, &ret); + if(SUCCEEDED(hres) && skip_spaces(&parse_ctx)) { + FIXME("syntax error\n"); + hres = E_FAIL; + } jsstr_release(str); if(FAILED(hres)) return hres; - if(skip_spaces(&parse_ctx)) { - FIXME("syntax error\n"); - jsval_release(ret); - return E_FAIL; - } - if(r) *r = ret; else

1 0

Jacek Caban : gdi32: Support StockFlag in GDI_HANDLE_ENTRY.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 6d28f3029cff9c7ead5a06e81b28b8e5a3cddbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d28f3029cff9c7ead5a06e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 6 15:59:07 2021 +0100 gdi32: Support StockFlag in GDI_HANDLE_ENTRY. 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/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 1 - include/ntgdi.h | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16a7b897e30..326414372e6 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -613,6 +613,16 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } +static HGDIOBJ make_stock_object( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry; + + if (!(entry = handle_entry( obj ))) return 0; + entry_obj( entry )->system = TRUE; + entry->StockFlag = 1; + return entry_to_handle( entry ); +} + /*********************************************************************** * DllMain * @@ -668,8 +678,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) { - if (stock_objects[i]) __wine_make_gdi_object_system( stock_objects[i], TRUE ); - if (scaled_stock_objects[i]) __wine_make_gdi_object_system( scaled_stock_objects[i], TRUE ); + stock_objects[i] = make_stock_object( stock_objects[i] ); + scaled_stock_objects[i] = make_stock_object( scaled_stock_objects[i] ); } return TRUE; } diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 789c9ecb0f8..64d37e39ab6 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -396,7 +396,6 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st todo_wine ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); } - todo_wine_if(is_stock) ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); diff --git a/include/ntgdi.h b/include/ntgdi.h index d023d10bfc6..d6d7a5572d1 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -67,8 +67,9 @@ typedef struct _GDI_HANDLE_ENTRY /* Wine extension, native uses NTGDI_OBJ_DC */ #define NTGDI_OBJ_MEMDC 0x41 -#define NTGDI_HANDLE_TYPE_SHIFT 16 -#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_TYPE_SHIFT 16 +#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_STOCK_OBJECT 0x00800000 typedef struct _GDI_SHARED_MEMORY {

1 0

Jacek Caban : gdi32: Use NtGdiScaleViewportExtEx for ScaleViewportExtEx implementation.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 97417821ae1d588abf4792a1a26b1064bbc30eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=97417821ae1d588abf4792a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 6 15:59:08 2021 +0100 gdi32: Use NtGdiScaleViewportExtEx for ScaleViewportExtEx 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 | 20 +++++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 14 +++++++++++ dlls/gdi32/mapping.c | 48 ++++++++++++++++++------------------ dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 52 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97417821ae1d588abf47…

1 0

Jacek Caban : gdi32: Use NtGdiScaleWindowExtEx for ScaleWindowExtEx implementation.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 47b0f2f64e6bdbe7d8d4a5870ea31afd6a14731e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b0f2f64e6bdbe7d8d4a587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 6 15:59:09 2021 +0100 gdi32: Use NtGdiScaleWindowExtEx for ScaleWindowExtEx 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 | 15 ++++++--------- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mapping.c | 48 +++++++++++++++++++++++----------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f544a5ab998..6b843b5a641 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -309,20 +309,17 @@ BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_n return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pScaleWindowExtEx ); EMRSCALEWINDOWEXTEX emr; emr.emr.iType = EMR_SCALEWINDOWEXTEX; emr.emr.nSize = sizeof(emr); - emr.xNum = xNum; - emr.xDenom = xDenom; - emr.yNum = yNum; - emr.yDenom = yDenom; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size ); + emr.xNum = x_num; + emr.xDenom = x_denom; + emr.yNum = y_num; + emr.yDenom = y_denom; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5b7c27f5fe1..b104d58b6be 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -115,7 +115,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ NULL, /* pScaleViewportExtEx */ - EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ + NULL, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 895525317cc..ebea5565725 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -77,6 +77,8 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, + INT y_denom ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetLayout( HDC hdc, DWORD layout ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; @@ -140,6 +142,8 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT extern BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, 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_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 341944c70da..f3afb75a67e 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1247,6 +1247,21 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, return NtGdiScaleViewportExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); } +/*********************************************************************** + * ScaleWindowExtEx (GDI32.@) + */ +BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_ScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ScaleWindowExtEx( dc_attr, x_num, x_denom, y_num, y_denom )) + return FALSE; + return NtGdiScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 09ecec4f717..189481c2e3e 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -118,20 +118,6 @@ BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) { - DC *dc = get_nulldrv_dc( dev ); - - if (size) - *size = dc->attr->wnd_ext; - - if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; - if (!x_num || !x_denom || !y_num || !y_denom) return FALSE; - - dc->attr->wnd_ext.cx = (dc->attr->wnd_ext.cx * x_num) / x_denom; - dc->attr->wnd_ext.cy = (dc->attr->wnd_ext.cy * y_num) / y_denom; - if (dc->attr->wnd_ext.cx == 0) dc->attr->wnd_ext.cx = 1; - if (dc->attr->wnd_ext.cy == 0) dc->attr->wnd_ext.cy = 1; - if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); - DC_UpdateXforms( dc ); return TRUE; } @@ -535,21 +521,35 @@ BOOL WINAPI NtGdiScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, /*********************************************************************** - * ScaleWindowExtEx (GDI32.@) + * NtGdiScaleWindowExtEx (win32u.@) */ -BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, - INT yNum, INT yDenom, LPSIZE size ) +BOOL WINAPI NtGdiScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, + INT y_num, INT y_denom, SIZE *size ) { - BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) + if ((!(dc = get_dc_ptr( hdc )))) return FALSE; + + if (size) *size = dc->attr->wnd_ext; + + if (dc->attr->map_mode == MM_ISOTROPIC || dc->attr->map_mode == MM_ANISOTROPIC) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pScaleWindowExtEx ); - ret = physdev->funcs->pScaleWindowExtEx( physdev, xNum, xDenom, yNum, yDenom, size ); - release_dc_ptr( dc ); + if (!x_num || !x_denom || !y_num || !y_denom) + { + release_dc_ptr( dc ); + return FALSE; + } + + dc->attr->wnd_ext.cx = (dc->attr->wnd_ext.cx * x_num) / x_denom; + dc->attr->wnd_ext.cy = (dc->attr->wnd_ext.cy * y_num) / y_denom; + if (dc->attr->wnd_ext.cx == 0) dc->attr->wnd_ext.cx = 1; + if (dc->attr->wnd_ext.cy == 0) dc->attr->wnd_ext.cy = 1; + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + DC_UpdateXforms( dc ); } - return ret; + + release_dc_ptr( dc ); + return TRUE; } diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index c96b1053eb5..fe89b0b6d5e 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -130,9 +130,9 @@ BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); } -BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) { - return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); + return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); } BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 9641887cb23..a860932d012 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -180,7 +180,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ NULL, /* pScaleViewportExtEx */ - MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ + NULL, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ MFDRV_SelectBrush, /* pSelectBrush */ MFDRV_SelectClipPath, /* pSelectClipPath */

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 5c1bbc4014e22f9f0ff4aafc1765db30dae934b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c1bbc4014e22f9f0ff4aafc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 6 15:59:10 2021 +0100 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=5c1bbc4014e22f9f0ff4…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Wait for second report first.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: a2c902e68ddafc4541a543dcf6eda9807cbea5f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c902e68ddafc4541a543dc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 09:49:33 2021 +0200 ntoskrnl.exe/tests: Wait for second report first. And increasing the polling period, so that first queued read is unlikely to complete before we queued the second one. This was meant to test that all pending reads are satisfied at once after a poll, but it causes some spurious failures as they aren't satisfied atomically (especially on Wine). As there's an increasing seq counter in each poll it should be enough to compare the report data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f5ebf21b7f9..6c4dacf3a2d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2710,12 +2710,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ok(!ret, "ReadFile succeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); - /* wait for first report to be ready */ - ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); + /* wait for second report to be ready */ + ret = GetOverlappedResult(async_file, &overlapped2, &value, TRUE); ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - /* second report should be ready and the same */ - ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE); + /* first report should be ready and the same */ + ret = GetOverlappedResult(async_file, &overlapped, &value, FALSE); ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), @@ -2839,7 +2839,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) todo_wine ok(poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq); out_len = 0; - poll_freq = 50; + poll_freq = 500; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); @@ -2850,14 +2850,14 @@ static void test_hid_device(DWORD report_id, DWORD polled) ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); out_len = sizeof(ULONG); SetLastError(0xdeadbeef); ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); } test_hidp(file, async_file, report_id, polled);

1 0

Rémi Bernon : hidclass.sys: Use hid_device_xfer_report for IOCTL_HID_SET_OUTPUT_REPORT.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: ada3ec64a623998b1f0ecc63692ff243cccac573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ada3ec64a623998b1f0ecc63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 09:49:34 2021 +0200 hidclass.sys: Use hid_device_xfer_report for IOCTL_HID_SET_OUTPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 32 +++++++++++++++++++++----------- dlls/ntoskrnl.exe/tests/driver_hid.c | 3 +-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 +++----- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 81ddd7e6d7e..8a57516d5d5 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -303,16 +303,32 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { const WINE_HIDP_PREPARSED_DATA *preparsed = ext->u.pdo.preparsed_data; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG report_len = 0, buffer_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; + ULONG report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; + BYTE *buffer = NULL; + + switch (code) + { + case IOCTL_HID_GET_FEATURE: + case IOCTL_HID_GET_INPUT_REPORT: + buffer_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + break; + case IOCTL_HID_SET_OUTPUT_REPORT: + buffer_len = stack->Parameters.DeviceIoControl.InputBufferLength; + buffer = irp->AssociatedIrp.SystemBuffer; + break; + } switch (code) { case IOCTL_HID_GET_INPUT_REPORT: report_len = preparsed->caps.InputReportByteLength; break; + case IOCTL_HID_SET_OUTPUT_REPORT: + report_len = preparsed->caps.OutputReportByteLength; + break; case IOCTL_HID_GET_FEATURE: report_len = preparsed->caps.FeatureReportByteLength; break; @@ -357,19 +373,13 @@ static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) { packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength - 1; - if (irpsp->Parameters.DeviceIoControl.IoControlCode == IOCTL_HID_SET_FEATURE) - max_len = data->caps.FeatureReportByteLength; - else - max_len = data->caps.OutputReportByteLength; + max_len = data->caps.FeatureReportByteLength; } else { packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; - if (irpsp->Parameters.DeviceIoControl.IoControlCode == IOCTL_HID_SET_FEATURE) - max_len = data->reports[data->reportIdx[HidP_Feature][packet.reportId]].bitSize; - else - max_len = data->reports[data->reportIdx[HidP_Output][packet.reportId]].bitSize; + max_len = data->reports[data->reportIdx[HidP_Feature][packet.reportId]].bitSize; max_len = (max_len + 7) / 8; } if (packet.reportBufferLen > max_len) @@ -497,10 +507,10 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_GET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: + case IOCTL_HID_SET_OUTPUT_REPORT: hid_device_xfer_report( ext, code, irp ); break; case IOCTL_HID_SET_FEATURE: - case IOCTL_HID_SET_OUTPUT_REPORT: HID_set_to_device( device, irp ); break; default: diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index d268b62d288..422b9b74daa 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -552,9 +552,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(in_size == sizeof(*packet), "got input size %u\n", in_size); todo_wine ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId != report_id) + todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 1) ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6c4dacf3a2d..b2b918001fe 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2581,14 +2581,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_SetOutputReport(file, report, 0); - todo_wine ok(!ret, "HidD_SetOutputReport succeeded\n"); + ok(!ret, "HidD_SetOutputReport succeeded\n"); todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = HidD_SetOutputReport(file, report, caps.OutputReportByteLength - 1); - todo_wine ok(!ret, "HidD_SetOutputReport succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetOutputReport returned error %u\n", GetLastError()); @@ -2615,13 +2613,13 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = caps.OutputReportByteLength * 2; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &value); - todo_wine ok(!ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n"); + ok(!ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n"); todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError()); value = 0; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, report, caps.OutputReportByteLength * 2, NULL, &value); ok(ret, "IOCTL_HID_SET_OUTPUT_REPORT failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "got length %u, expected 3\n", value); + ok(value == 3, "got length %u, expected 3\n", value); SetLastError(0xdeadbeef);

1 0

Rémi Bernon : hidclass.sys: Pass sizeof(packet) as input for IOCTL_HID_SET_OUTPUT_REPORT.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 98c512e026c92e4155e957786a55c2b394659d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c512e026c92e4155e95778… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 09:49:35 2021 +0200 hidclass.sys: Pass sizeof(packet) as input for IOCTL_HID_SET_OUTPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 11 ++++++++++- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 8a57516d5d5..123feeb6032 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -356,7 +356,16 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP packet.reportBufferLen--; } - call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); + switch (code) + { + case IOCTL_HID_GET_FEATURE: + case IOCTL_HID_GET_INPUT_REPORT: + call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); + break; + case IOCTL_HID_SET_OUTPUT_REPORT: + call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); + break; + } } static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 422b9b74daa..8ddbfe3850f 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -549,8 +549,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = irp->UserBuffer; ULONG expected_size = 2; - todo_wine ok(in_size == sizeof(*packet), "got input size %u\n", in_size); - todo_wine ok(!out_size, "got output size %u\n", out_size); + ok(in_size == sizeof(*packet), "got input size %u\n", in_size); + ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId);

1 0

Rémi Bernon : hidclass.sys: Return STATUS_INVALID_USER_BUFFER if buffer_len is 0.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 25409b899ccbd50743ca1572053a9e975cbb694c URL: https://source.winehq.org/git/wine.git/?a=commit;h=25409b899ccbd50743ca1572… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 09:49:36 2021 +0200 hidclass.sys: Return STATUS_INVALID_USER_BUFFER if buffer_len is 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 123feeb6032..e2a2e7c39d4 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -334,7 +334,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP break; } - if (!buffer) + if (!buffer || !buffer_len) { irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; return; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b2b918001fe..43a87add0f9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2582,7 +2582,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_SetOutputReport(file, report, 0); ok(!ret, "HidD_SetOutputReport succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = HidD_SetOutputReport(file, report, caps.OutputReportByteLength - 1); @@ -2614,7 +2614,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &value); ok(!ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError()); value = 0; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, report, caps.OutputReportByteLength * 2, NULL, &value);

1 0