June 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Move UpdateLayeredWindow implementation out of the drivers.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 83a143efe0b0714ff90edfd1654dcd295feada2f URL: https://gitlab.winehq.org/wine/wine/-/commit/83a143efe0b0714ff90edfd1654dcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 08:41:11 2024 +0200 win32u: Move UpdateLayeredWindow implementation out of the drivers. --- dlls/win32u/driver.c | 11 +++++----- dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++----------- dlls/wineandroid.drv/android.h | 2 -- dlls/wineandroid.drv/init.c | 1 - dlls/wineandroid.drv/window.c | 49 ------------------------------------------ dlls/winemac.drv/macdrv.h | 4 ++-- dlls/winemac.drv/window.c | 40 +++------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/window.c | 40 ---------------------------------- dlls/winex11.drv/x11drv.h | 2 -- include/wine/gdi_driver.h | 4 +--- 11 files changed, 46 insertions(+), 156 deletions(-)

1 0

Rémi Bernon : server: Avoid calling set_event from within msg_queue_add_queue.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 9ec501141e153aa01bcd6e4ce3846d1a4f786d51 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ec501141e153aa01bcd6e4ce3846d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 22:40:46 2024 +0200 server: Avoid calling set_event from within msg_queue_add_queue. --- server/queue.c | 10 ++++++++-- server/thread.c | 8 ++++++-- server/user.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index e881e40271d..7a1a8b6ece6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1098,7 +1098,6 @@ static int is_queue_hung( struct msg_queue *queue ) static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - struct process *process = get_wait_queue_thread(entry)->process; /* a thread can only wait on its own queue */ if (get_wait_queue_thread(entry)->queue != queue) @@ -1106,7 +1105,6 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - if (process->idle_event && !(queue->wake_mask & QS_SMRESULT)) set_event( process->idle_event ); if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN ); @@ -1255,6 +1253,14 @@ static int check_queue_input_window( struct msg_queue *queue, user_handle_t wind return ret; } +/* check if the thread queue is idle and set the process idle event if so */ +void check_thread_queue_idle( struct thread *thread ) +{ + struct msg_queue *queue = thread->queue; + if ((queue->wake_mask & QS_SMRESULT)) return; + if (thread->process->idle_event) set_event( thread->process->idle_event ); +} + /* make sure the specified thread has a queue */ int init_thread_queue( struct thread *thread ) { diff --git a/server/thread.c b/server/thread.c index 55bd63d3030..6542e1584ab 100644 --- a/server/thread.c +++ b/server/thread.c @@ -778,7 +778,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj { struct thread_wait *wait; struct wait_queue_entry *entry; - unsigned int i; + unsigned int i, idle = 0; if (!(wait = mem_alloc( FIELD_OFFSET(struct thread_wait, queues[count]) ))) return 0; wait->next = current->wait; @@ -802,8 +802,12 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj end_wait( current, get_error() ); return 0; } + + if (obj == (struct object *)current->queue) idle = 1; } - return 1; + + if (idle) check_thread_queue_idle( current ); + return current->wait ? 1 : 0; } static int wait_on_handles( const select_op_t *select_op, unsigned int count, const obj_handle_t *handles, diff --git a/server/user.h b/server/user.h index d805a179d16..703a55d5009 100644 --- a/server/user.h +++ b/server/user.h @@ -113,6 +113,7 @@ extern void set_queue_hooks( struct thread *thread, struct hook_table *hooks ); extern void inc_queue_paint_count( struct thread *thread, int incr ); extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); +extern void check_thread_queue_idle( struct thread *thread ); extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to ); extern void detach_thread_input( struct thread *thread_from ); extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect,

1 0

