May 2023 - Wine-commits - list.winehq.org

Piotr Caban : wineps: Don't use BUILTIN structure on PE side.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 4e1de86d9c342c59ac29b5ba64678d3013b5968c URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1de86d9c342c59ac29b5ba64678d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 7 13:26:22 2023 +0200 wineps: Don't use BUILTIN structure on PE side. --- dlls/wineps.drv/builtin.c | 57 ++++++++++++++++++++++++----------------------- dlls/wineps.drv/unixlib.c | 16 +++++++++++++ dlls/wineps.drv/unixlib.h | 8 +++++++ 3 files changed, 53 insertions(+), 28 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index f4be5eb37fb..39d2b9d7942 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -68,30 +68,26 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, const WINMETRICS *wm = &(afm->WinMetrics); USHORT usUnitsPerEm, usWinAscent, usWinDescent; SHORT sAscender, sDescender, sLineGap, sAvgCharWidth; + float scale; TRACE("'%s' %li\n", afm->FontName, lfHeight); if (lfHeight < 0) /* match em height */ - { - font->fontinfo.Builtin.scale = - ((float)lfHeight / (float)(wm->usUnitsPerEm)); - } + scale = - ((float)lfHeight / (float)(wm->usUnitsPerEm)); else /* match cell height */ - { - font->fontinfo.Builtin.scale = (float)lfHeight / - (float)(wm->usWinAscent + wm->usWinDescent); - } + scale = (float)lfHeight / (float)(wm->usWinAscent + wm->usWinDescent); - font->size.xx = (INT)Round(font->fontinfo.Builtin.scale * (float)wm->usUnitsPerEm); + font->size.xx = (INT)Round(scale * (float)wm->usUnitsPerEm); font->size.xy = font->size.yx = 0; - font->size.yy = -(INT)Round(font->fontinfo.Builtin.scale * (float)wm->usUnitsPerEm); + font->size.yy = -(INT)Round(scale * (float)wm->usUnitsPerEm); - usUnitsPerEm = (USHORT)Round((float)(wm->usUnitsPerEm) * font->fontinfo.Builtin.scale); - sAscender = (SHORT)Round((float)(wm->sAscender) * font->fontinfo.Builtin.scale); - sDescender = (SHORT)Round((float)(wm->sDescender) * font->fontinfo.Builtin.scale); - sLineGap = (SHORT)Round((float)(wm->sLineGap) * font->fontinfo.Builtin.scale); - usWinAscent = (USHORT)Round((float)(wm->usWinAscent) * font->fontinfo.Builtin.scale); - usWinDescent = (USHORT)Round((float)(wm->usWinDescent) * font->fontinfo.Builtin.scale); - sAvgCharWidth = (SHORT)Round((float)(wm->sAvgCharWidth) * font->fontinfo.Builtin.scale); + usUnitsPerEm = (USHORT)Round((float)(wm->usUnitsPerEm) * scale); + sAscender = (SHORT)Round((float)(wm->sAscender) * scale); + sDescender = (SHORT)Round((float)(wm->sDescender) * scale); + sLineGap = (SHORT)Round((float)(wm->sLineGap) * scale); + usWinAscent = (USHORT)Round((float)(wm->usWinAscent) * scale); + usWinDescent = (USHORT)Round((float)(wm->usWinDescent) * scale); + sAvgCharWidth = (SHORT)Round((float)(wm->sAvgCharWidth) * scale); tm->tmAscent = (LONG)usWinAscent; tm->tmDescent = (LONG)usWinDescent; @@ -133,10 +129,10 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font, * similarly adjusted.. */ - font->fontinfo.Builtin.scale *= (float)wm->usUnitsPerEm / 1000.0; + scale *= (float)wm->usUnitsPerEm / 1000.0; tm->tmMaxCharWidth = (LONG)Round( - (afm->FontBBox.urx - afm->FontBBox.llx) * font->fontinfo.Builtin.scale); + (afm->FontBBox.urx - afm->FontBBox.llx) * scale); TRACE("Selected PS font '%s' size %d weight %ld.\n", afm->FontName, font->size.xx, tm->tmWeight ); @@ -159,6 +155,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, AFMLISTENTRY *afmle; FONTFAMILY *family; BOOL bd = FALSE, it = FALSE; + TEXTMETRICW tm; LONG height; TRACE("Trying to find facename %s\n", debugstr_w(face_name)); @@ -207,7 +204,6 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, TRACE("Got font '%s'\n", afmle->afm->FontName); physDev->font.fontloc = Builtin; - physDev->font.fontinfo.Builtin.afm = afmle->afm; height = plf->lfHeight; /* stock fonts ignore the mapping mode */ @@ -218,24 +214,29 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, LPtoDP(dev->hdc, pts, 2); height = pts[1].y - pts[0].y; } - ScaleFont(physDev->font.fontinfo.Builtin.afm, height, - &(physDev->font), &(physDev->font.fontinfo.Builtin.tm)); + ScaleFont(afmle->afm, height, + &(physDev->font), &tm); /* Does anyone know if these are supposed to be reversed like this? */ - - physDev->font.fontinfo.Builtin.tm.tmDigitizedAspectX = physDev->logPixelsY; - physDev->font.fontinfo.Builtin.tm.tmDigitizedAspectY = physDev->logPixelsX; + tm.tmDigitizedAspectX = physDev->logPixelsY; + tm.tmDigitizedAspectY = physDev->logPixelsX; return TRUE; } BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) { - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - - return PSDRV_WriteSetFont(dev, physDev->font.fontinfo.Builtin.afm->FontName, - physDev->font.size, physDev->font.escapement, FALSE); + struct font_info font_info; + matrix size; + + ExtEscape(dev->hdc, PSDRV_GET_BUILTIN_FONT_INFO, 0, NULL, + sizeof(font_info), (char *)&font_info); + size.xx = font_info.size.cx; + size.yy = font_info.size.cy; + size.xy = size.yx = 0; + return PSDRV_WriteSetFont(dev, font_info.font_name, size, + font_info.escapement, FALSE); } BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 73181d9cd93..66d11a5f9b4 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -809,6 +809,22 @@ static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void return 1; } + case PSDRV_GET_BUILTIN_FONT_INFO: + { + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + struct font_info *font_info = (struct font_info *)output; + + if (pdev->font.fontloc != Builtin) + return 0; + + lstrcpynA(font_info->font_name, pdev->font.fontinfo.Builtin.afm->FontName, + sizeof(font_info->font_name)); + font_info->size.cx = pdev->font.size.xx; + font_info->size.cy = pdev->font.size.yy; + font_info->escapement = pdev->font.escapement; + return 1; + } + default: FIXME("Unimplemented code %d\n", escape); return 0; diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index eb82188807c..9e6c0298086 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -20,6 +20,14 @@ #include "wine/unixlib.h" #define PSDRV_GET_GLYPH_NAME 0x10000 +#define PSDRV_GET_BUILTIN_FONT_INFO 0x10001 + +struct font_info +{ + char font_name[LF_FACESIZE]; + SIZE size; + int escapement; +}; enum wineps_funcs {

