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

Piotr Caban : wineps: Remove unused fields from print_ctx.
by Alexandre Julliard May 19, 2023

May 19, 2023

Module: wine Branch: master Commit: 3fca78fbe42907e74fa3397246904863e759ffda URL: https://gitlab.winehq.org/wine/wine/-/commit/3fca78fbe42907e74fa33972469048… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 18:20:52 2023 +0200 wineps: Remove unused fields from print_ctx. --- dlls/wineps.drv/color.c | 28 ---------------------------- dlls/wineps.drv/init.c | 42 ++++++------------------------------------ dlls/wineps.drv/ps.c | 1 - dlls/wineps.drv/psdrv.h | 7 ------- 4 files changed, 6 insertions(+), 72 deletions(-) diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 26c235a8c6c..db14319cbd6 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -24,34 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -/********************************************************************** - * PSDRV_CopyColor - * - * Copies col2 into col1. Return FALSE on error. - */ -BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) -{ - - switch(col2->type) { - case PSCOLOR_GRAY: - col1->value.gray.i = col2->value.gray.i; - break; - - case PSCOLOR_RGB: - col1->value.rgb.r = col2->value.rgb.r; - col1->value.rgb.g = col2->value.rgb.g; - col1->value.rgb.b = col2->value.rgb.b; - break; - - default: - ERR("Unknown colour type %d\n", col1->type); - return FALSE; - } - - col1->type = col2->type; - return TRUE; -} - PSRGB rgb_to_grayscale_scale( void ) { static const PSRGB scale = {0.3, 0.59, 0.11}; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 9cbea031d48..9d59830c60d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -412,7 +412,7 @@ static void PSDRV_UpdateDevCaps( print_ctx *ctx ) { PAGESIZE *page; RESOLUTION *res; - INT width = 0, height = 0, resx = 0, resy = 0; + INT resx = 0, resy = 0; dump_devmode(&ctx->Devmode->dmPublic); @@ -460,63 +460,33 @@ static void PSDRV_UpdateDevCaps( print_ctx *ctx ) if(&page->entry == &ctx->pi->ppd->PageSizes) { FIXME("Can't find page\n"); SetRectEmpty(&ctx->ImageableArea); - ctx->PageSize.cx = 0; - ctx->PageSize.cy = 0; } else if(page->ImageableArea) { /* ctx sizes in device units; ppd sizes in 1/72" */ SetRect(&ctx->ImageableArea, page->ImageableArea->llx * ctx->logPixelsX / 72, page->ImageableArea->ury * ctx->logPixelsY / 72, page->ImageableArea->urx * ctx->logPixelsX / 72, page->ImageableArea->lly * ctx->logPixelsY / 72); - ctx->PageSize.cx = page->PaperDimension->x * - ctx->logPixelsX / 72; - ctx->PageSize.cy = page->PaperDimension->y * - ctx->logPixelsY / 72; } else { ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = ctx->PageSize.cx = + ctx->ImageableArea.right = page->PaperDimension->x * ctx->logPixelsX / 72; - ctx->ImageableArea.top = ctx->PageSize.cy = + ctx->ImageableArea.top = page->PaperDimension->y * ctx->logPixelsY / 72; } } else if((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) { /* ctx sizes in device units; Devmode sizes in 1/10 mm */ ctx->ImageableArea.left = ctx->ImageableArea.bottom = 0; - ctx->ImageableArea.right = ctx->PageSize.cx = + ctx->ImageableArea.right = ctx->Devmode->dmPublic.dmPaperWidth * ctx->logPixelsX / 254; - ctx->ImageableArea.top = ctx->PageSize.cy = + ctx->ImageableArea.top = ctx->Devmode->dmPublic.dmPaperLength * ctx->logPixelsY / 254; } else { FIXME("Odd dmFields %lx\n", ctx->Devmode->dmPublic.dmFields); SetRectEmpty(&ctx->ImageableArea); - ctx->PageSize.cx = 0; - ctx->PageSize.cy = 0; } - TRACE("ImageableArea = %s: PageSize = %ldx%ld\n", wine_dbgstr_rect(&ctx->ImageableArea), - ctx->PageSize.cx, ctx->PageSize.cy); - - /* these are in device units */ - width = ctx->ImageableArea.right - ctx->ImageableArea.left; - height = ctx->ImageableArea.top - ctx->ImageableArea.bottom; - - if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_PORTRAIT) { - ctx->horzRes = width; - ctx->vertRes = height; - } else { - ctx->horzRes = height; - ctx->vertRes = width; - } - - /* these are in mm */ - ctx->horzSize = (ctx->horzRes * 25.4) / ctx->logPixelsX; - ctx->vertSize = (ctx->vertRes * 25.4) / ctx->logPixelsY; - - TRACE("devcaps: horzSize = %dmm, vertSize = %dmm, " - "horzRes = %d, vertRes = %d\n", - ctx->horzSize, ctx->vertSize, - ctx->horzRes, ctx->vertRes); + TRACE("ImageableArea = %s\n", wine_dbgstr_rect(&ctx->ImageableArea)); } print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 007250e55db..421f01302bf 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -635,7 +635,6 @@ BOOL PSDRV_WriteSetColor(print_ctx *ctx, PSCOLOR *color) { char buf[256]; - PSDRV_CopyColor(&ctx->inkColor, color); switch(color->type) { case PSCOLOR_RGB: push_lc_numeric("C"); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index afeaa5fec0c..dd63c0000cf 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -338,20 +338,14 @@ typedef struct PSPEN pen; PSBRUSH brush; PSCOLOR bkColor; - PSCOLOR inkColor; /* Last colour set */ JOB job; PSDRV_DEVMODE *Devmode; PRINTERINFO *pi; - SIZE PageSize; /* Physical page size in device units */ RECT ImageableArea; /* Imageable area in device units */ /* NB both PageSize and ImageableArea are not rotated in landscape mode, so PageSize.cx is generally < PageSize.cy */ - int horzRes; /* device caps */ - int vertRes; - int horzSize; - int vertSize; int logPixelsX; int logPixelsY; @@ -446,7 +440,6 @@ extern void PSDRV_AddClip( print_ctx *ctx, HRGN hrgn ) DECLSPEC_HIDDEN; extern void PSDRV_SetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; extern void PSDRV_ResetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) DECLSPEC_HIDDEN; extern void PSDRV_CreateColor( print_ctx *ctx, PSCOLOR *pscolor, COLORREF wincolor ) DECLSPEC_HIDDEN; extern PSRGB rgb_to_grayscale_scale( void ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wineps: Mark default DEVMODE const.
by Alexandre Julliard May 19, 2023

