September 2021 - Wine-commits

Francois Gouget : uxtheme/tests: Use the OpenThemeDataForDpi() function pointer.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 568143ff97c80ba0558411b6d2ec0ecba77de2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568143ff97c80ba0558411b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 2 10:29:51 2021 +0200 uxtheme/tests: Use the OpenThemeDataForDpi() function pointer. OpenThemeDataForDpi() is not available in Windows 10 1607 and older. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f9bf371e6bf..b088a7a050e 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -657,7 +657,7 @@ static void test_OpenThemeDataForDpi(void) is_theme_active = IsThemeActive(); SetLastError(0xdeadbeef); - htheme = OpenThemeDataForDpi(NULL, WC_BUTTONW, 96); + htheme = pOpenThemeDataForDpi(NULL, WC_BUTTONW, 96); if (is_theme_active) { ok(!!htheme, "Got a NULL handle.\n");

1 0

Jacek Caban : gdi32: Move LineDDA to objects.c.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 66fd792c4d16bb5815b5d796f119e7bf8d946fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fd792c4d16bb5815b5d796… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:12:24 2021 +0200 gdi32: Move LineDDA to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/painting.c | 58 --------------------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index a79540885c3..5bc14090feb 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -1001,3 +1001,61 @@ BOOL WINAPI CombineTransform( XFORM *result, const XFORM *xform1, const XFORM *x *result = r; return TRUE; } + +/*********************************************************************** + * LineDDA (GDI32.@) + */ +BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, + LINEDDAPROC callback, LPARAM lparam ) +{ + INT xadd = 1, yadd = 1; + INT err,erradd; + INT cnt; + INT dx = x_end - x_start; + INT dy = y_end - y_start; + + TRACE( "(%d, %d), (%d, %d), %p, %lx\n", x_start, y_start, + x_end, y_end, callback, lparam ); + + if (dx < 0) + { + dx = -dx; + xadd = -1; + } + if (dy < 0) + { + dy = -dy; + yadd = -1; + } + if (dx > dy) /* line is "more horizontal" */ + { + err = 2*dy - dx; erradd = 2*dy - 2*dx; + for(cnt = 0;cnt < dx; cnt++) + { + callback( x_start, y_start, lparam ); + if (err > 0) + { + y_start += yadd; + err += erradd; + } + else err += 2*dy; + x_start += xadd; + } + } + else /* line is "more vertical" */ + { + err = 2*dx - dy; erradd = 2*dx - 2*dy; + for(cnt = 0; cnt < dy; cnt++) + { + callback( x_start, y_start, lparam ); + if (err > 0) + { + x_start += xadd; + err += erradd; + } + else err += 2*dx; + y_start += yadd; + } + } + return TRUE; +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 9fecce61bd2..1ab977595f8 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -664,64 +664,6 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR } -/********************************************************************** - * LineDDA (GDI32.@) - */ -BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, - LINEDDAPROC callback, LPARAM lParam ) -{ - INT xadd = 1, yadd = 1; - INT err,erradd; - INT cnt; - INT dx = nXEnd - nXStart; - INT dy = nYEnd - nYStart; - - TRACE( "(%d, %d), (%d, %d), %p, %lx\n", nXStart, nYStart, nXEnd, nYEnd, callback, lParam ); - - if (dx < 0) - { - dx = -dx; - xadd = -1; - } - if (dy < 0) - { - dy = -dy; - yadd = -1; - } - if (dx > dy) /* line is "more horizontal" */ - { - err = 2*dy - dx; erradd = 2*dy - 2*dx; - for(cnt = 0;cnt < dx; cnt++) - { - callback(nXStart,nYStart,lParam); - if (err > 0) - { - nYStart += yadd; - err += erradd; - } - else err += 2*dy; - nXStart += xadd; - } - } - else /* line is "more vertical" */ - { - err = 2*dx - dy; erradd = 2*dx - 2*dy; - for(cnt = 0;cnt < dy; cnt++) - { - callback(nXStart,nYStart,lParam); - if (err > 0) - { - nXStart += xadd; - err += erradd; - } - else err += 2*dx; - nYStart += yadd; - } - } - return TRUE; -} - - /****************************************************************** * * *Very* simple bezier drawing code,

1 0

Jacek Caban : gdi32: Move GdiDllInitialize to objects.c.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: f95687c510e177d3c2b368e0181e9209aa2ac381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95687c510e177d3c2b368e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:12:32 2021 +0200 gdi32: Move GdiDllInitialize to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 12 ------------ dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 1294401f15b..ff3dd9807c2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -685,18 +685,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/*********************************************************************** - * GdiDllInitialize - * - * Stub entry point, some games (CoD: Black Ops 3) call it directly. - */ -BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - FIXME("stub\n"); - return TRUE; -} - - static const char *gdi_obj_type( unsigned type ) { switch ( type ) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 5bc14090feb..96ab3271034 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -1059,3 +1059,14 @@ BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, } return TRUE; } + +/*********************************************************************** + * GdiDllInitialize (GDI32.@) + * + * Stub entry point, some games (CoD: Black Ops 3) call it directly. + */ +BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + FIXME( "stub\n" ); + return TRUE; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetRandomRgn for GetClipRgn.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 8217ce0fef83a0aea3c658489c885d9bb69a3056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8217ce0fef83a0aea3c65848… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:00 2021 +0200 gdi32: Use NtGdiGetRandomRgn for GetClipRgn. 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/clipping.c | 36 ++++++++---------------------------- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/tests/clipping.c | 7 ++++++- include/ntgdi.h | 3 +++ 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 28a314b76b9..4f22e6f3cde 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,31 +392,6 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) } -/*********************************************************************** - * GetClipRgn (GDI32.@) - */ -INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) -{ - INT ret = -1; - DC * dc; - if ((dc = get_dc_ptr( hdc ))) - { - if( dc->hClipRgn ) - { - if (NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ) != ERROR) - { - ret = 1; - if (dc->attr->layout & LAYOUT_RTL) - mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); - } - } - else ret = 0; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetMetaRgn (GDI32.@) */ @@ -460,11 +435,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) if (!dc) return -1; - switch (iCode) + switch (iCode & ~NTGDI_RGN_MIRROR_RTL) { case 1: - if (dc->hClipRgn) NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); - else ret = 0; + if (!dc->hClipRgn) ret = 0; + else if (!NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY )) ret = -1; break; case 2: if (dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); @@ -496,6 +471,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) ret = -1; break; } + + /* Wine extension */ + if (ret > 0 && (iCode & NTGDI_RGN_MIRROR_RTL) && (dc->attr->layout & LAYOUT_RTL)) + mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0be21c75d58..6f534dce061 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1633,6 +1633,14 @@ BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) return NtGdiSelectClipPath( hdc, mode ); } +/*********************************************************************** + * GetClipRgn (GDI32.@) + */ +INT WINAPI GetClipRgn( HDC hdc, HRGN rgn ) +{ + return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 1 ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 484430b0cb9..37a96de2bb4 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -42,6 +42,8 @@ static void test_GetRandomRgn(void) ret = GetRandomRgn(hdc, hrgn, 1); ok(ret == 0, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 2); ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 3); @@ -84,10 +86,13 @@ static void test_GetRandomRgn(void) IntersectClipRect(hdc, rc2.left, rc2.top, rc2.right, rc2.bottom); ret = GetRandomRgn(hdc, hrgn, 1); - ok(ret != 0, "GetRandomRgn rets %d\n", ret); + ok(ret > 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); ok(EqualRect(&rc2, &ret_rc), "GetRandomRgn %s\n", wine_dbgstr_rect(&ret_rc)); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == -1, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, hrgn, 2); ok(ret != 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); diff --git a/include/ntgdi.h b/include/ntgdi.h index 00783975e18..061ed40779c 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -178,6 +178,9 @@ struct font_enum_entry NEWTEXTMETRICEXW tm; }; +/* flag for NtGdiGetRandomRgn to respect LAYOUT_RTL */ +#define NTGDI_RGN_MIRROR_RTL 0x80000000 + #endif /* __WINESRC__ */ struct font_realization_info

