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

Jacek Caban : gdi32: Use ntgdi interface for SetMapMode implementation.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: f7824d43829b2ca6ae496074057e2e2766ec328b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7824d43829b2ca6ae496074… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:57 2021 +0200 gdi32: Use ntgdi interface for SetMapMode 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/dc.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mapping.c | 33 +++++++++------------------------ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 + include/ntgdi.h | 5 +++++ 12 files changed, 67 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7824d43829b2ca6ae49…

1 0

Jacek Caban : gdi32: Store char_extra in DC_ATTR.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: ca07de0ed5f6da42db9eda8df90721aaa4d51edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca07de0ed5f6da42db9eda8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:13 2021 +0200 gdi32: Store char_extra in DC_ATTR. 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/dc.c | 5 ++--- dlls/gdi32/font.c | 28 ++++++++-------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index be3c2e741c4..5f2f129532c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -95,7 +95,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->brush_org.y = 0; dc->mapperFlags = 0; dc->attr->text_align = TA_LEFT | TA_TOP | TA_NOUPDATECP; - dc->charExtra = 0; + dc->attr->char_extra = 0; dc->breakExtra = 0; dc->breakRem = 0; dc->attr->map_mode = MM_TEXT; @@ -413,7 +413,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->brush_org = dcs->attr->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; - dc->charExtra = dcs->charExtra; + dc->attr->char_extra = dcs->attr->char_extra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; dc->attr->map_mode = dcs->attr->map_mode; @@ -545,7 +545,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; newdc->mapperFlags = dc->mapperFlags; - newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 039976dbc16..2590a30c10b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,20 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * GetTextCharacterExtra (GDI32.@) - */ -INT WINAPI GetTextCharacterExtra( HDC hdc ) -{ - INT ret; - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0x80000000; - ret = dc->charExtra; - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * SetTextCharacterExtra (GDI32.@) */ @@ -4763,8 +4749,8 @@ INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); if (extra != 0x80000000) { - ret = dc->charExtra; - dc->charExtra = extra; + ret = dc->attr->char_extra; + dc->attr->char_extra = extra; } release_dc_ptr( dc ); } @@ -4943,14 +4929,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } @@ -5080,14 +5067,15 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index adef8f45aeb..0c2d794a576 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -305,6 +305,15 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) return NtGdiGetAndSetDCDword( hdc, NtGdiSetMapMode, mode, &ret ) ? ret : 0; } +/*********************************************************************** + * GetTextCharacterExtra (GDI32.@) + */ +INT WINAPI GetTextCharacterExtra( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->char_extra : 0x80000000; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 7270a158942..bf100ea4248 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -111,7 +111,6 @@ typedef struct tagDC UINT font_code_page; DWORD mapperFlags; /* Font mapper flags */ - INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ ABORTPROC pAbortProc; /* AbortProc for Printing */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 8eb5562db80..7c183caf99f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -125,6 +125,7 @@ typedef struct DC_ATTR WORD rel_abs_mode; WORD stretch_blt_mode; INT map_mode; + INT char_extra; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; POINT brush_org; /* brush origin */

1 0

Jacek Caban : gdi32: Use DC_ATTR for SetTextCharacterExtra implementation.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: f37e4ff931e96d8380d24e0afb55eeb4a8e08eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37e4ff931e96d8380d24e0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:28 2021 +0200 gdi32: Use DC_ATTR for SetTextCharacterExtra 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/font.c | 23 ----------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2590a30c10b..3cc965627b4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,29 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * SetTextCharacterExtra (GDI32.@) - */ -INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) -{ - INT ret = 0x80000000; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextCharacterExtra ); - extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); - if (extra != 0x80000000) - { - ret = dc->attr->char_extra; - dc->attr->char_extra = extra; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiSetTextJustification (win32u.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0ef6cc121d8..ef4541e2543 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -76,6 +76,7 @@ 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_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; extern BOOL METADC_SetMapMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0c2d794a576..6372ac7d75d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -314,6 +314,21 @@ INT WINAPI GetTextCharacterExtra( HDC hdc ) return dc_attr ? dc_attr->char_extra : 0x80000000; } +/*********************************************************************** + * SetTextCharacterExtra (GDI32.@) + */ +INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (is_meta_dc( hdc )) return METADC_SetTextCharacterExtra( hdc, extra ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0x8000000; + ret = dc_attr->char_extra; + dc_attr->char_extra = extra; + return ret; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 791d812a147..659c41396d1 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -140,9 +140,9 @@ BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); } -INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) +BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) { - return MFDRV_MetaParam1( dev, META_SETTEXTCHAREXTRA, extra ) ? extra : 0x80000000; + return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); } DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 6e847379563..30c16324c3b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -198,7 +198,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ + NULL, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetTextJustification */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 264cece30ee..ed41b9fb67d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -105,7 +105,6 @@ extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLS extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Store mapper flags in DC_ATTR.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 6cb07a716cbf7581a2829940d514e4889ef2c551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb07a716cbf7581a2829940… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:43 2021 +0200 gdi32: Store mapper flags in DC_ATTR. 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/dc.c | 7 +++---- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 12 files changed, 28 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cb07a716cbf7581a282…