May 19, 2023

Module: wine Branch: master Commit: 1cccaa1e8a95420b300433eccc530b73ed66c644 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cccaa1e8a95420b300433eccc530b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 18:02:17 2023 +0200 wineps: Mark default DEVMODE const. --- dlls/wineps.drv/unixlib.c | 8 ++++---- dlls/wineps.drv/unixlib.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index d3d3d2ee68f..26b1232f63e 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -75,7 +75,7 @@ struct printer_info { struct list entry; const WCHAR *name; - PSDRV_DEVMODE *devmode; + const PSDRV_DEVMODE *devmode; }; static struct list printer_info_list = LIST_INIT(printer_info_list); @@ -91,7 +91,7 @@ typedef struct { struct gdi_physdev dev; PSDRV_DEVMODE *devmode; - struct printer_info *pi; + const struct printer_info *pi; /* builtin font info */ BOOL builtin; @@ -339,7 +339,7 @@ static const struct page_size *find_pagesize(const struct printer_info *pi, } static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, - struct printer_info *pi) + const struct printer_info *pi) { /* some sanity checks here on dm2 */ @@ -1008,7 +1008,7 @@ static struct font_data *find_font_data(const char *name) return NULL; } -static struct font_data *find_builtin_font(PSDRV_DEVMODE *devmode, +static struct font_data *find_builtin_font(const PSDRV_DEVMODE *devmode, const WCHAR *facename, BOOL it, BOOL bd) { struct installed_font *installed_font; diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 235f48b5832..1d908af78b4 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -107,7 +107,7 @@ struct open_dc_params const WCHAR *device; const DEVMODEW *devmode; const WCHAR *output; - PSDRV_DEVMODE *def_devmode; + const PSDRV_DEVMODE *def_devmode; HDC hdc; };

1 0

Piotr Caban : wineps: Remove unix_ prefix from find_pagesize and find_slot functions.
by Alexandre Julliard May 19, 2023

May 19, 2023

Module: wine Branch: master Commit: 97cde730c07faed60d8eb721500d3ba201f7ad60 URL: https://gitlab.winehq.org/wine/wine/-/commit/97cde730c07faed60d8eb721500d3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 16:00:11 2023 +0200 wineps: Remove unix_ prefix from find_pagesize and find_slot functions. --- dlls/wineps.drv/unixlib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 7baffdcd09f..d3d3d2ee68f 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -307,7 +307,7 @@ static inline int paper_size_from_points(float size) return size * 254 / 72; } -static const struct input_slot *unix_find_slot(const struct printer_info *pi, +static const struct input_slot *find_slot(const struct printer_info *pi, const DEVMODEW *dm) { const struct input_slot *slot = (const struct input_slot *)pi->devmode->data; @@ -321,7 +321,7 @@ static const struct input_slot *unix_find_slot(const struct printer_info *pi, return NULL; } -static const struct page_size *unix_find_pagesize(const struct printer_info *pi, +static const struct page_size *find_pagesize(const struct printer_info *pi, const DEVMODEW *dm) { const struct page_size *page; @@ -357,7 +357,7 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, /* NB PaperWidth is always < PaperLength */ if (dm2->dmFields & DM_PAPERSIZE) { - const struct page_size *page = unix_find_pagesize(pi, dm2); + const struct page_size *page = find_pagesize(pi, dm2); if (page) { @@ -414,7 +414,7 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, if (dm2->dmFields & DM_DEFAULTSOURCE) { - const struct input_slot *slot = unix_find_slot(pi, dm2); + const struct input_slot *slot = find_slot(pi, dm2); if (slot) dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; @@ -513,7 +513,7 @@ static void update_dev_caps(PSDRV_PDEVICE *pdev) } if (pdev->devmode->dmPublic.dmFields & DM_PAPERSIZE) { - page = unix_find_pagesize(pdev->pi, &pdev->devmode->dmPublic); + page = find_pagesize(pdev->pi, &pdev->devmode->dmPublic); if (!page) {

1 0

Piotr Caban : wineps: Move BANDINFOSTRUCT definition to unixlib.c.
by Alexandre Julliard May 19, 2023

May 19, 2023

Module: wine Branch: master Commit: f848b9f8460494d502ed6357827c9a38ab7783fb URL: https://gitlab.winehq.org/wine/wine/-/commit/f848b9f8460494d502ed6357827c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 15:41:08 2023 +0200 wineps: Move BANDINFOSTRUCT definition to unixlib.c. --- dlls/wineps.drv/psdrv.h | 9 --------- dlls/wineps.drv/unixlib.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 1d6ff1c69dc..d16e135aeda 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -143,15 +143,6 @@ typedef struct _tagPAGESIZE { WORD WinPage; /*eg DMPAPER_A4. Doesn't really belong here */ } PAGESIZE; - -/* For BANDINFO Escape */ -typedef struct _BANDINFOSTRUCT -{ - BOOL GraphicsFlag; - BOOL TextFlag; - RECT GraphicsRect; -} BANDINFOSTRUCT, *PBANDINFOSTRUCT; - typedef struct { struct list entry; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 76e60ca1596..96b8df48f19 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -81,6 +81,13 @@ struct printer_info static struct list printer_info_list = LIST_INIT(printer_info_list); +struct band_info +{ + BOOL graphics_flag; + BOOL text_flag; + RECT graphics_rect; +}; + typedef struct { struct gdi_physdev dev; @@ -714,11 +721,11 @@ static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void } case BANDINFO: { - BANDINFOSTRUCT *ibi = (BANDINFOSTRUCT*)input; - BANDINFOSTRUCT *obi = (BANDINFOSTRUCT*)output; + struct band_info *ibi = (struct band_info *)input; + struct band_info *obi = (struct band_info *)output; - FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->GraphicsFlag, - ibi->TextFlag, wine_dbgstr_rect(&ibi->GraphicsRect)); + FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->graphics_flag, + ibi->text_flag, wine_dbgstr_rect(&ibi->graphics_rect)); *obi = *ibi; return 1; }

1 0

Piotr Caban : wineps: Define PSDRV_DEVMODE in unixlib.h.
by Alexandre Julliard May 19, 2023

May 19, 2023

Module: wine Branch: master Commit: 36a9bc820a24a326565c496924ee7422533c5453 URL: https://gitlab.winehq.org/wine/wine/-/commit/36a9bc820a24a326565c496924ee74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 15:41:36 2023 +0200 wineps: Define PSDRV_DEVMODE in unixlib.h. --- dlls/wineps.drv/builtin.c | 1 - dlls/wineps.drv/font.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/psdrv.h | 17 ++--------------- dlls/wineps.drv/unixlib.c | 1 - dlls/wineps.drv/unixlib.h | 18 ++++++++++++++++++ 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index d62d4fc134f..02b452b0a8b 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -31,7 +31,6 @@ #include "winternl.h" #include "psdrv.h" -#include "unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 869eb0ea9b6..74171c09530 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -30,7 +30,6 @@ #include "winternl.h" #include "psdrv.h" -#include "unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 78a72303708..9cbea031d48 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -31,7 +31,6 @@ #include "psdrv.h" #include "ddk/winddi.h" #include "ntf.h" -#include "unixlib.h" #include "winspool.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d16e135aeda..981ef6868dd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -28,6 +28,8 @@ #include "wingdi.h" #include "winspool.h" +#include "unixlib.h" + #include "wine/gdi_driver.h" #include "wine/list.h" @@ -210,19 +212,6 @@ typedef struct { DUPLEX *DefaultDuplex; } PPD; -typedef struct { - DEVMODEW dmPublic; - int default_resolution; - int landscape_orientation; - int duplex; - int input_slots; - int resolutions; - int page_sizes; - int font_subs; - int installed_fonts; - BYTE data[1]; -} PSDRV_DEVMODE; - typedef struct { struct list entry; @@ -554,7 +543,6 @@ extern void passthrough_leave(print_ctx *ctx) DECLSPEC_HIDDEN; setlocale(LC_NUMERIC,tmplocale); \ } while (0) -#ifndef WINE_UNIX_LIB static inline WCHAR *strdupW( const WCHAR *str ) { int size; @@ -566,6 +554,5 @@ static inline WCHAR *strdupW( const WCHAR *str ) if (ret) memcpy( ret, str, size ); return ret; } -#endif #endif diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 96b8df48f19..7baffdcd09f 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "ntf.h" -#include "psdrv.h" #include "unixlib.h" #include "ntgdi.h" #include "ddk/winddi.h" diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index e28a4416d09..235f48b5832 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __PSDRV_UNIXLIB_H +#define __PSDRV_UNIXLIB_H + #include "ntuser.h" #include "wine/unixlib.h" @@ -71,6 +74,19 @@ struct installed_font char name[LF_FACESIZE]; }; +typedef struct { + DEVMODEW dmPublic; + int default_resolution; + int landscape_orientation; + int duplex; + int input_slots; + int resolutions; + int page_sizes; + int font_subs; + int installed_fonts; + BYTE data[1]; +} PSDRV_DEVMODE; + /* Unix calls */ enum wineps_funcs { @@ -94,3 +110,5 @@ struct open_dc_params PSDRV_DEVMODE *def_devmode; HDC hdc; }; + +#endif

1 0

Sebastian Mayr : wined3d: Improve d3d8 compatibility of texture filters.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 7a2b34c32492680d32d52a6dde64418f14aa51d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a2b34c32492680d32d52a6dde6441… Author: Sebastian Mayr <me(a)sam.st> Date: Wed May 17 18:20:19 2023 +0200 wined3d: Improve d3d8 compatibility of texture filters. In d3d8, setting texture filters to invalid values does not yield an error when calling IDirect3DDevice8::ValidateDevice. Some applications, such as Worms Blast, rely on this behaviour. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54898 --- dlls/d3d8/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3727ad3e4eb..5cf22b08f79 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2409,6 +2409,15 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); + /* In d3d8, texture filters are not validated, so errors concerning + * unsupported ones are ignored here. */ + if (hr == WINED3DERR_UNSUPPORTEDTEXTUREFILTER) + { + WARN("Ignoring invalid texture filter settings.\n"); + *pass_count = 1; + return D3D_OK; + } + return hr; }