1 0

Jacek Caban : gdi32: Use NtGdiGetRandomRgn for GetMetaRgn.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: b096da8a50210cb437376a2d65374e310d53eeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b096da8a50210cb437376a2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:08 2021 +0200 gdi32: Use NtGdiGetRandomRgn for GetMetaRgn. 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/clipping.c | 26 ++------------------------ dlls/gdi32/gdidc.c | 8 ++++++++ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 4f22e6f3cde..02247f03620 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,28 +392,6 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) } -/*********************************************************************** - * GetMetaRgn (GDI32.@) - */ -INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - if (dc->hMetaRgn && NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ) != ERROR) - { - ret = 1; - if (dc->attr->layout & LAYOUT_RTL) - mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiGetRandomRgn (win32u.@) * @@ -442,8 +420,8 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) else if (!NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY )) ret = -1; break; case 2: - if (dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); - else ret = 0; + if (!dc->hMetaRgn) ret = 0; + else if (!NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY )) ret = -1; break; case 3: if (dc->hClipRgn && dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 6f534dce061..f175d8f59bc 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1641,6 +1641,14 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN rgn ) return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 1 ); } +/*********************************************************************** + * GetMetaRgn (GDI32.@) + */ +INT WINAPI GetMetaRgn( HDC hdc, HRGN rgn ) +{ + return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 2 ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */

1 0

Jacek Caban : gdi32: Use ntgdi names for spool functions.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 02d2bc944db2e5132e11a9ffdcad5f3f497b03fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d2bc944db2e5132e11a9ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:16 2021 +0200 gdi32: Use ntgdi names for spool functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 569468bc3c1..da37f8ba643 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -203,9 +203,9 @@ # @ stub GdiGetPageCount # @ stub GdiGetPageHandle # @ stub GdiGetSpoolFileHandle -@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) -@ stdcall GdiInitSpool() +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index d9595ff7abf..c4fcf8ada13 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(print); /****************************************************************** - * GdiGetSpoolMessage [GDI32.@] - * + * NtGdiGetSpoolMessage (win32u.@) */ -DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD data4) +DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ) { TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4); /* avoid 100% cpu usage with spoolsv.exe from w2k @@ -48,10 +47,9 @@ DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD dat } /****************************************************************** - * GdiInitSpool [GDI32.@] - * + * NtGdiInitSpool (win32u.@) */ -DWORD WINAPI GdiInitSpool(void) +DWORD WINAPI NtGdiInitSpool(void) { FIXME("stub\n"); return TRUE;

1 0

Jacek Caban : gdi32: Store abort proc in DC_ATTR.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 711ce415c01a5e36bde6bb147b5aa3cedc8b35ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=711ce415c01a5e36bde6bb14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:25 2021 +0200 gdi32: Store abort proc 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/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/printdrv.c | 17 +---------------- include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f175d8f59bc..0f01e28696d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1821,6 +1821,18 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; } +/********************************************************************** + * SetAbortProc (GDI32.@) + */ +INT WINAPI SetAbortProc( HDC hdc, ABORTPROC abrtprc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + dc_attr->abort_proc = abrtprc; + return TRUE; +} + /*********************************************************************** * SetICMMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6701385784f..c2e45ab7ce0 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -101,7 +101,6 @@ typedef struct tagDC INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index c4fcf8ada13..ee8ae295daf 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -76,7 +76,7 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + if (dc->attr->abort_proc && !dc->attr->abort_proc( hdc, 0 )) ret = 0; else { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); @@ -204,18 +204,3 @@ INT WINAPI AbortDoc(HDC hdc) } return ret; } - - -/********************************************************************** - * SetAbortProc (GDI32.@) - * - */ -INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) -{ - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - dc->pAbortProc = abrtprc; - release_dc_ptr( dc ); - return TRUE; -} diff --git a/include/ntgdi.h b/include/ntgdi.h index 061ed40779c..8bff1d4338f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -169,6 +169,7 @@ typedef struct DC_ATTR UINT font_code_page; RECTL emf_bounds; void *emf; + ABORTPROC abort_proc; /* AbortProc for printing */ } DC_ATTR; struct font_enum_entry