1 0

Jacek Caban : gdi32: Use ntgdi interface for SetLayout implementation.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 22df510eff3ee66bf02230b46eefef64a5bd8f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22df510eff3ee66bf02230b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:55 2021 +0200 gdi32: Use ntgdi interface for SetLayout 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/dc.c | 24 ++++++++++++++---------- dlls/gdi32/driver.c | 13 +------------ dlls/gdi32/enhmfdrv/dc.c | 11 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 2 +- 11 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22df510eff3ee66bf022…

1 0

Rémi Bernon : xinput1_3: Introduce new find_opened_device helper.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 828b9b8cc49fe24a306235c056a38c7ae079560f URL: https://source.winehq.org/git/wine.git/?a=commit;h=828b9b8cc49fe24a306235c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 17:12:06 2021 +0200 xinput1_3: Introduce new find_opened_device helper. To look for already opened device, or available device index. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 0f4dec44ee3..e7a77813c71 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -71,6 +71,20 @@ struct hid_platform_private { static DWORD last_check = 0; +static BOOL find_opened_device(xinput_controller *devices, SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +{ + struct hid_platform_private *private; + int i; + + *free_slot = XUSER_MAX_COUNT; + for (i = XUSER_MAX_COUNT; i > 0; i--) + { + if (!(private = devices[i - 1].platform_private)) *free_slot = i - 1; + else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; + } + return FALSE; +} + static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) { struct axis_info info = {min, max-min, bits}; @@ -219,7 +233,7 @@ void HID_find_gamepads(xinput_controller *devices) HIDP_CAPS caps; NTSTATUS status; DWORD idx; - int i, open_device_idx; + int i; idx = GetTickCount(); if ((idx - last_check) < 2000) @@ -255,24 +269,9 @@ void HID_find_gamepads(xinput_controller *devices) if (!wcsstr(data->DevicePath, L"IG_")) continue; - open_device_idx = -1; - for (i = 0; i < XUSER_MAX_COUNT; i++) - { - struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].platform_private) - { - if (!wcscmp(data->DevicePath, private->device_path)) - break; - } - else if(open_device_idx < 0) - open_device_idx = i; - } - if (i != XUSER_MAX_COUNT) - /* this device is already opened */ - continue; - if (open_device_idx < 0) - /* no open device slots */ - break; + if (find_opened_device(devices, data, &i)) continue; /* already opened */ + if (i == XUSER_MAX_COUNT) break; /* no more slots */ + device = CreateFileW(data->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (device == INVALID_HANDLE_VALUE) continue; @@ -286,7 +285,7 @@ void HID_find_gamepads(xinput_controller *devices) WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&devices[open_device_idx], ppd, &caps, device, data->DevicePath)) + else if (!init_controller(&devices[i], ppd, &caps, device, data->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else goto done;

1 0

Alexandre Julliard : ntdll: Add a helper function to get the iosb pointer to pass to the server.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 156c34ea03478329600b6fe1a6890155128e6640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=156c34ea03478329600b6fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:42:57 2021 +0200 ntdll: Add a helper function to get the iosb pointer to pass to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 43 +++++++++++++++++++++--------------------- dlls/ntdll/unix/socket.c | 12 +++++++----- dlls/ntdll/unix/unix_private.h | 9 +++++++-- 3 files changed, 36 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=156c34ea03478329600b…