1 0

Brendan Shanks : winemac: Add missing event to dbgstr_event().
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: a4f19d18793761dc1c90f34dc6544dfb6d8cfe01 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4f19d18793761dc1c90f34dc6544d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 18 12:18:13 2023 -0700 winemac: Add missing event to dbgstr_event(). --- dlls/winemac.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 11f5dd3314c..9241a7a3326 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -80,6 +80,7 @@ static const char *dbgstr_event(int type) "STATUS_ITEM_MOUSE_MOVE", "WINDOW_BROUGHT_FORWARD", "WINDOW_CLOSE_REQUESTED", + "WINDOW_DID_MINIMIZE", "WINDOW_DID_UNMINIMIZE", "WINDOW_DRAG_BEGIN", "WINDOW_DRAG_END", @@ -91,6 +92,7 @@ static const char *dbgstr_event(int type) "WINDOW_RESIZE_ENDED", "WINDOW_RESTORE_REQUESTED", }; + C_ASSERT(ARRAYSIZE(event_names) == NUM_EVENT_TYPES); if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; return wine_dbg_sprintf("Unknown event %d", type);

1 0

Sebastian Mayr : d3d8/tests: Test IDirect3DDevice8::ValidateDevice() with various min, mag and mip filters.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 38f3f839438ababa4ae413a9195edfe63b785a53 URL: https://gitlab.winehq.org/wine/wine/-/commit/38f3f839438ababa4ae413a9195edf… Author: Sebastian Mayr <me(a)sam.st> Date: Thu May 18 11:22:46 2023 +0200 d3d8/tests: Test IDirect3DDevice8::ValidateDevice() with various min, mag and mip filters. This test is an adaptation of the corresponding d3d9 test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54898 --- dlls/d3d8/tests/device.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6a585458bae..ec6f2ce51b3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10910,6 +10910,72 @@ static void test_window_position(void) IDirect3D8_Release(d3d); } +static void test_filter(void) +{ + unsigned int mag, min, mip; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + BOOL has_texture; + IDirect3D8 *d3d; + ULONG refcount; + DWORD passes; + HWND window; + HRESULT hr; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + window = create_window(); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); + + for (has_texture = FALSE; has_texture <= TRUE; ++has_texture) + for (mag = 0; mag <= D3DTEXF_GAUSSIANCUBIC + 1; ++mag) + for (min = 0; min <= D3DTEXF_GAUSSIANCUBIC + 1; ++min) + for (mip = 0; mip <= D3DTEXF_GAUSSIANCUBIC + 1; ++mip) + { + if (has_texture) + { + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#lx.\n", hr); + } + else + { + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#lx.\n", hr); + } + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, mag); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MINFILTER, min); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, mip); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#lx.\n", hr); + + passes = 0xdeadbeef; + hr = IDirect3DDevice8_ValidateDevice(device, &passes); + ok(SUCCEEDED(hr), "Failed to validate device, hr %#lx.\n", hr); + ok(passes && passes != 0xdeadbeef, "Got unexpected passes %#lx.\n", passes); + } + + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#lx.\n", hr); + IDirect3DTexture8_Release(texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -11031,6 +11097,7 @@ START_TEST(device) test_creation_parameters(); test_cursor_clipping(); test_window_position(); + test_filter(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Piotr Caban : localspl: Fix wow64_start_doc Wow64 entry point.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 3d9d52dbfc4c6ed129702b8789d10b8a7c878c08 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d9d52dbfc4c6ed129702b8789d10b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 18 20:01:25 2023 +0200 localspl: Fix wow64_start_doc Wow64 entry point. --- dlls/localspl/cups.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index cd2fc0301ba..8ef25c71157 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -520,9 +520,9 @@ static NTSTATUS wow64_start_doc(void *args) struct { unsigned int type; - const PTR32 port; - const PTR32 document_title; - INT64 *doc; + PTR32 port; + PTR32 document_title; + PTR32 doc; } const *params32 = args; struct start_doc_params params = @@ -530,7 +530,7 @@ static NTSTATUS wow64_start_doc(void *args) params32->type, ULongToPtr(params32->port), ULongToPtr(params32->document_title), - params32->doc, + ULongToPtr(params32->doc), }; return start_doc(&params); @@ -541,7 +541,7 @@ static NTSTATUS wow64_write_doc(void *args) struct { INT64 doc; - const PTR32 buf; + PTR32 buf; unsigned int size; } const *params32 = args;