1 0

Zebediah Figura : server: Allow calling async_terminate() with STATUS_PENDING.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 0f332fc0393e5d89b0fb676c06890085fb5fae18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f332fc0393e5d89b0fb676c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:28:35 2021 -0500 server: Allow calling async_terminate() with STATUS_PENDING. We still don't quite handle this completely correctly, but we should at least avoid crashing the server due to a failed assertion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 -- server/device.c | 1 - 2 files changed, 3 deletions(-) diff --git a/server/async.c b/server/async.c index 1c3082083ed..b414604fcd4 100644 --- a/server/async.c +++ b/server/async.c @@ -156,8 +156,6 @@ static void async_destroy( struct object *obj ) /* notifies client thread of new status of its async request */ void async_terminate( struct async *async, unsigned int status ) { - assert( status != STATUS_PENDING ); - if (async->terminated) return; async->terminated = 1; diff --git a/server/device.c b/server/device.c index b669921a003..ef93a0a9024 100644 --- a/server/device.c +++ b/server/device.c @@ -386,7 +386,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, if (!file) return; /* already finished */ - /* FIXME: handle the STATUS_PENDING case */ iosb->status = status; iosb->result = result; iosb->out_size = min( iosb->out_size, out_size );

1 0

Zebediah Figura : server: Allow completing non-alerted asyncs with STATUS_PENDING.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: c4682cd928eacc923c9fbaaa5fb3c9101fa254b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4682cd928eacc923c9fbaaa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:28:36 2021 -0500 server: Allow completing non-alerted asyncs with STATUS_PENDING. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/server/async.c b/server/async.c index b414604fcd4..5deaf04d686 100644 --- a/server/async.c +++ b/server/async.c @@ -390,14 +390,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota assert( async->terminated ); /* it must have been woken up if we get a result */ - if (status == STATUS_PENDING) /* restart it */ + if (async->alerted && status == STATUS_PENDING) /* restart it */ { - if (async->alerted) - { - async->terminated = 0; - async->alerted = 0; - async_reselect( async ); - } + async->terminated = 0; + async->alerted = 0; + async_reselect( async ); } else {

1 0

Zebediah Figura : server: Do not create an iosb for IRP calls not associated with an async.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: fd4e7703e97fef65d809cde9125b45db3381c499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd4e7703e97fef65d809cde9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 1 17:28:37 2021 -0500 server: Do not create an iosb for IRP calls not associated with an async. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 54 +++++++++++++++++++++++++++--------------------------- server/device.c | 36 +++++++++++++++++++----------------- server/file.h | 1 - 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/server/async.c b/server/async.c index 5deaf04d686..d45f234144d 100644 --- a/server/async.c +++ b/server/async.c @@ -282,32 +282,6 @@ void set_async_pending( struct async *async, int signal ) } } -/* create an async associated with iosb for async-based requests - * returned async must be passed to async_handoff */ -struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ) -{ - struct async *async; - struct iosb *iosb; - - if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) - return NULL; - - async = create_async( fd, current, data, iosb ); - release_object( iosb ); - if (async) - { - if (!(async->wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) - { - release_object( async ); - return NULL; - } - async->pending = 0; - async->direct_result = 1; - async->comp_flags = comp_flags; - } - return async; -} - /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) { @@ -536,7 +510,7 @@ static void iosb_destroy( struct object *obj ) } /* allocate iosb struct */ -struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ) +static struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ) { struct iosb *iosb; @@ -558,6 +532,32 @@ struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t return iosb; } +/* create an async associated with iosb for async-based requests + * returned async must be passed to async_handoff */ +struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ) +{ + struct async *async; + struct iosb *iosb; + + if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) + return NULL; + + async = create_async( fd, current, data, iosb ); + release_object( iosb ); + if (async) + { + if (!(async->wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) + { + release_object( async ); + return NULL; + } + async->pending = 0; + async->direct_result = 1; + async->comp_flags = comp_flags; + } + return async; +} + struct iosb *async_get_iosb( struct async *async ) { return async->iosb ? (struct iosb *)grab_object( async->iosb ) : NULL; diff --git a/server/device.c b/server/device.c index ef93a0a9024..a89c03f0fb0 100644 --- a/server/device.c +++ b/server/device.c @@ -369,11 +369,6 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->user_ptr = 0; if (async) irp->iosb = async_get_iosb( async ); - if (!irp->iosb && !(irp->iosb = create_iosb( NULL, 0, 0 ))) - { - release_object( irp ); - irp = NULL; - } } return irp; } @@ -382,21 +377,22 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, const void *out_data, data_size_t out_size, data_size_t result ) { struct device_file *file = irp->file; - struct iosb *iosb = irp->iosb; if (!file) return; /* already finished */ - iosb->status = status; - iosb->result = result; - iosb->out_size = min( iosb->out_size, out_size ); - if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) - iosb->out_size = 0; - /* remove it from the device queue */ list_remove( &irp->dev_entry ); irp->file = NULL; if (irp->async) { + struct iosb *iosb = irp->iosb; + + iosb->status = status; + iosb->result = result; + iosb->out_size = min( iosb->out_size, out_size ); + if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) + iosb->out_size = 0; + if (result) status = STATUS_ALERTED; async_terminate( irp->async, status ); release_object( irp->async ); @@ -993,15 +989,21 @@ DECL_HANDLER(get_next_device_request) reply->client_tid = get_thread_id( thread ); iosb = irp->iosb; - reply->in_size = iosb->in_size; - if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); + if (iosb) + reply->in_size = iosb->in_size; + + if (iosb && iosb->in_size > get_reply_max_size()) + set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { if (fill_irp_params( manager, irp, &reply->params )) { - set_reply_data_ptr( iosb->in_data, iosb->in_size ); - iosb->in_data = NULL; - iosb->in_size = 0; + if (iosb) + { + set_reply_data_ptr( iosb->in_data, iosb->in_size ); + iosb->in_data = NULL; + iosb->in_size = 0; + } list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); /* we already own the object if it's only on manager queue */ diff --git a/server/file.h b/server/file.h index 10b5c0d0493..f6c5832a733 100644 --- a/server/file.h +++ b/server/file.h @@ -230,7 +230,6 @@ extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); -extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); extern struct thread *async_get_thread( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue );

1 0