1 0

Piotr Caban : wineps: Remove no longer used font selection code from PE side.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: be33dfbde0ac73d873be06399a90b805c1500d8f URL: https://gitlab.winehq.org/wine/wine/-/commit/be33dfbde0ac73d873be06399a90b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 7 13:50:26 2023 +0200 wineps: Remove no longer used font selection code from PE side. --- dlls/wineps.drv/builtin.c | 189 -------------------------------------------- dlls/wineps.drv/font.c | 82 ++----------------- dlls/wineps.drv/printproc.c | 29 ------- dlls/wineps.drv/psdrv.h | 2 - 4 files changed, 8 insertions(+), 294 deletions(-)

1 0

Piotr Caban : wineps: Remove no longer used PSDRV_StartDoc and PSDRV_EndDoc functions.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: f739bfc3c25e5924f6bc1364420f3f0aec8b87fa URL: https://gitlab.winehq.org/wine/wine/-/commit/f739bfc3c25e5924f6bc1364420f3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 11:19:37 2023 +0200 wineps: Remove no longer used PSDRV_StartDoc and PSDRV_EndDoc functions. --- dlls/wineps.drv/escape.c | 90 ------------------------------------------------ dlls/wineps.drv/psdrv.h | 2 -- 2 files changed, 92 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index e85ccb0f9e5..9bf16ba0a31 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -194,93 +194,3 @@ INT CDECL PSDRV_EndPage( PHYSDEV dev ) physDev->job.OutOfPage = TRUE; return 1; } - - -/************************************************************************ - * PSDRV_StartDoc - */ -INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - DOC_INFO_1W di; - PRINTER_DEFAULTSW prn_def; - - TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName), - debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); - - if(physDev->job.id) { - FIXME("hJob != 0. Now what?\n"); - return 0; - } - - prn_def.pDatatype = NULL; - prn_def.pDevMode = &physDev->pi->Devmode->dmPublic; - prn_def.DesiredAccess = PRINTER_ACCESS_USE; - - if (!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, &prn_def )) - { - WARN("OpenPrinter(%s, ...) failed: %ld\n", - debugstr_w(physDev->pi->friendly_name), GetLastError()); - return 0; - } - - di.pDocName = (LPWSTR) doc->lpszDocName; - di.pOutputFile = (LPWSTR) doc->lpszOutput; - di.pDatatype = NULL; - - /* redirection located in HKCU\Software\Wine\Printing\Spooler - is done during winspool.drv,ScheduleJob */ - physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); - if(!physDev->job.id) { - WARN("StartDocPrinter() failed: %ld\n", GetLastError()); - ClosePrinter(physDev->job.hprinter); - return 0; - } - - if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { - WARN("Failed to write header\n"); - ClosePrinter(physDev->job.hprinter); - return 0; - } - - physDev->job.OutOfPage = TRUE; - physDev->job.PageNo = 0; - physDev->job.quiet = FALSE; - physDev->job.passthrough_state = passthrough_none; - physDev->job.doc_name = strdupW( doc->lpszDocName ); - - return physDev->job.id; -} - -/************************************************************************ - * PSDRV_EndDoc - */ -INT CDECL PSDRV_EndDoc( PHYSDEV dev ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - INT ret = 1; - - TRACE("%p\n", dev->hdc); - - if(!physDev->job.id) { - FIXME("hJob == 0. Now what?\n"); - return 0; - } - - if(!physDev->job.OutOfPage) { - WARN("Somebody forgot an EndPage\n"); - PSDRV_EndPage( dev ); - } - - if (physDev->job.PageNo) - PSDRV_WriteFooter( dev ); - - ret = EndDocPrinter(physDev->job.hprinter); - ClosePrinter(physDev->job.hprinter); - physDev->job.hprinter = NULL; - physDev->job.id = 0; - HeapFree( GetProcessHeap(), 0, physDev->job.doc_name ); - physDev->job.doc_name = NULL; - - return ret; -} diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index baa080a56df..6c05ce51392 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -422,7 +422,6 @@ extern BOOL CDECL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bott extern BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; @@ -452,7 +451,6 @@ extern COLORREF CDECL PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLS extern COLORREF CDECL PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdi32: Add device name to wine_get_gdi_driver call.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 0ba17961a90bee198945d2eb68c0cc2e698cd03e URL: https://gitlab.winehq.org/wine/wine/-/commit/0ba17961a90bee198945d2eb68c0cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 14:15:49 2023 +0200 gdi32: Add device name to wine_get_gdi_driver call. --- dlls/gdi32/dc.c | 2 +- dlls/win32u/dc.c | 4 ++-- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/wineps.drv.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c747d3a478e..a0308ffa118 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -42,7 +42,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef const void * (CDECL *driver_entry_point)( unsigned int version ); +typedef const void * (CDECL *driver_entry_point)( unsigned int version, const WCHAR *device ); struct graphics_driver { diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 8379cd353ef..bcfbed29426 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -719,8 +719,8 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD funcs = get_display_driver(); else if (hspool) { - const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int ) = hspool; - funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION ); + const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int, const WCHAR * ) = hspool; + funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION, device ? device->Buffer : NULL ); } if (!funcs) { diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 97f68d19a91..c5bb855ea93 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -687,7 +687,7 @@ static struct gdi_dc_funcs psdrv_funcs = /****************************************************************************** * PSDRV_get_gdi_driver */ -const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version ) +const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version, const WCHAR *name ) { if (version != WINE_GDI_DRIVER_VERSION) { diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 45b7d114e7e..aca8ed2d10f 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,4 +1,4 @@ -@ cdecl wine_get_gdi_driver(long) PSDRV_get_gdi_driver +@ cdecl wine_get_gdi_driver(long str) PSDRV_get_gdi_driver @ stdcall -private DllRegisterServer() # Printer driver config exports