Brendan McGrath : kernel32/tests: Test error code when FindFirstFileA uses file as directory.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 34446f8cb66036dd3cd0083a558eafd351317150 URL: https://gitlab.winehq.org/wine/wine/-/commit/34446f8cb66036dd3cd0083a558eaf… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue May 28 12:24:24 2024 +1000 kernel32/tests: Test error code when FindFirstFileA uses file as directory. --- dlls/kernel32/tests/file.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 02625140702..9e5c1e4c594 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2715,6 +2715,7 @@ static void test_FindFirstFileA(void) char buffer[5] = "C:\\"; char buffer2[100]; char nonexistent[MAX_PATH]; + BOOL found = FALSE; /* try FindFirstFileA on "C:\" */ buffer[0] = get_windows_drive(); @@ -2746,10 +2747,32 @@ static void test_FindFirstFileA(void) ok( FindNextFileA( handle, &data ), "FindNextFile failed\n" ); ok( !strcmp( data.cFileName, ".." ), "FindNextFile should return '..' as second entry\n" ); while (FindNextFileA( handle, &data )) + { ok ( strcmp( data.cFileName, "." ) && strcmp( data.cFileName, ".." ), "FindNextFile shouldn't return '%s'\n", data.cFileName ); + if (!found && (data.dwFileAttributes == FILE_ATTRIBUTE_NORMAL || + data.dwFileAttributes == FILE_ATTRIBUTE_ARCHIVE)) + { + GetWindowsDirectoryA( buffer2, sizeof(buffer2) ); + strcat(buffer2, "\\"); + strcat(buffer2, data.cFileName); + strcat(buffer2, "\\*"); + found = TRUE; + } + } ok ( FindClose(handle) == TRUE, "Failed to close handle %s\n", buffer2 ); + ok ( found, "Windows dir should not be empty\n" ); + if (found) + { + SetLastError( 0xdeadbeef ); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); + todo_wine + ok ( err == ERROR_DIRECTORY, "Bad Error number %x\n", err ); + } + /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ))

1 0