1 0

Bartosz Kosiorek : gdiplus: Improve performance of gdip_transform_points.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 9749caf78e4167b96f58755e28279a6cc033758b URL: https://gitlab.winehq.org/wine/wine/-/commit/9749caf78e4167b96f58755e28279a… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Dec 20 17:21:16 2022 +0100 gdiplus: Improve performance of gdip_transform_points. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/graphics.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fca66c8654b..6831cfcb247 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6887,13 +6887,15 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac if (dst_space != src_space) { - scale_x = units_to_pixels(1.0, graphics->unit, graphics->xres, graphics->printer_display); - scale_y = units_to_pixels(1.0, graphics->unit, graphics->yres, graphics->printer_display); - if(graphics->unit != UnitDisplay) { - scale_x *= graphics->scale; - scale_y *= graphics->scale; + scale_x = units_to_pixels(graphics->scale, graphics->unit, graphics->xres, graphics->printer_display); + scale_y = units_to_pixels(graphics->scale, graphics->unit, graphics->yres, graphics->printer_display); + } + else + { + scale_x = units_to_pixels(1.0, graphics->unit, graphics->xres, graphics->printer_display); + scale_y = units_to_pixels(1.0, graphics->unit, graphics->yres, graphics->printer_display); } if (dst_space < src_space) @@ -6903,12 +6905,11 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac { case WineCoordinateSpaceGdiDevice: { - GpMatrix gdixform; - gdixform = graphics->gdi_transform; + GpMatrix gdixform = graphics->gdi_transform; stat = GdipInvertMatrix(&gdixform); if (stat != Ok) break; - GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + memcpy(matrix->matrix, gdixform.matrix, sizeof(matrix->matrix)); if (dst_space == CoordinateSpaceDevice) break; /* else fall-through */ @@ -6934,7 +6935,7 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac switch ((int)src_space) { case CoordinateSpaceWorld: - GdipMultiplyMatrix(matrix, &graphics->worldtrans, MatrixOrderAppend); + memcpy(matrix->matrix, &graphics->worldtrans, sizeof(matrix->matrix)); if (dst_space == CoordinateSpacePage) break; /* else fall-through */

1 0