1 0

Piotr Caban : wineps: Move remaining DC driver functions to unixlib.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: c1a12304f7d47466ab8b1d8669197408765a013d URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a12304f7d47466ab8b1d86691974… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 14:17:02 2023 +0200 wineps: Move remaining DC driver functions to unixlib. --- dlls/wineps.drv/init.c | 78 +++--------------------- dlls/wineps.drv/unixlib.c | 152 +++++++++++++++++++++++++++++++++++++++++++--- dlls/wineps.drv/unixlib.h | 6 +- 3 files changed, 159 insertions(+), 77 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c5bb855ea93..cc06c7017c9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -28,8 +28,8 @@ #include "winreg.h" #include "winnls.h" #include "winuser.h" -#include "unixlib.h" #include "psdrv.h" +#include "unixlib.h" #include "winspool.h" #include "wine/debug.h" @@ -93,8 +93,6 @@ static const PSDRV_DEVMODE DefaultDevmode = HINSTANCE PSDRV_hInstance = 0; HANDLE PSDRV_Heap = 0; -static struct gdi_dc_funcs psdrv_funcs; - /********************************************************************* * DllMain * @@ -109,16 +107,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: { - struct init_dc_params params = { &psdrv_funcs }; - PSDRV_hInstance = hinst; DisableThreadLibraryCalls(hinst); if (__wine_init_unix_call()) return FALSE; - if (!WINE_UNIX_CALL( unix_init_dc, &params )) - return FALSE; - PSDRV_Heap = HeapCreate(0, 0x10000, 0); if (PSDRV_Heap == NULL) @@ -133,6 +126,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_DETACH: if (reserved) break; + WINE_UNIX_CALL(unix_free_printer_info, NULL); HeapDestroy( PSDRV_Heap ); break; } @@ -382,55 +376,6 @@ PSDRV_PDEVICE *create_psdrv_physdev( HDC hdc, const WCHAR *device, return pdev; } -/********************************************************************** - * PSDRV_CreateDC - */ -static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *initData ) -{ - PSDRV_PDEVICE *physDev; - - TRACE("(%s %s %p)\n", debugstr_w(device), debugstr_w(output), initData); - - if (!device) return FALSE; - if (!(physDev = create_psdrv_physdev( (*pdev)->hdc, device, - (const PSDRV_DEVMODE *)initData ))) return FALSE; - push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); - return TRUE; -} - - -/********************************************************************** - * PSDRV_CreateCompatibleDC - */ -static BOOL CDECL PSDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) -{ - PSDRV_PDEVICE *physDev, *orig_dev = get_psdrv_dev( orig ); - - if (!(physDev = create_psdrv_physdev( (*pdev)->hdc, orig_dev->pi->friendly_name, - orig_dev->Devmode ))) return FALSE; - push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); - return TRUE; -} - - - -/********************************************************************** - * PSDRV_DeleteDC - */ -static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - - TRACE("\n"); - - HeapFree( GetProcessHeap(), 0, physDev->Devmode ); - HeapFree( GetProcessHeap(), 0, physDev ); - - return TRUE; -} - - /********************************************************************** * ResetDC (WINEPS.@) */ @@ -674,25 +619,22 @@ fail: return NULL; } - -static struct gdi_dc_funcs psdrv_funcs = -{ - .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, - .pCreateDC = PSDRV_CreateDC, - .pDeleteDC = PSDRV_DeleteDC, - .priority = GDI_PRIORITY_GRAPHICS_DRV -}; - - /****************************************************************************** * PSDRV_get_gdi_driver */ const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version, const WCHAR *name ) { + PRINTERINFO *pi = PSDRV_FindPrinterInfo( name ); + struct init_dc_params params = { NULL, pi, pi->friendly_name }; + + if (!pi) + return NULL; if (version != WINE_GDI_DRIVER_VERSION) { ERR( "version mismatch, gdi32 wants %u but wineps has %u\n", version, WINE_GDI_DRIVER_VERSION ); return NULL; } - return &psdrv_funcs; + if (!WINE_UNIX_CALL( unix_init_dc, &params )) + return FALSE; + return params.funcs; } diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 66d11a5f9b4..ab9aba5d826 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -49,6 +49,16 @@ static const WCHAR systemW[] = {'S','y','s','t','e','m',0}; static const WCHAR times_new_romanW[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; static const WCHAR courier_newW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const struct gdi_dc_funcs psdrv_funcs; + +struct printer_info +{ + struct list entry; + const WCHAR *name; + PRINTERINFO *pi; +}; + +static struct list printer_info_list = LIST_INIT( printer_info_list ); /* copied from kernelbase */ static int muldiv(int a, int b, int c) @@ -1250,24 +1260,150 @@ static BOOL CDECL get_text_extent_ex_point(PHYSDEV dev, const WCHAR *str, int co return TRUE; } +static struct printer_info *find_printer_info(const WCHAR *name) +{ + struct printer_info *pi; + + LIST_FOR_EACH_ENTRY(pi, &printer_info_list, struct printer_info, entry) + { + if (!wcscmp(pi->name, name)) + return pi; + } + return NULL; +} + +static PSDRV_PDEVICE *create_physdev(HDC hdc, const WCHAR *device, + const PSDRV_DEVMODE *devmode) +{ + struct printer_info *pi = find_printer_info(device); + PSDRV_PDEVICE *pdev; + + if (!pi) return NULL; + if (!pi->pi->Fonts) + { + RASTERIZER_STATUS status; + if (!NtGdiGetRasterizerCaps(&status, sizeof(status)) || + !(status.wFlags & TT_AVAILABLE) || + !(status.wFlags & TT_ENABLED)) + { + MESSAGE("Disabling printer %s since it has no builtin fonts and " + "there are no TrueType fonts available.\n", debugstr_w(device)); + return FALSE; + } + } + + pdev = malloc(sizeof(*pdev)); + if (!pdev) return NULL; + + pdev->Devmode = malloc(sizeof(PSDRV_DEVMODE)); + if (!pdev->Devmode) + { + free(pdev); + return NULL; + } + + *pdev->Devmode = *pi->pi->Devmode; + pdev->pi = pi->pi; + pdev->logPixelsX = pi->pi->ppd->DefaultResolution; + pdev->logPixelsY = pi->pi->ppd->DefaultResolution; + + if (devmode) + { + dump_devmode(&devmode->dmPublic); + merge_devmodes(pdev->Devmode, devmode, pi->pi); + } + + update_dev_caps(pdev); + NtGdiSelectFont(hdc, GetStockObject(DEVICE_DEFAULT_FONT)); + return pdev; +} + +static BOOL CDECL create_dc(PHYSDEV *dev, const WCHAR *device, + const WCHAR *output, const DEVMODEW *devmode) +{ + PSDRV_PDEVICE *pdev; + + TRACE("(%s %s %p)\n", debugstr_w(device), debugstr_w(output), devmode); + + if (!device) return FALSE; + if (!(pdev = create_physdev((*dev)->hdc, device, + (const PSDRV_DEVMODE *)devmode))) return FALSE; + push_dc_driver(dev, &pdev->dev, &psdrv_funcs); + return TRUE; +} + +static BOOL CDECL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev) +{ + PSDRV_PDEVICE *pdev, *orig_dev = get_psdrv_dev(orig); + + if (!(pdev = create_physdev((*dev)->hdc, orig_dev->pi->friendly_name, + orig_dev->Devmode))) return FALSE; + push_dc_driver(dev, &pdev->dev, &psdrv_funcs); + return TRUE; +} + +static BOOL CDECL delete_dc(PHYSDEV dev) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + + TRACE("\n"); + + free(pdev->Devmode); + free(pdev); + return TRUE; +} + +static const struct gdi_dc_funcs psdrv_funcs = +{ + .pCreateCompatibleDC = create_compatible_dc, + .pCreateDC = create_dc, + .pDeleteDC = delete_dc, + .pEnumFonts = enum_fonts, + .pExtEscape = ext_escape, + .pGetCharWidth = get_char_width, + .pGetDeviceCaps = get_device_caps, + .pGetTextExtentExPoint = get_text_extent_ex_point, + .pGetTextMetrics = get_text_metrics, + .pResetDC = reset_dc, + .pSelectFont = select_font, + .priority = GDI_PRIORITY_GRAPHICS_DRV +}; + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; + struct printer_info *pi; + + pi = find_printer_info(params->name); + if (!pi) + { + pi = malloc(sizeof(*pi)); + if (!pi) return FALSE; - params->funcs->pGetDeviceCaps = get_device_caps; - params->funcs->pResetDC = reset_dc; - params->funcs->pExtEscape = ext_escape; - params->funcs->pSelectFont = select_font; - params->funcs->pEnumFonts = enum_fonts; - params->funcs->pGetCharWidth = get_char_width; - params->funcs->pGetTextMetrics = get_text_metrics; - params->funcs->pGetTextExtentExPoint = get_text_extent_ex_point; + pi->name = params->name; + pi->pi = params->pi; + list_add_head(&printer_info_list, &pi->entry); + } + + params->funcs = &psdrv_funcs; return TRUE; } +static NTSTATUS free_printer_info(void *arg) +{ + struct printer_info *pi, *next; + + LIST_FOR_EACH_ENTRY_SAFE(pi, next, &printer_info_list, struct printer_info, entry) + { + free(pi); + } + return 0; +} + const unixlib_entry_t __wine_unix_call_funcs[] = { init_dc, + free_printer_info, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 9e6c0298086..09ba9d3c662 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -32,10 +32,14 @@ struct font_info enum wineps_funcs { unix_init_dc, + unix_free_printer_info, unix_funcs_count, }; struct init_dc_params { - struct gdi_dc_funcs *funcs; + const struct gdi_dc_funcs *funcs; + PRINTERINFO *pi; + + const WCHAR *name; };