1 0

Alexandre Julliard : ntdll: Only update the I/O status block at function exit.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 28754a04efed73df2a56b8ade0df691aafbd909e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28754a04efed73df2a56b8ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:55:11 2021 +0200 ntdll: Only update the I/O status block at function exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 215 +++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28754a04efed73df2a56…

1 0

Alexandre Julliard : ntdll: Set the I/O status block through the 32-bit pointer for Wow64 processes.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 61b123fae960766df8f51cff8be195e6755429c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61b123fae960766df8f51cff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 19:36:28 2021 +0200 ntdll: Set the I/O status block through the 32-bit pointer for Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/serial.c | 20 ++++++-------------- dlls/ntdll/unix/server.c | 4 +--- dlls/ntdll/unix/unix_private.h | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1d720c863f4..712f94ec43f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1966,7 +1966,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni OBJECT_ATTRIBUTES attr; UNICODE_STRING string; char *unix_name; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; HANDLE mountmgr; NTSTATUS status; int letter; @@ -4937,7 +4937,7 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); @@ -5024,7 +5024,7 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index e76e49ca69d..d7f3edf4330 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -407,7 +407,7 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd ) */ static BOOL is_unix_console_handle( HANDLE handle ) { - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_IS_UNIX, NULL, 0, NULL, 0 ); } diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 9454185e172..ab2ef9330a5 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -841,7 +841,7 @@ typedef struct async_commio { HANDLE hDevice; DWORD* events; - IO_STATUS_BLOCK* iosb; + client_ptr_t iosb; HANDLE hEvent; DWORD evtmask; DWORD cookie; @@ -995,23 +995,15 @@ static void CALLBACK wait_for_event(LPVOID arg) } if (needs_close) close( fd ); } - if (commio->iosb) - { - if (*commio->events) - { - commio->iosb->u.Status = STATUS_SUCCESS; - commio->iosb->Information = sizeof(DWORD); - } - else - commio->iosb->u.Status = STATUS_CANCELLED; - } + if (*commio->events) set_async_iosb( commio->iosb, STATUS_SUCCESS, sizeof(DWORD) ); + else set_async_iosb( commio->iosb, STATUS_CANCELLED, 0 ); stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); free( commio ); NtTerminateThread( GetCurrentThread(), 0 ); } -static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, DWORD* events) +static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, client_ptr_t iosb_ptr, DWORD* events) { async_commio* commio; NTSTATUS status; @@ -1025,7 +1017,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->hDevice = hDevice; commio->events = events; - commio->iosb = piosb; + commio->iosb = iosb_ptr; commio->hEvent = hEvent; commio->pending_write = 0; status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); @@ -1315,7 +1307,7 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo case IOCTL_SERIAL_WAIT_ON_MASK: if (out_buffer && out_size == sizeof(DWORD)) { - if (!(status = wait_on(device, fd, event, io, out_buffer))) + if (!(status = wait_on(device, fd, event, iosb_client_ptr(io), out_buffer))) sz = sizeof(DWORD); } else diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 2ec70db9390..986eb6c3250 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -377,7 +377,6 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO break; case APC_ASYNC_IO: { - IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); ULONG_PTR info = 0; @@ -386,8 +385,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (result->async_io.status != STATUS_PENDING) { result->async_io.total = info; - iosb->Status = result->async_io.status; - iosb->Information = info; + set_async_iosb( call->async_io.sb, result->async_io.status, info ); } break; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c4af5831cdb..61c290c156d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -354,8 +354,42 @@ static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) return NtWaitForSingleObject( handle, alertable, NULL ); } +static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR info ) +{ + if (!iosb) return; +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + struct iosb32 + { + NTSTATUS Status; + ULONG Information; + } *io = wine_server_get_ptr( iosb ); + io->Status = status; + io->Information = info; + } + else +#endif + { + IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); +#ifdef NONAMELESSUNION + io->u.Status = status; +#else + io->Status = status; +#endif + io->Information = info; + } +} + static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) { +#ifdef _WIN64 +#ifdef NONAMELESSUNION + if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->u.Pointer ); +#else + if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->Pointer ); +#endif +#endif return wine_server_client_ptr( io ); }

1 0

Rémi Bernon : hidclass.sys: Introduce new hid_device_xfer_report helper.
by Alexandre Julliard Aug. 5, 2021