Brendan McGrath : ntdll/tests: Test error code when NtOpenFile uses file as directory.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: a0c2f40b4e26128bd3ba99613eeba4b2e41d6e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0c2f40b4e26128bd3ba99613eeba4… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 29 11:46:11 2024 +1000 ntdll/tests: Test error code when NtOpenFile uses file as directory. --- dlls/ntdll/tests/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9dd49c925b7..7961abad1b1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -414,6 +414,16 @@ static void open_file_test(void) CloseHandle( handle ); pRtlFreeUnicodeString( &nameW ); + wcscat( path, L"\\" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = NtOpenFile( &handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); + todo_wine + ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + pRtlFreeUnicodeString( &nameW ); + wcscat( path, L"\\cmd.exe" ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,

1 0

Brendan McGrath : server: Don't always return STATUS_OBJECT_NAME_INVALID on ENOTDIR.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: d88863805dc4b79d965577a31b2845c0c81a09d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d88863805dc4b79d965577a31b2845… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 29 11:52:18 2024 +1000 server: Don't always return STATUS_OBJECT_NAME_INVALID on ENOTDIR. Only return STATUS_OBJECT_NAME_INVALID if we're not looking for a FILE_DIRECTORY_FILE. --- dlls/kernel32/tests/file.c | 1 - dlls/ntdll/tests/file.c | 1 - server/fd.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9e5c1e4c594..940b1441e19 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2769,7 +2769,6 @@ static void test_FindFirstFileA(void) handle = FindFirstFileA(buffer2, &data); err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); - todo_wine ok ( err == ERROR_DIRECTORY, "Bad Error number %x\n", err ); } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7961abad1b1..7d3618a3804 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -419,7 +419,6 @@ static void open_file_test(void) status = NtOpenFile( &handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); - todo_wine ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); pRtlFreeUnicodeString( &nameW ); diff --git a/server/fd.c b/server/fd.c index fc7f7be92b9..f28937466fc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1942,7 +1942,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam if (fd->unix_fd == -1) { /* check for trailing slash on file path */ - if ((errno == ENOENT || errno == ENOTDIR) && name[strlen(name) - 1] == '/') + if ((errno == ENOENT || (errno == ENOTDIR && !(options & FILE_DIRECTORY_FILE))) && name[strlen(name) - 1] == '/') set_error( STATUS_OBJECT_NAME_INVALID ); else file_set_error();

1 0

Brendan Shanks : ntdll: On macOS, check for xattr existence before calling getxattr.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 6a512200f4719ea6b0be6de83cac632112a38b36 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a512200f4719ea6b0be6de83cac63… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 30 15:34:34 2024 -0700 ntdll: On macOS, check for xattr existence before calling getxattr. --- dlls/ntdll/unix/file.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d1a6573ed69..1cafe7aa8b7 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -408,8 +408,42 @@ static int xattr_fset( int filedes, const char *name, const void *value, size_t } +/* On macOS, getxattr() is significantly slower than listxattr() + * (even for files with no extended attributes). + */ +#ifdef __APPLE__ +static BOOL xattr_exists( const char **path, int *filedes, const char *name ) +{ + char xattrs[1024]; + ssize_t i = 0, ret; + + if (path) + ret = listxattr( *path, xattrs, sizeof(xattrs), 0 ); + else + ret = flistxattr( *filedes, xattrs, sizeof(xattrs), 0 ); + if (ret == -1) + return errno == ERANGE; + + while (i < ret) + { + if (!strcmp( name, &xattrs[i] )) + return TRUE; + i += strlen(&xattrs[i]) + 1; + } + + errno = ENOATTR; + return FALSE; +} +#endif + + static int xattr_get( const char *path, const char *name, void *value, size_t size ) { +#ifdef __APPLE__ + if (!xattr_exists( &path, NULL, name )) + return -1; +#endif + #ifdef HAVE_SYS_XATTR_H # ifdef XATTR_ADDITIONAL_OPTIONS return getxattr( path, name, value, size, 0, 0 ); @@ -428,6 +462,11 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si static int xattr_fget( int filedes, const char *name, void *value, size_t size ) { +#ifdef __APPLE__ + if (!xattr_exists( NULL, &filedes, name )) + return -1; +#endif + #ifdef HAVE_SYS_XATTR_H # ifdef XATTR_ADDITIONAL_OPTIONS return fgetxattr( filedes, name, value, size, 0, 0 );

1 0

Piotr Caban : wineps.drv: Don't use dynamic buffer when writing new page info.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: de9393c8b73c91cd0e0871e8e713edf95c8bc73b URL: https://gitlab.winehq.org/wine/wine/-/commit/de9393c8b73c91cd0e0871e8e713ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 15:11:54 2024 +0200 wineps.drv: Don't use dynamic buffer when writing new page info. --- dlls/wineps.drv/ps.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 59e245b9b6c..149bfc81c36 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -526,19 +526,11 @@ INT PSDRV_WriteEndPage( print_ctx *ctx ) INT PSDRV_WriteNewPage( print_ctx *ctx ) { - char *buf; - char name[100]; signed int xtrans, ytrans, rotation; - int ret = 1; + char buf[256], name[16]; sprintf(name, "%d", ctx->job.PageNo); - buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psnewpage) + 200 ); - if(!buf) { - WARN("HeapAlloc failed\n"); - return 0; - } - if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE) { if(ctx->pi->ppd->LandscapeOrientation == -90) { xtrans = GetDeviceCaps(ctx->hdc, PHYSICALHEIGHT) - @@ -564,10 +556,9 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); - ret = 0; + return 0; } - HeapFree( GetProcessHeap(), 0, buf ); - return ret; + return 1; }

1 0