1 0

Piotr Caban : wineps: Rename PSDRV_PDEVICE structure to print_ctx.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: b0c843eb34df5a1d5fdc45672b2595b8f0fa6e2a URL: https://gitlab.winehq.org/wine/wine/-/commit/b0c843eb34df5a1d5fdc45672b2595… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 8 17:21:58 2023 +0200 wineps: Rename PSDRV_PDEVICE structure to print_ctx. --- dlls/wineps.drv/bitblt.c | 30 ++-- dlls/wineps.drv/bitmap.c | 66 +++++---- dlls/wineps.drv/brush.c | 123 ++++++++-------- dlls/wineps.drv/builtin.c | 12 +- dlls/wineps.drv/clipping.c | 40 +++--- dlls/wineps.drv/color.c | 17 +-- dlls/wineps.drv/download.c | 126 ++++++++-------- dlls/wineps.drv/escape.c | 67 ++++----- dlls/wineps.drv/font.c | 33 ++--- dlls/wineps.drv/graphics.c | 313 ++++++++++++++++++++-------------------- dlls/wineps.drv/init.c | 165 +++++++++++---------- dlls/wineps.drv/pen.c | 89 ++++++------ dlls/wineps.drv/printproc.c | 327 +++++++++++++++++++++--------------------- dlls/wineps.drv/ps.c | 342 +++++++++++++++++++++----------------------- dlls/wineps.drv/psdrv.h | 189 ++++++++++++------------ dlls/wineps.drv/text.c | 82 ++++++----- dlls/wineps.drv/type1.c | 18 +-- dlls/wineps.drv/type42.c | 50 +++---- dlls/wineps.drv/unixlib.c | 7 + 19 files changed, 1023 insertions(+), 1073 deletions(-)

