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

Jacek Caban : gdi32: Avoid using MFDRV_MetaParam* helpers.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: a3368089fb45975df4e819ebb232008fd1228416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3368089fb45975df4e819eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:38:06 2021 +0200 gdi32: Avoid using MFDRV_MetaParam* helpers. 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/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 13 +++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 13 +------------ dlls/gdi32/mfdrv/objects.c | 24 ++++++++++++------------ 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 933ad0c682c..248de986cee 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -340,7 +340,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[10] = rgndata->rdh.rcBound.bottom; mr->rdFunction = META_CREATEREGION; mr->rdSize = Param - (WORD *)mr; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); + ret = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); HeapFree( GetProcessHeap(), 0, rgndata ); if(!ret) @@ -363,7 +363,7 @@ BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_PAINTREGION, index ); + return metadc_param1( hdc, META_PAINTREGION, index ); } @@ -378,7 +378,7 @@ BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) index = MFDRV_CreateRegion( &mf->dev, hrgn ); if(index == -1) return FALSE; - return MFDRV_MetaParam1( &mf->dev, META_INVERTREGION, index ); + return metadc_param1( hdc, META_INVERTREGION, index ); } @@ -398,7 +398,7 @@ BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam2( &mf->dev, META_FILLREGION, iRgn, iBrush ); + return metadc_param2( hdc, META_FILLREGION, iRgn, iBrush ); } /********************************************************************** @@ -424,7 +424,7 @@ BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) iBrush = MFDRV_CreateBrushIndirect( &mf->dev, hbrush ); if(!iBrush) return FALSE; - return MFDRV_MetaParam4( &mf->dev, META_FRAMEREGION, iRgn, iBrush, x, y ); + return metadc_param4( hdc, META_FRAMEREGION, iRgn, iBrush, x, y ); } @@ -442,8 +442,8 @@ BOOL METADC_ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT mode ) if (!hrgn) return NULLREGION; iRgn = MFDRV_CreateRegion( &metadc->dev, hrgn ); if(iRgn == -1) return ERROR; - ret = MFDRV_MetaParam1( &metadc->dev, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; - MFDRV_MetaParam1( &metadc->dev, META_DELETEOBJECT, iRgn ); + ret = metadc_param1( hdc, META_SELECTOBJECT, iRgn ) ? NULLREGION : ERROR; + metadc_param1( hdc, META_DELETEOBJECT, iRgn ); MFDRV_RemoveHandle( &metadc->dev, iRgn ); return ret; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e841f0c0fc0..345618ead08 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -378,7 +378,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) * in SDK Knowledgebase Q99334. */ - if (!MFDRV_MetaParam0(dc->physDev, META_EOF)) + if (!metadc_param0( hdc, META_EOF )) { free_dc_ptr( dc ); return 0; @@ -581,12 +581,17 @@ struct metadc *get_metadc_ptr( HDC hdc ) return metafile; } +BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, unsigned int rlen ) +{ + return MFDRV_WriteRecord( &metadc->dev, mr, rlen ); +} + BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) { - struct metadc *dev; + struct metadc *metadc; - if (!(dev = get_metadc_ptr( hdc ))) return FALSE; - return MFDRV_WriteRecord( &dev->dev, mr, rlen ); + if (!(metadc = get_metadc_ptr( hdc ))) return FALSE; + return metadc_write_record( metadc, mr, rlen ); } BOOL metadc_param1( HDC hdc, short func, short param ) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b986855540e..2cb8ab9a5f1 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -46,18 +46,6 @@ struct metadc #define HANDLE_LIST_INC 20 -extern BOOL MFDRV_MetaParam0(PHYSDEV dev, short func) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6) DECLSPEC_HIDDEN; -extern BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, - short param3, short param4, short param5, - short param6, short param7, short param8) DECLSPEC_HIDDEN; -extern BOOL MFDRV_WriteRecord(PHYSDEV dev, METARECORD *mr, DWORD rlen) DECLSPEC_HIDDEN; extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; @@ -76,6 +64,7 @@ extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6, short param7, short param8 ) DECLSPEC_HIDDEN; extern BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN; +extern BOOL metadc_write_record( struct metadc *metadc, METARECORD *mr, DWORD rlen ) DECLSPEC_HIDDEN; /* Metafile driver functions */ diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 34b58ebfe52..dbbb72b67bc 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -112,7 +112,7 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) mr.rdFunction = META_DELETEOBJECT; mr.rdParm[0] = index; - MFDRV_WriteRecord( &metadc->dev, &mr, mr.rdSize*2 ); + metadc_write_record( metadc, &mr, mr.rdSize * 2 ); metadc->handles[index] = 0; metadc->cur_handles--; @@ -122,15 +122,14 @@ void METADC_DeleteObject( HDC hdc, HGDIOBJ obj ) /*********************************************************************** * MFDRV_SelectObject */ -static BOOL MFDRV_SelectObject( PHYSDEV dev, INT16 index) +static BOOL metadc_select_object( HDC hdc, INT16 index) { METARECORD mr; mr.rdSize = sizeof mr / 2; mr.rdFunction = META_SELECTOBJECT; mr.rdParm[0] = index; - - return MFDRV_WriteRecord( dev, &mr, mr.rdSize*2 ); + return metadc_record( hdc, &mr, mr.rdSize*2 ); } @@ -209,7 +208,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) FIXME("Unknown brush style %x\n", logbrush.lbStyle); return 0; } - r = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); + r = metadc_record( dev->hdc, mr, mr->rdSize * 2 ); HeapFree(GetProcessHeap(), 0, mr); if( !r ) return -1; @@ -235,7 +234,7 @@ static HBRUSH METADC_SelectBrush( HDC hdc, HBRUSH hbrush ) return 0; GDI_hdc_using_object( hbrush, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->brush; metadc->brush = hbrush; return ret; @@ -273,7 +272,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ memset(font16->lfFaceName + written, 0, LF_FACESIZE - written); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2)) return 0; return MFDRV_AddHandle( dev, hFont ); } @@ -299,7 +298,7 @@ static HFONT METADC_SelectFont( HDC hdc, HFONT hfont ) return 0; GDI_hdc_using_object( hfont, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->font; metadc->font = hfont; return ret; @@ -316,7 +315,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen) mr->rdSize = (sizeof(METARECORD) + sizeof(*logpen) - 2) / 2; mr->rdFunction = META_CREATEPENINDIRECT; memcpy(&(mr->rdParm), logpen, sizeof(*logpen)); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * 2 )) return 0; return MFDRV_AddHandle( dev, hPen ); } @@ -370,7 +369,8 @@ static HPEN METADC_SelectPen( HDC hdc, HPEN hpen ) GDI_hdc_using_object( hpen, hdc, METADC_DeleteObject ); } - if (!MFDRV_SelectObject( &metadc->dev, index )) return 0; + + if (!metadc_select_object( hdc, index )) return 0; ret = metadc->pen; metadc->pen = hpen; return ret; @@ -390,7 +390,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP mr->rdSize = (sizeof(METARECORD) + sizeofPalette - sizeof(WORD)) / sizeof(WORD); mr->rdFunction = META_CREATEPALETTE; memcpy(&(mr->rdParm), logPalette, sizeofPalette); - if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)))) + if (!metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) )) { HeapFree(GetProcessHeap(), 0, mr); return FALSE; @@ -403,7 +403,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP else { *(mr->rdParm) = index; - ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * sizeof(WORD)); + ret = metadc_record( dev->hdc, mr, mr->rdSize * sizeof(WORD) ); } HeapFree(GetProcessHeap(), 0, mr); return ret;