Piotr Caban : wineps.drv: Write page orientation hint for every page.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 3b3ad61cdd691b515b32540f69de6a1009cbad74 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b3ad61cdd691b515b32540f69de6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 15:16:07 2024 +0200 wineps.drv: Write page orientation hint for every page. --- dlls/wineps.drv/ps.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 149bfc81c36..e1be2261e15 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -51,12 +51,11 @@ static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; /* intentionally empty value */ -static const char psheader[] = /* title llx lly urx ury orientation */ +static const char psheader[] = /* title llx lly urx ury */ "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" "%%%%BoundingBox: %d %d %d %d\n" "%%%%Pages: (atend)\n" -"%%%%Orientation: %s\n" "%%%%EndComments\n"; static const char psbeginprolog[] = @@ -94,8 +93,9 @@ static const char psendfeature[] = "\n%%EndFeature\n" "} stopped cleartomark\n"; -static const char psnewpage[] = /* name, number, xres, yres, xtrans, ytrans, rot */ +static const char psnewpage[] = /* name, number, orientation, xres, yres, xtrans, ytrans, rot */ "%%%%Page: %s %d\n" +"%%%%PageOrientation: %s\n" "%%%%BeginPageSetup\n" "/pgsave save def\n" "72 %d div 72 %d div scale\n" @@ -402,7 +402,6 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic ); int llx, lly, urx, ury; int ret, len; - const char * dmOrientation; struct ticket_info ticket_info = { page, duplex }; @@ -459,8 +458,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) } /* FIXME should do something better with BBox */ - dmOrientation = (ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait"); - sprintf(buf, psheader, escaped_title, llx, lly, urx, ury, dmOrientation); + sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); HeapFree(GetProcessHeap(), 0, escaped_title); @@ -551,8 +549,9 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) } sprintf(buf, psnewpage, name, ctx->job.PageNo, - GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY), - xtrans, ytrans, rotation); + ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait", + GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY), + xtrans, ytrans, rotation); if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n");

1 0

Piotr Caban : wineps.drv: Take all pages into account when computing bounding box.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 845a231f95af3a9a72a872686255dc35f729959e URL: https://gitlab.winehq.org/wine/wine/-/commit/845a231f95af3a9a72a872686255dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 19:11:35 2024 +0200 wineps.drv: Take all pages into account when computing bounding box. --- dlls/wineps.drv/ps.c | 89 +++++++++++++++++++++++++++---------------------- dlls/wineps.drv/psdrv.h | 1 + 2 files changed, 51 insertions(+), 39 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index e1be2261e15..b78813466a3 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -51,10 +51,10 @@ static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; /* intentionally empty value */ -static const char psheader[] = /* title llx lly urx ury */ +static const char psheader[] = /* title */ "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" -"%%%%BoundingBox: %d %d %d %d\n" +"%%%%BoundingBox: (atend)\n" "%%%%Pages: (atend)\n" "%%%%EndComments\n"; @@ -108,8 +108,9 @@ static const char psendpage[] = "pgsave restore\n" "showpage\n"; -static const char psfooter[] = /* pages */ +static const char psfooter[] = /* llx, lly, urx, ury, pages */ "%%%%Trailer\n" +"%%%%BoundingBox: %ld %ld %ld %ld\n" "%%%%Pages: %d\n" "%%%%EOF\n"; @@ -400,7 +401,6 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) INPUTSLOT *slot = find_slot( ctx->pi->ppd, &ctx->Devmode->dmPublic ); PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic ); - int llx, lly, urx, ury; int ret, len; struct ticket_info ticket_info = { page, duplex }; @@ -419,46 +419,14 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) escaped_title = escape_title(title); buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psheader) + - strlen(escaped_title) + 30 ); + strlen(escaped_title) ); if(!buf) { WARN("HeapAlloc failed\n"); HeapFree(GetProcessHeap(), 0, escaped_title); return 0; } - /* BBox co-ords are in default user co-ord system so urx < ury even in - landscape mode */ - if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) && page) - { - if (page->ImageableArea) - { - llx = page->ImageableArea->llx; - lly = page->ImageableArea->lly; - urx = page->ImageableArea->urx; - ury = page->ImageableArea->ury; - } - else - { - llx = lly = 0; - urx = page->PaperDimension->x; - ury = page->PaperDimension->y; - } - } - else if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && - (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) - { - /* Devmode sizes in 1/10 mm */ - llx = lly = 0; - urx = ctx->Devmode->dmPublic.dmPaperWidth * 72.0 / 254.0; - ury = ctx->Devmode->dmPublic.dmPaperLength * 72.0 / 254.0; - } - else - { - llx = lly = urx = ury = 0; - } - /* FIXME should do something better with BBox */ - - sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); + sprintf(buf, psheader, escaped_title); HeapFree(GetProcessHeap(), 0, escaped_title); @@ -498,7 +466,8 @@ INT PSDRV_WriteFooter( print_ctx *ctx ) return 0; } - sprintf(buf, psfooter, ctx->job.PageNo); + sprintf(buf, psfooter, ctx->bbox.left, ctx->bbox.top, + ctx->bbox.right, ctx->bbox.bottom, ctx->job.PageNo); if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); @@ -520,15 +489,57 @@ INT PSDRV_WriteEndPage( print_ctx *ctx ) } +static void get_bounding_box( print_ctx *ctx, RECT *bbox) +{ + PAGESIZE *page; + + /* BBox co-ords are in default user co-ord system so urx < ury even in + landscape mode */ + if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERSIZE) && + (page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ))) + { + if (page->ImageableArea) + { + bbox->left = page->ImageableArea->llx; + bbox->top = page->ImageableArea->lly; + bbox->right = page->ImageableArea->urx; + bbox->bottom = page->ImageableArea->ury; + } + else + { + bbox->left = bbox->top = 0; + bbox->right = page->PaperDimension->x; + bbox->bottom = page->PaperDimension->y; + } + } + else if ((ctx->Devmode->dmPublic.dmFields & DM_PAPERLENGTH) && + (ctx->Devmode->dmPublic.dmFields & DM_PAPERWIDTH)) + { + /* Devmode sizes in 1/10 mm */ + bbox->left = bbox->top = 0; + bbox->right = ctx->Devmode->dmPublic.dmPaperWidth * 72.0 / 254.0; + bbox->bottom = ctx->Devmode->dmPublic.dmPaperLength * 72.0 / 254.0; + } + else + { + bbox->left = bbox->top = bbox->right = bbox->bottom = 0; + } + /* FIXME should do something better with BBox */ +} + INT PSDRV_WriteNewPage( print_ctx *ctx ) { signed int xtrans, ytrans, rotation; char buf[256], name[16]; + RECT bbox; sprintf(name, "%d", ctx->job.PageNo); + get_bounding_box( ctx, &bbox ); + UnionRect( &ctx->bbox, &bbox, &ctx->bbox ); + if(ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE) { if(ctx->pi->ppd->LandscapeOrientation == -90) { xtrans = GetDeviceCaps(ctx->hdc, PHYSICALHEIGHT) - diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 31adc36adfc..d1ac2cc06cd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -368,6 +368,7 @@ typedef struct PSDRV_DEVMODE *Devmode; PRINTERINFO *pi; int pathdepth; + RECT bbox; } print_ctx; extern print_ctx *create_print_ctx( HDC hdc, const WCHAR *device,