Aug. 5, 2021

Module: wine Branch: master Commit: 6fd356e009faa11456f811de2f2aa399837ecb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd356e009faa11456f811de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:07 2021 +0200 hidclass.sys: Introduce new hid_device_xfer_report helper. >From HID_IOCTL_GET_INPUT_REPORT code, to factor report buffer transfer, and use it for HID_IOCTL_GET_FEATURE. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 100 ++++++++++++----------------------- dlls/ntoskrnl.exe/tests/driver_hid.c | 3 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 ++-- 3 files changed, 39 insertions(+), 74 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a7cb6a843e0..81ddd7e6d7e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -299,46 +299,48 @@ static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHOR } } -static void HID_get_feature( BASE_DEVICE_EXTENSION *ext, IRP *irp ) +static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - HID_XFER_PACKET *packet; - DWORD len; - BYTE *out_buffer; - - irp->IoStatus.Information = 0; + 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; + HID_XFER_PACKET packet; - out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); - TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + switch (code) + { + case IOCTL_HID_GET_INPUT_REPORT: + report_len = preparsed->caps.InputReportByteLength; + break; + case IOCTL_HID_GET_FEATURE: + report_len = preparsed->caps.FeatureReportByteLength; + break; + } - if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !out_buffer) + if (!buffer) { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; + return; + } + if (buffer_len < report_len) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } - len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet = malloc(len); - packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); - packet->reportId = out_buffer[0]; - - TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - - call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet), - &irp->IoStatus ); + packet.reportId = buffer[0]; + packet.reportBuffer = buffer; + packet.reportBufferLen = buffer_len; - if (irp->IoStatus.Status == STATUS_SUCCESS) + if (!report_id) { - irp->IoStatus.Information = packet->reportBufferLen; - memcpy(out_buffer, packet->reportBuffer, packet->reportBufferLen); + packet.reportId = 0; + packet.reportBuffer++; + packet.reportBufferLen--; } - else - irp->IoStatus.Information = 0; - - TRACE_(hid_report)( "Result 0x%x get %li bytes\n", irp->IoStatus.Status, irp->IoStatus.Information ); - free(packet); + call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); } static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) @@ -390,10 +392,9 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; - BYTE report_id = HID_INPUT_VALUE_CAPS( data )->report_id; NTSTATUS status; BOOL removed; + ULONG code; KIRQL irql; irp->IoStatus.Information = 0; @@ -411,7 +412,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } - switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n"); @@ -469,38 +470,6 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR( irp, ext ); break; } - case IOCTL_HID_GET_INPUT_REPORT: - { - HID_XFER_PACKET packet; - ULONG buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; - BYTE *buffer = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); - - if (!buffer) - { - irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; - break; - } - if (buffer_len < data->caps.InputReportByteLength) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - break; - } - - packet.reportId = buffer[0]; - packet.reportBuffer = buffer; - packet.reportBufferLen = buffer_len; - - if (!report_id) - { - packet.reportId = 0; - packet.reportBuffer++; - packet.reportBufferLen--; - } - - call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, - sizeof(packet), &irp->IoStatus ); - break; - } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: { irp->IoStatus.Information = 0; @@ -527,7 +496,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } case IOCTL_HID_GET_FEATURE: - HID_get_feature( ext, irp ); + case IOCTL_HID_GET_INPUT_REPORT: + hid_device_xfer_report( ext, code, irp ); break; case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 831b08c5c97..d268b62d288 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -570,9 +570,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) + todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - todo_wine_if(packet->reportBufferLen == 16) 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 17d82fa3482..f5ebf21b7f9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2486,13 +2486,11 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, 0); ok(!ret, "HidD_GetFeature succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength - 1); - todo_wine ok(!ret, "HidD_GetFeature succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetFeature returned error %u\n", GetLastError()); @@ -2510,21 +2508,19 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled else { ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - todo_wine ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); + ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); } SetLastError(0xdeadbeef); ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength); ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - todo_wine_if(!report_id) ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); value = caps.FeatureReportByteLength * 2; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &value); ok(ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "got length %u, expected 3\n", value); - todo_wine_if(!report_id) + ok(value == 3, "got length %u, expected 3\n", value); ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id);

1 0