1 0

Nikolay Sivov : d3dx10: Add a stub font object.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 6177af8b1e137150d9f3d7d99f618c50c4015403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6177af8b1e137150d9f3d7d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 19:17:29 2021 +0200 d3dx10: Add a stub font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 8 +- dlls/d3dx10_43/font.c | 353 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx10core.h | 8 + 4 files changed, 366 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6177af8b1e137150d9f3…

1 0

Jacek Caban : gdi32: Store save level in DC_ATTR.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 8eab13f397db05cae95fc7a44e9183c37dd14ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eab13f397db05cae95fc7a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 17 11:37:21 2021 +0200 gdi32: Store save level 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 | 12 ++++++------ dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5a62320ed79..c8e1e63e274 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -404,10 +404,10 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) /* find the state level to restore */ - if (abs(level) > dc->saveLevel || level == 0) return FALSE; - if (level < 0) level = dc->saveLevel + level + 1; + if (abs(level) > dc->attr->save_level || level == 0) return FALSE; + if (level < 0) level = dc->attr->save_level + level + 1; first_dcs = dc->saved_dc; - for (dcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + for (dcs = first_dcs, save_level = dc->attr->save_level; save_level > level; save_level--) dcs = dcs->saved_dc; /* restore the state */ @@ -478,7 +478,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->saved_dc = dcs->saved_dc; dcs->saved_dc = 0; - dc->saveLevel = save_level - 1; + dc->attr->save_level = save_level - 1; /* now destroy all the saved DCs */ @@ -524,7 +524,7 @@ static BOOL reset_dc_state( HDC hdc ) free_dc_state( dcs ); } dc->saved_dc = NULL; - dc->saveLevel = 0; + dc->attr->save_level = 0; release_dc_ptr( dc ); return TRUE; } @@ -587,7 +587,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->saved_dc = dc->saved_dc; dc->saved_dc = newdc; - ret = ++dc->saveLevel; + ret = ++dc->attr->save_level; release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index bc5c25145ef..867fb3e1380 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -44,7 +44,7 @@ BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) if (level < 0) emr.iRelative = level; else - emr.iRelative = level - dc->saveLevel - 1; + emr.iRelative = level - dc->attr->save_level - 1; physDev->restoring++; ret = next->funcs->pRestoreDC( next, level ); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 2623d9b4445..5db96df4f16 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -439,8 +439,8 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ } physDev = get_emf_physdev( find_dc_driver( dc, &emfdrv_driver )); - if(dc->saveLevel) - RestoreDC(hdc, 1); + if (dc->attr->save_level) + RestoreDC( hdc, 1 ); if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6b3efea3ddb..978a9a42cd3 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -72,7 +72,6 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ - INT saveLevel; DC_ATTR *attr; /* DC attributes accessible by client */ struct tagDC *saved_dc; DWORD_PTR dwHookData; diff --git a/include/ntgdi.h b/include/ntgdi.h index 16df2d39957..5fb3ac76c04 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -127,6 +127,7 @@ typedef struct DC_ATTR { HDC hdc; /* handle to self */ LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ + int save_level; COLORREF background_color; COLORREF brush_color; COLORREF pen_color;

1 0

Zhiyi Zhang : user32: Report a fake monitor when running on an invisible window station.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: f8ce819ab57b42329b52d18fa29e5a79cfd1abf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ce819ab57b42329b52d18f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:29:59 2021 +0800 user32: Report a fake monitor when running on an invisible window station. The visible window station check was accidentally deleted in 95be042. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51590 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++++++- dlls/user32/tests/monitor.c | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1c943767927..24e39206746 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4111,12 +4111,20 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { + BOOL is_winstation_visible = FALSE; + USEROBJECTFLAGS flags; + HWINSTA winstation; RECT monitor_rect; DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - if (update_monitor_cache()) + /* Report physical monitor information only if window station has visible display surfaces */ + winstation = GetProcessWindowStation(); + if (GetUserObjectInformationW( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL )) + is_winstation_visible = flags.dwFlags & WSF_VISIBLE; + + if (is_winstation_visible && update_monitor_cache()) { while (TRUE) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 654f77ed617..dfb57d3e2c2 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1563,6 +1563,7 @@ static void test_EnumDisplayMonitors(void) static const DWORD DESKTOP_ALL_ACCESS = 0x01ff; HWINSTA winstation, old_winstation; HDESK desktop, old_desktop; + USEROBJECTFLAGS flags; INT count, old_count; DWORD error; BOOL ret; @@ -1602,6 +1603,12 @@ static void test_EnumDisplayMonitors(void) ok(ret, "SetProcessWindowStation failed, error %#x.\n", GetLastError()); ok(winstation == GetProcessWindowStation(), "Expected %p, got %p.\n", GetProcessWindowStation(), winstation); + flags.fInherit = FALSE; + flags.fReserved = FALSE; + flags.dwFlags = WSF_VISIBLE; + ret = SetUserObjectInformationW(winstation, UOI_FLAGS, &flags, sizeof(flags)); + ok(ret, "SetUserObjectInformationW failed, error %#x.\n", GetLastError()); + desktop = CreateDesktopW(L"test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); ok(!!desktop && desktop != old_desktop, "CreateDesktopW failed, error %#x.\n", GetLastError()); ret = SetThreadDesktop(desktop);

1 0

Zhiyi Zhang : wordpad: Use large icons for toolbar when DPI is greater than 120.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 766388c552a4b04fa62b3874fe841c87f6ca66ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=766388c552a4b04fa62b3874… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:36:56 2021 +0800 wordpad: Use large icons for toolbar when DPI is greater than 120. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index d48346e3c4a..e87475ad06b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1881,7 +1881,7 @@ static LRESULT OnCreate( HWND hWnd ) HFONT font; HDC hdc; SIZE name_sz, size_sz; - int height; + int height, dpi; static const WCHAR wszRichEditDll[] = {'R','I','C','H','E','D','2','0','.','D','L','L','\0'}; static const WCHAR wszRichEditText[] = {'R','i','c','h','E','d','i','t',' ','t','e','x','t','\0'}; static const WCHAR font_text[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; /* a long font name */ @@ -1905,8 +1905,12 @@ static LRESULT OnCreate( HWND hWnd ) NULL, 0, 24, 24, 16, 16, sizeof(TBBUTTON)); + hdc = GetDC(hWnd); + dpi = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(hWnd, hdc); + ab.hInst = HINST_COMMCTRL; - ab.nID = IDB_STD_SMALL_COLOR; + ab.nID = dpi >= 120 ? IDB_STD_LARGE_COLOR : IDB_STD_SMALL_COLOR; nStdBitmaps = SendMessageW(hToolBarWnd, TB_ADDBITMAP, 0, (LPARAM)&ab); AddButton(hToolBarWnd, nStdBitmaps+STD_FILENEW, ID_FILE_NEW);

1 0

Alexandre Julliard : server: Set YMM registers from the native context even in Wow64 mode.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 6c478c304c07cf54ef031a5809788b4afed2d4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c478c304c07cf54ef031a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 17:45:43 2021 +0200 server: Set YMM registers from the native context even in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/server/thread.c b/server/thread.c index e23412c6033..c1fa80f1ad8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -126,6 +126,11 @@ struct context #define CTX_WOW 1 /* context if thread is inside WoW */ #define CTX_PENDING 2 /* pending native context when we don't know whether thread is inside WoW */ +/* flags for registers that always need to be set from the server side */ +static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; +/* flags for registers that are set from the native context even in WoW mode */ +static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_YMM_REGISTERS; + static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry ); @@ -1304,20 +1309,6 @@ static void copy_context( context_t *to, const context_t *from, unsigned int fla if (flags & SERVER_CTX_YMM_REGISTERS) to->ymm = from->ymm; } -/* return the context flags that correspond to system regs */ -/* (system regs are the ones we can't access on the client side) */ -static unsigned int get_context_system_regs( unsigned short machine ) -{ - switch (machine) - { - case IMAGE_FILE_MACHINE_I386: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_AMD64: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_ARMNT: return SERVER_CTX_DEBUG_REGISTERS; - case IMAGE_FILE_MACHINE_ARM64: return SERVER_CTX_DEBUG_REGISTERS; - } - return 0; -} - /* gets the current impersonation token */ struct token *thread_get_impersonation_token( struct thread *thread ) { @@ -1597,7 +1588,6 @@ DECL_HANDLER(select) { const context_t *native_context = (const context_t *)((const char *)(result + 1) + req->size); const context_t *wow_context = (ctx_count > 1) ? native_context + 1 : NULL; - unsigned int system_flags = get_context_system_regs( native_machine ); if (current->context && current->context->status != STATUS_PENDING) goto invalid_param; @@ -1691,8 +1681,8 @@ DECL_HANDLER(select) if (ctx->regs[CTX_NATIVE].flags || ctx->regs[CTX_WOW].flags) { data_size_t size = (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); - unsigned int system_flags = get_context_system_regs( native_machine ) & ctx->regs[CTX_NATIVE].flags; - if (system_flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], system_flags ); + unsigned int flags = system_flags & ctx->regs[CTX_NATIVE].flags; + if (flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], flags ); set_reply_data( ctx->regs, min( size, get_reply_max_size() )); } release_object( ctx ); @@ -1846,7 +1836,6 @@ DECL_HANDLER(get_thread_context) set_error( STATUS_UNSUCCESSFUL ); else { - unsigned int system_flags = get_context_system_regs( native_machine ); reply->self = (thread == current); if (thread != current) stop_thread( thread ); if (thread->context) @@ -1870,13 +1859,12 @@ DECL_HANDLER(get_thread_context) if (!thread_context->status) { - unsigned int system_flags = get_context_system_regs( native_machine ); unsigned int native_flags = req->flags, wow_flags = 0; if (req->machine == thread_context->regs[CTX_WOW].machine) { - native_flags = req->flags & system_flags; - wow_flags = req->flags & ~system_flags; + native_flags = req->flags & always_native_flags; + wow_flags = req->flags & ~always_native_flags; } if ((context = set_reply_data_size( (!!native_flags + !!wow_flags) * sizeof(context_t) ))) { @@ -1928,12 +1916,13 @@ DECL_HANDLER(set_thread_context) set_error( STATUS_INVALID_PARAMETER ); else if (thread->state != TERMINATED) { - unsigned int flags, ctx = CTX_NATIVE; + unsigned int ctx = CTX_NATIVE; const context_t *context = &contexts[CTX_NATIVE]; - unsigned int system_flags = get_context_system_regs( native_machine ) & context->flags; + unsigned int flags = system_flags & context->flags; + unsigned int native_flags = always_native_flags & context->flags; if (thread != current) stop_thread( thread ); - else if (system_flags) set_thread_context( thread, context, system_flags ); + else if (flags) set_thread_context( thread, context, flags ); if (thread->context && !get_error()) { if (ctx_count == 2) @@ -1949,11 +1938,11 @@ DECL_HANDLER(set_thread_context) else ctx = CTX_PENDING; } flags = context->flags; - if (system_flags && ctx != CTX_NATIVE) /* system regs are always set from the native context */ + if (native_flags && ctx != CTX_NATIVE) /* some regs are always set from the native context */ { - copy_context( &thread->context->regs[CTX_NATIVE], &contexts[CTX_NATIVE], system_flags ); - thread->context->regs[CTX_NATIVE].flags |= system_flags; - flags &= ~system_flags; + copy_context( &thread->context->regs[CTX_NATIVE], &contexts[CTX_NATIVE], native_flags ); + thread->context->regs[CTX_NATIVE].flags |= native_flags; + flags &= ~native_flags; } copy_context( &thread->context->regs[ctx], context, flags ); thread->context->regs[ctx].flags |= flags;

1 0

Alexandre Julliard : ntdll: Add support for user callbacks.
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 94f63ea23f2610343480d74f10ad9518d4365e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f63ea23f2610343480d74f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 12:16:56 2021 +0200 ntdll: Add support for user callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 94 +++++++++++++++++++++++++++++++---------- dlls/ntdll/unix/signal_arm64.c | 74 +++++++++++++++++++++++++++----- dlls/ntdll/unix/signal_i386.c | 60 ++++++++++++++++++++++++-- dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 3 +- 6 files changed, 253 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94f63ea23f2610343480…

1 0

Alexandre Julliard : ntdll: Implement KiUserCallbackDispatcher().
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: b56a4b3efc39ab3c8e6dfced188b5bcc9eb7c2fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56a4b3efc39ab3c8e6dfced… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 11:55:39 2021 +0200 ntdll: Implement KiUserCallbackDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 11 +++++++++++ dlls/ntdll/signal_arm64.c | 11 +++++++++++ dlls/ntdll/signal_i386.c | 11 +++++++++++ dlls/ntdll/signal_x86_64.c | 13 +++++++++++++ dlls/ntdll/tests/wow64.c | 2 +- dlls/ntdll/unix/loader.c | 4 +++- dlls/ntdll/unix/unix_private.h | 3 ++- 10 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f126249c01..48e826fe888 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3767,7 +3767,7 @@ static void init_wow64( CONTEXT *context ) SET_INIT_BLOCK( LdrInitializeThunk ); SET_INIT_BLOCK( LdrSystemDllInitBlock ); SET_INIT_BLOCK( RtlUserThreadStart ); - /* SET_INIT_BLOCK( KiUserCallbackDispatcher ); */ + SET_INIT_BLOCK( KiUserCallbackDispatcher ); /* SET_INIT_BLOCK( RtlpQueryProcessDebugInformationRemote ); */ /* SET_INIT_BLOCK( RtlpFreezeTimeBias ); */ /* LdrSystemDllInitBlock.ntdll_handle */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 46403b3f4a1..1bff52a299d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -68,7 +68,7 @@ # @ stub KiIntSystemCall @ stdcall -norelay KiRaiseUserExceptionDispatcher() @ stdcall -norelay KiUserApcDispatcher(ptr long long long ptr) -@ stub KiUserCallbackDispatcher +@ stdcall -norelay KiUserCallbackDispatcher(long ptr long) @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) # @ stub LdrAccessOutOfProcessResource @ stdcall LdrAccessResource(long ptr ptr ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e93692fe12..ab6fa5bc0ae 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -51,6 +51,7 @@ extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ) D extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; +extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG) DECLSPEC_HIDDEN; #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) extern RUNTIME_FUNCTION *lookup_function_info( ULONG_PTR pc, ULONG_PTR *base, LDR_DATA_TABLE_ENTRY **module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 64870674d1f..0ef210a0331 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -206,6 +206,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index dc18599e4f6..290639b676b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -565,6 +565,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 59d9e1d0df9..479accaf63c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -247,6 +247,17 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 } +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + /*********************************************************************** * save_fpu * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index de0eca6c11c..ef32eba68b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -625,6 +625,19 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, "int3") +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + * + * FIXME: not binary compatible + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + + RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); +} + + static ULONG64 get_int_reg( CONTEXT *context, int reg ) { return *(&context->Rax + reg); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 90692e66c25..be2f2138933 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1043,7 +1043,7 @@ static void test_init_block(void) CHECK_FUNC( block64[3], "LdrInitializeThunk" ); CHECK_FUNC( block64[4], "KiUserExceptionDispatcher" ); CHECK_FUNC( block64[5], "KiUserApcDispatcher" ); - todo_wine CHECK_FUNC( block64[6], "KiUserCallbackDispatcher" ); + CHECK_FUNC( block64[6], "KiUserCallbackDispatcher" ); CHECK_FUNC( block64[7], "RtlUserThreadStart" ); CHECK_FUNC( block64[8], "RtlpQueryProcessDebugInformationRemote" ); todo_wine ok( block64[9] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5edc845009f..a8e145de16e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -105,8 +105,9 @@ static const char so_dir[] = ""; void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; -void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; +void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; +void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; void (WINAPI *p__wine_ctrl_routine)(void*); @@ -832,6 +833,7 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); + GET_FUNC( KiUserCallbackDispatcher ); GET_FUNC( LdrInitializeThunk ); GET_FUNC( LdrSystemDllInitBlock ); GET_FUNC( RtlUserThreadStart ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 18c58a6431e..df5316d2917 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,8 +92,9 @@ static const LONG teb_offset = 0x2000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Add a stub for NtCallbackReturn().
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: daa1886a2c676675d0ebf1038e8c9e74cc2d0bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa1886a2c676675d0ebf103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 17 11:52:35 2021 +0200 ntdll: Add a stub for NtCallbackReturn(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 9 +++++++++ dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 9 +++++++++ dlls/ntdll/unix/signal_i386.c | 9 +++++++++ dlls/ntdll/unix/signal_x86_64.c | 9 +++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 36d997d1762..46403b3f4a1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -145,7 +145,7 @@ @ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) -# @ stub NtCallbackReturn +@ stdcall -syscall NtCallbackReturn(ptr long long) # @ stub NtCancelDeviceWakeupRequest @ stdcall -syscall NtCancelIoFile(long ptr) @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8bede41ee49..f79a302d4aa 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -39,6 +39,7 @@ static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3); +static NTSTATUS (WINAPI *pNtCallbackReturn)( void *ret_ptr, ULONG ret_len, NTSTATUS status ); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); @@ -7252,6 +7253,12 @@ static void test_user_apc(void) ok(test_apc_called, "Test user APC was not called.\n"); } +static void test_user_callback(void) +{ + NTSTATUS status = pNtCallbackReturn( NULL, 0, STATUS_SUCCESS ); + ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %x\n", status ); +} + static DWORD WINAPI suspend_thread_test( void *arg ) { HANDLE event = arg; @@ -9135,6 +9142,7 @@ START_TEST(exception) X(NtGetContextThread); X(NtSetContextThread); X(NtQueueApcThread); + X(NtCallbackReturn); X(NtReadVirtualMemory); X(NtClose); X(RtlUnwind); @@ -9329,6 +9337,7 @@ START_TEST(exception) NtCurrentTeb()->Peb->BeingDebugged = 0; test_user_apc(); + test_user_callback(); test_vectored_continue_handler(); test_suspend_thread(); test_suspend_process(); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a86805b113c..1d9b02fe2a3 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -575,6 +575,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * handle_syscall_fault * diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0ce6206aa9d..4f3dce3d26b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -722,6 +722,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * handle_syscall_fault * diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 72aff4614ca..3f74761fc75 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1579,6 +1579,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /********************************************************************** * get_fpu_code * diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 390121726ad..c2e3c9e1753 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2275,6 +2275,15 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } +/*********************************************************************** + * NtCallbackReturn (NTDLL.@) + */ +NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +{ + return STATUS_NO_CALLBACK_ACTIVE; +} + + /*********************************************************************** * is_privileged_instr *

1 0

Zhiyi Zhang : winex11.drv: Use length returned from sprintfW().
by Alexandre Julliard Aug. 17, 2021

Aug. 17, 2021

Module: wine Branch: master Commit: 975194590a340b207ad64da8f18e46bda837ab0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=975194590a340b207ad64da8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:41:06 2021 +0800 winex11.drv: Use length returned from sprintfW(). A minor optimization. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b647455a01f..b3ff213ae89 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -586,6 +586,7 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR bufferW[MAX_PATH]; + DWORD length; HKEY hkey; BOOL ret = FALSE; @@ -629,9 +630,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) goto done; /* Adapter name */ - sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, - (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + (const BYTE *)bufferW, (length + 1) * sizeof(WCHAR), 0)) goto done; ret = TRUE;

1 0