1 0

Zebediah Figura : wined3d: Do not forward texture references to the swapchain.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 2cfd75f7c5b0e8ffe0f4c161c3c174c4bfc3a046 URL: https://gitlab.winehq.org/wine/wine/-/commit/2cfd75f7c5b0e8ffe0f4c161c3c174… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 19:13:06 2023 -0500 wined3d: Do not forward texture references to the swapchain. Rely on the swapchain to reference its individual textures, and rely on the parent texture object to keep the swapchain alive if necessary. This is necessary to allow detaching textures from a swapchain. --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4cd6d7035eb..1bf9adf869c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1513,9 +1513,6 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); - if (texture->swapchain) - return wined3d_swapchain_incref(texture->swapchain); - refcount = InterlockedIncrement(&texture->resource.ref); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -1606,9 +1603,6 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); - if (texture->swapchain) - return wined3d_swapchain_decref(texture->swapchain); - refcount = InterlockedDecrement(&texture->resource.ref); TRACE("%p decreasing refcount to %u.\n", texture, refcount);

1 0

Zebediah Figura : wined3d: Read the sm4 sample count in DCL instructions.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: d53fd401651285eeff30216a8858c5623f35b2e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d53fd401651285eeff30216a8858c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 9 15:00:07 2023 -0500 wined3d: Read the sm4 sample count in DCL instructions. Based on vkd3d commit ee52ad810635cf504a49d5267a5942fffb16836e. --- dlls/wined3d/shader_sm4.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b87d45b0fb7..78abdbe81ac 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) +#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT 16 +#define WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK (0xfu << WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT) + #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x3fu << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) @@ -592,6 +595,13 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins, { ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } + + if (ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS + || ins->declaration.semantic.resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY) + { + ins->declaration.semantic.sample_count = (opcode_token & WINED3D_SM4_RESOURCE_SAMPLE_COUNT_MASK) >> WINED3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; + } + reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], reg_data_type, &ins->declaration.semantic.reg); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f793c6c0cde..d28a86f77c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1311,6 +1311,7 @@ struct wined3d_shader_semantic enum wined3d_decl_usage usage; UINT usage_idx; enum wined3d_shader_resource_type resource_type; + unsigned int sample_count; enum wined3d_data_type resource_data_type; struct wined3d_shader_dst_param reg; };