1 0

Piotr Caban : wineps.drv: Write PageBoundingBox for every page.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 4047fb78a8bba27c301b159db231c755130a9022 URL: https://gitlab.winehq.org/wine/wine/-/commit/4047fb78a8bba27c301b159db231c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 19:50:32 2024 +0200 wineps.drv: Write PageBoundingBox for every page. --- dlls/wineps.drv/ps.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index b78813466a3..9896ea46bc7 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -93,8 +93,10 @@ static const char psendfeature[] = "\n%%EndFeature\n" "} stopped cleartomark\n"; -static const char psnewpage[] = /* name, number, orientation, xres, yres, xtrans, ytrans, rot */ +static const char psnewpage[] = /* name, number, llx, lly, urx, ury, orientation, + xres, yres, xtrans, ytrans, rot */ "%%%%Page: %s %d\n" +"%%%%PageBoundingBox: %ld %ld %ld %ld\n" "%%%%PageOrientation: %s\n" "%%%%BeginPageSetup\n" "/pgsave save def\n" @@ -560,6 +562,7 @@ INT PSDRV_WriteNewPage( print_ctx *ctx ) } sprintf(buf, psnewpage, name, ctx->job.PageNo, + bbox.left, bbox.top, bbox.right, bbox.bottom, ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait", GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY), xtrans, ytrans, rotation);

1 0