1 0

Zebediah Figura : wined3d: Do not declare resources as multisampled if the sample count is 1.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 9aac2d95ede5291dc491b6cd2594daac4547873a URL: https://gitlab.winehq.org/wine/wine/-/commit/9aac2d95ede5291dc491b6cd2594da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 9 15:01:11 2023 -0500 wined3d: Do not declare resources as multisampled if the sample count is 1. Based on vkd3d commit d8ef0c69a817d059b1d4fc62520131eed80aba29. --- dlls/wined3d/shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ee68a3436d..b4df79508ec 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1070,6 +1070,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co break; } reg_maps->resource_info[reg_idx].type = semantic->resource_type; + if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS && semantic->sample_count == 1) + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + if (semantic->resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY && semantic->sample_count == 1) + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; reg_maps->resource_info[reg_idx].data_type = semantic->resource_data_type; wined3d_bitmap_set(reg_maps->resource_map, reg_idx); break;

1 0

Alexandre Julliard : ntdll: Pass limit instead of zero bits to internal memory mapping functions.
by Alexandre Julliard 10 May '23

10 May '23

Module: wine Branch: master Commit: 04ef02f6ffd7eb19fb5883b29a646686572c5f5f URL: https://gitlab.winehq.org/wine/wine/-/commit/04ef02f6ffd7eb19fb5883b29a6466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 16:21:15 2023 +0200 ntdll: Pass limit instead of zero bits to internal memory mapping functions. --- dlls/ntdll/unix/loader.c | 20 +++++++-------- dlls/ntdll/unix/thread.c | 8 +++--- dlls/ntdll/unix/unix_private.h | 31 +++++++++++++++++++++--- dlls/ntdll/unix/virtual.c | 55 +++++++++++------------------------------- 4 files changed, 55 insertions(+), 59 deletions(-)

1 0