- Wine-Commits - list.winehq.org

Rémi Bernon : ntdll: Keep the region base offset in the block header.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: fd8e52b4e7604e85924afd70482282efd583e74c URL: https://gitlab.winehq.org/wine/wine/-/commit/fd8e52b4e7604e85924afd70482282… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 20 14:45:08 2022 +0100 ntdll: Keep the region base offset in the block header. --- dlls/ntdll/heap.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cb1ff12c679..f661a05ed65 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -82,7 +82,8 @@ struct block WORD block_size; /* block size in multiple of BLOCK_ALIGN */ BYTE block_flags; BYTE tail_size; /* unused size (used block) / high size bits (free block) */ - DWORD block_type; + WORD base_offset; /* offset to the region base in multiple of REGION_ALIGN */ + WORD block_type; }; C_ASSERT( sizeof(struct block) == 8 ); @@ -123,10 +124,10 @@ typedef struct C_ASSERT( sizeof(ARENA_LARGE) == offsetof(ARENA_LARGE, block) + sizeof(struct block) ); C_ASSERT( sizeof(ARENA_LARGE) == 4 * BLOCK_ALIGN ); -#define BLOCK_TYPE_USED 0x455355 -#define BLOCK_TYPE_DEAD 0xbedead -#define BLOCK_TYPE_FREE 0x45455246 -#define BLOCK_TYPE_LARGE 0x6752614c +#define BLOCK_TYPE_USED 0x5355 +#define BLOCK_TYPE_DEAD 0xdead +#define BLOCK_TYPE_FREE 0x5246 +#define BLOCK_TYPE_LARGE 0x614c #define BLOCK_FILL_USED 0x55 #define BLOCK_FILL_TAIL 0xab @@ -134,14 +135,26 @@ C_ASSERT( sizeof(ARENA_LARGE) == 4 * BLOCK_ALIGN ); #define ROUND_ADDR(addr, mask) ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) #define ROUND_SIZE(size, mask) ((((SIZE_T)(size) + (mask)) & ~(SIZE_T)(mask))) +#define FIELD_MAX(type, field) (((SIZE_T)1 << (sizeof(((type *)0)->field) * 8)) - 1) #define HEAP_MIN_BLOCK_SIZE ROUND_SIZE(sizeof(struct entry) + BLOCK_ALIGN, BLOCK_ALIGN - 1) C_ASSERT( sizeof(struct block) <= HEAP_MIN_BLOCK_SIZE ); C_ASSERT( sizeof(struct entry) <= HEAP_MIN_BLOCK_SIZE ); +/* used block size is coded into block_size */ +#define HEAP_MAX_USED_BLOCK_SIZE (FIELD_MAX( struct block, block_size ) * BLOCK_ALIGN) +/* free block size is coded into block_size + tail_size */ +#define HEAP_MAX_FREE_BLOCK_SIZE (HEAP_MAX_USED_BLOCK_SIZE + (FIELD_MAX( struct block, tail_size ) << 16) * BLOCK_ALIGN) +/* subheap distance is coded into base_offset */ +#define HEAP_MAX_BLOCK_REGION_SIZE (FIELD_MAX( struct block, base_offset ) * REGION_ALIGN) + +C_ASSERT( HEAP_MAX_USED_BLOCK_SIZE == 512 * 1024 * (sizeof(void *) / 4) - BLOCK_ALIGN ); +C_ASSERT( HEAP_MAX_FREE_BLOCK_SIZE == 128 * 1024 * 1024 * (sizeof(void *) / 4) - BLOCK_ALIGN ); +C_ASSERT( HEAP_MAX_BLOCK_REGION_SIZE >= HEAP_MAX_FREE_BLOCK_SIZE ); + /* minimum size to start allocating large blocks */ -#define HEAP_MIN_LARGE_BLOCK_SIZE (0x10000 * BLOCK_ALIGN - 0x1000) +#define HEAP_MIN_LARGE_BLOCK_SIZE (HEAP_MAX_USED_BLOCK_SIZE - 0x1000) /* There will be a free list bucket for every arena size up to and including this value */ #define HEAP_MAX_SMALL_FREE_LIST 0x100 @@ -233,6 +246,12 @@ static inline UINT block_get_type( const struct block *block ) return block->block_type; } +static inline void block_set_base( struct block *block, const void *base ) +{ + const char *offset = ROUND_ADDR( block, REGION_ALIGN - 1 ); + block->base_offset = (offset - (char *)base) / REGION_ALIGN; +} + static inline void block_set_type( struct block *block, UINT type ) { block->block_type = type; @@ -689,6 +708,7 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, valgrind_make_writable( block, sizeof(*entry) ); block_set_type( block, BLOCK_TYPE_FREE ); + block_set_base( block, subheap_base( subheap ) ); block_set_flags( block, ~0, BLOCK_FLAG_FREE ); block_set_size( block, block_size ); @@ -812,6 +832,7 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_ arena->block_size = (char *)address + total_size - (char *)block; block_set_type( block, BLOCK_TYPE_LARGE ); + block_set_base( block, arena ); block_set_flags( block, ~0, BLOCK_FLAG_LARGE | BLOCK_USER_FLAGS( flags ) ); block_set_size( block, 0 ); list_add_tail( &heap->large_list, &arena->entry ); @@ -980,6 +1001,7 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR block_set_flags( &pEntry->block, ~0, BLOCK_FLAG_FREE_LINK ); block_set_size( &pEntry->block, 0 ); block_set_type( &pEntry->block, BLOCK_TYPE_FREE ); + block_set_base( &pEntry->block, heap ); if (i) list_add_after( &pEntry[-1].entry, &pEntry->entry ); } @@ -1049,7 +1071,7 @@ static struct block *find_free_block( struct heap *heap, ULONG flags, SIZE_T blo if ((*subheap = HEAP_CreateSubHeap( &heap, NULL, flags, total_size, max( heap->grow_size, total_size ) ))) { - if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; + if (heap->grow_size <= HEAP_MAX_FREE_BLOCK_SIZE / 2) heap->grow_size *= 2; } else while (!*subheap) /* shrink the grow size again if we are running out of space */ {

1 0

Eric Pouech : winedump: Don't crash when dumping .dbg files.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 944edd5068ab46e1682f9a3943976268fcc58a4d URL: https://gitlab.winehq.org/wine/wine/-/commit/944edd5068ab46e1682f9a39439762… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 28 16:03:57 2022 +0100 winedump: Don't crash when dumping .dbg files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d901290be35..7ec378a19b8 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -468,7 +468,7 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) unsigned i; const char* strtable; - if (PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) + if (PE_nt_headers && PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) { strtable = (const char*)base + PE_nt_headers->FileHeader.PointerToSymbolTable +

1 0

Jacek Caban : ntdll: Get TEB from signal stack pointer in init_handler.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: e7accd7c0f9d8aa7c8c52a7d48c3374da49e32f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7accd7c0f9d8aa7c8c52a7d48c337… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 18:06:18 2022 +0100 ntdll: Get TEB from signal stack pointer in init_handler. We can't use NtCurrentTeb before setting %fs base. --- dlls/ntdll/unix/signal_x86_64.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cc070dda5ae..8541dc9ccaf 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -440,6 +440,13 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } +static inline TEB *get_current_teb(void) +{ + unsigned long rsp; + __asm__( "movq %%rsp,%0" : "=r" (rsp) ); + return (TEB *)(rsp & ~signal_stack_mask); +} + static BOOL is_inside_syscall( const ucontext_t *sigcontext ) { return ((char *)RSP_sig(sigcontext) >= (char *)ntdll_get_thread_data()->kernel_stack && @@ -806,7 +813,11 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex static inline void init_handler( const ucontext_t *sigcontext ) { #ifdef __linux__ - if (fs32_sel) arch_prctl( ARCH_SET_FS, amd64_thread_data()->pthread_teb ); + if (fs32_sel) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&get_current_teb()->GdiTebBatch; + arch_prctl( ARCH_SET_FS, ((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb ); + } #endif }

1 0

Jacek Caban : configure: Use -fuse-ld=lld also for compilation targets.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: eaae51b11c8c98bb6fd43572f9e120c0a3bb821e URL: https://gitlab.winehq.org/wine/wine/-/commit/eaae51b11c8c98bb6fd43572f9e120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 14:37:30 2022 +0100 configure: Use -fuse-ld=lld also for compilation targets. This is used by clang to distinguish between MSVC and windows-itanium targets. We override default option (usually meant for native builds) to make sure that we use the right target. --- configure | 16 ++++++++-------- configure.ac | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 35b8ff32551..5742119fc7d 100755 --- a/configure +++ b/configure @@ -10835,7 +10835,6 @@ then : done llvm_target=$target - llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $wine_arch in @@ -10844,19 +10843,20 @@ then : *) llvm_target=$wine_arch-windows ;; esac fi + llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" case $llvm_target in - *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + *windows) llvm_cflags="-Wl,-subsystem:console" ;; esac - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-target $llvm_target $llvm_cflags" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -target $llvm_target $llvm_cflags" >&5 -printf %s "checking whether $CC supports -target $llvm_target $llvm_cflags... " >&6; } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags" >&5 +printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags... " >&6; } if eval test \${$as_ac_var+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -target $llvm_target $llvm_cflags" +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $llvm_extra_cflags $llvm_cflags" ac_exeext=".exe" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10880,8 +10880,8 @@ if eval test \"x\$"$as_ac_var"\" = x"yes" then : target=$llvm_target eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" - as_fn_append ${wine_arch}_EXTRACFLAGS " -target $target" - CFLAGS="$CFLAGS -target $target $llvm_cflags" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" + CFLAGS="$llvm_extra_cflags $llvm_cflags" fi } eval "${wine_arch}_TARGET=\$target" fi diff --git a/configure.ac b/configure.ac index 7313fde9a4e..cb91c9c02b5 100644 --- a/configure.ac +++ b/configure.ac @@ -931,7 +931,6 @@ do dnl Check if cross compiler supports -target argument llvm_target=$target - llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $wine_arch in @@ -940,14 +939,15 @@ do *) llvm_target=$wine_arch-windows ;; esac fi + llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" case $llvm_target in - *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + *windows) llvm_cflags="-Wl,-subsystem:console" ;; esac - WINE_TRY_PE_CFLAGS([-target $llvm_target $llvm_cflags], + WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags], [target=$llvm_target AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) - AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" -target $target"]) - CFLAGS="$CFLAGS -target $target $llvm_cflags"]) + AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) + CFLAGS="$llvm_extra_cflags $llvm_cflags"]) AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc])

1 0

Jacek Caban : winegcc: Use -nostdlib instead of -nostartfiles on Clang MSVC targets.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: cc91a2f933ed24570aff5d05ec179d6cdeac1026 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc91a2f933ed24570aff5d05ec179d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 14:36:30 2022 +0100 winegcc: Use -nostdlib instead of -nostartfiles on Clang MSVC targets. -nostartfiles is not enough if clang is configured with explicit default rtlib. --- tools/winegcc/winegcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 71d2b93f0c6..a850cce765f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -482,7 +482,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n } if (opts->unicode_app) strarray_add( &flags, "-municode" ); if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( &flags, "-nodefaultlibs" ); - if (opts->nostartfiles || opts->use_msvcrt) strarray_add( &flags, "-nostartfiles" ); + if (opts->nostartfiles) strarray_add( &flags, "-nostartfiles" ); + if (opts->use_msvcrt) strarray_add( &flags, "-nostdlib" ); if (opts->image_base) strarray_add( &flags, strmake("-Wl,-base:%s", opts->image_base )); if (opts->subsystem) strarray_add( &flags, strmake("-Wl,-subsystem:%s", opts->subsystem ));

1 0

Piotr Caban : localspl: Add StartDocPrinter implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: baabf623fecb71a658535df9a6f70aa4253f374e URL: https://gitlab.winehq.org/wine/wine/-/commit/baabf623fecb71a658535df9a6f70a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 14:48:43 2022 +0100 localspl: Add StartDocPrinter implementation. --- dlls/localspl/provider.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c6028144f58..0365c5d1f44 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -222,6 +222,7 @@ typedef struct { struct list entry; DWORD id; WCHAR *filename; + WCHAR *port; WCHAR *document_title; DEVMODEW *devmode; } job_t; @@ -241,6 +242,7 @@ typedef struct { monitor_t * pm; HANDLE hXcv; DEVMODEW *devmode; + job_t *doc; } printer_t; /* ############################### */ @@ -517,6 +519,7 @@ static void free_job(job_t *job) { list_remove(&job->entry); free(job->filename); + free(job->port); free(job->document_title); free(job->devmode); free(job); @@ -2905,6 +2908,13 @@ static job_t* add_job(printer_t *printer, DOC_INFO_1W *info) free(job); return NULL; } + job->port = wcsdup(info->pOutputFile); + if (info->pOutputFile && !job->port) + { + free(job->filename); + free(job); + return NULL; + } while (1) { @@ -2973,6 +2983,37 @@ static BOOL WINAPI fpAddJob(HANDLE hprinter, DWORD level, BYTE *data, DWORD size return TRUE; } +static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_info) +{ + printer_t *printer = (printer_t *)hprinter; + DOC_INFO_1W *info = (DOC_INFO_1W *)doc_info; + + TRACE("(%p %ld %p {pDocName = %s, pOutputFile = %s, pDatatype = %s})\n", + hprinter, level, doc_info, debugstr_w(info->pDocName), + debugstr_w(info->pOutputFile), debugstr_w(info->pDatatype)); + + if (!printer || !printer->info) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (level < 1 || level > 3) + { + SetLastError(ERROR_INVALID_LEVEL); + return 0; + } + + if (printer->doc) + { + SetLastError(ERROR_INVALID_PRINTER_STATE); + return 0; + } + + printer->doc = add_job(printer, info); + return printer->doc ? printer->doc->id : 0; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, NULL, /* fpSetJob */ @@ -2993,7 +3034,7 @@ static const PRINTPROVIDOR backend = { fpGetPrintProcessorDirectory, NULL, /* fpDeletePrintProcessor */ NULL, /* fpEnumPrintProcessorDatatypes */ - NULL, /* fpStartDocPrinter */ + fpStartDocPrinter, NULL, /* fpStartPagePrinter */ NULL, /* fpWritePrinter */ NULL, /* fpEndPagePrinter */

1 0

Piotr Caban : localspl: Add SetJob implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 3110f5d764f8fd116771f732b21c508a634631ef URL: https://gitlab.winehq.org/wine/wine/-/commit/3110f5d764f8fd116771f732b21c50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 14:10:19 2022 +0100 localspl: Add SetJob implementation. --- dlls/localspl/provider.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0365c5d1f44..e4226bf97e5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3014,9 +3014,97 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in return printer->doc ? printer->doc->id : 0; } +static job_t * get_job(printer_info_t *info, DWORD job_id) +{ + job_t *job; + + LIST_FOR_EACH_ENTRY(job, &info->jobs, job_t, entry) + { + if(job->id == job_id) + return job; + } + return NULL; +} + +static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, + DWORD level, BYTE *data, DWORD command) +{ + printer_t *printer = (printer_t *)hprinter; + BOOL ret = FALSE; + job_t *job; + + TRACE("(%p, %ld, %ld, %p, %ld)\n", hprinter, job_id, level, data, command); + FIXME("Ignoring everything other than document title\n"); + + if (!printer || !printer->info) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + EnterCriticalSection(&printer->info->jobs_cs); + job = get_job(printer->info, job_id); + if (!job) + { + LeaveCriticalSection(&printer->info->jobs_cs); + return FALSE; + } + + switch(level) + { + case 0: + ret = TRUE; + break; + case 1: + { + JOB_INFO_1W *info1 = (JOB_INFO_1W *)job; + WCHAR *title = wcsdup(info1->pDocument); + + if (title) + { + free(job->document_title); + job->document_title = title; + ret = TRUE; + } + break; + } + case 2: + { + JOB_INFO_2W *info2 = (JOB_INFO_2W *)job; + WCHAR *title = wcsdup(info2->pDocument); + DEVMODEW *devmode = dup_devmode(info2->pDevMode); + + if (!title || !devmode) + { + free(title); + free(devmode); + } + else + { + free(job->document_title); + free(job->devmode); + job->document_title = title; + job->devmode = devmode; + ret = TRUE; + } + break; + } + case 3: + FIXME("level 3 stub\n"); + ret = TRUE; + break; + default: + SetLastError(ERROR_INVALID_LEVEL); + break; + } + + LeaveCriticalSection(&printer->info->jobs_cs); + return ret; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, - NULL, /* fpSetJob */ + fpSetJob, NULL, /* fpGetJob */ NULL, /* fpEnumJobs */ NULL, /* fpAddPrinter */

1 0

Piotr Caban : localspl: Add GetJob implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 934b63d85a8fc35e3e0d9df2d81fe7250e8a8df5 URL: https://gitlab.winehq.org/wine/wine/-/commit/934b63d85a8fc35e3e0d9df2d81fe7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 17:57:02 2022 +0100 localspl: Add GetJob implementation. --- dlls/localspl/provider.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index e4226bf97e5..589023b800c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3102,10 +3102,133 @@ static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, return ret; } +static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, + BYTE *data, DWORD size, DWORD *needed) +{ + printer_t *printer = (printer_t *)hprinter; + BOOL ret = TRUE; + DWORD s = 0; + job_t *job; + WCHAR *p; + + TRACE("%p %ld %ld %p %ld %p\n", hprinter, job_id, level, data, size, needed); + + if (!printer || !printer->info) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!needed) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + EnterCriticalSection(&printer->info->jobs_cs); + job = get_job(printer->info, job_id); + if (!job) + { + LeaveCriticalSection(&printer->info->jobs_cs); + return FALSE; + } + + switch(level) + { + case 1: + s = sizeof(JOB_INFO_1W); + s += job->document_title ? (wcslen(job->document_title) + 1) * sizeof(WCHAR) : 0; + s += printer->info->name ? + (wcslen(printer->info->name) + 1) * sizeof(WCHAR) : 0; + + if (size >= s) + { + JOB_INFO_1W *info = (JOB_INFO_1W *)data; + + p = (WCHAR *)(info + 1); + memset(info, 0, sizeof(*info)); + info->JobId = job->id; + if (job->document_title) + { + info->pDocument = p; + wcscpy(p, job->document_title); + p += wcslen(job->document_title) + 1; + } + if (printer->info->name) + { + info->pPrinterName = p; + wcscpy(p, printer->info->name); + } + } + break; + case 2: + s = sizeof(JOB_INFO_2W); + s += job->document_title ? (wcslen(job->document_title) + 1) * sizeof(WCHAR) : 0; + s += printer->info->name ? + (wcslen(printer->info->name) + 1) * sizeof(WCHAR) : 0; + if (job->devmode) + { + /* align DEVMODE to a DWORD boundary */ + s += (4 - (s & 3)) & 3; + s += job->devmode->dmSize + job->devmode->dmDriverExtra; + } + + if (size >= s) + { + JOB_INFO_2W *info = (JOB_INFO_2W *)data; + + p = (WCHAR *)(info + 1); + memset(info, 0, sizeof(*info)); + info->JobId = job->id; + if (job->document_title) + { + info->pDocument = p; + wcscpy(p, job->document_title); + p += wcslen(job->document_title) + 1; + } + if (printer->info->name) + { + info->pPrinterName = p; + wcscpy(p, printer->info->name); + p += wcslen(printer->info->name) + 1; + } + if (job->devmode) + { + DEVMODEW *devmode = (DEVMODEW *)(data + s - job->devmode->dmSize + - job->devmode->dmDriverExtra); + info->pDevMode = devmode; + memcpy(devmode, job->devmode, job->devmode->dmSize + job->devmode->dmDriverExtra); + } + } + break; + case 3: + FIXME("level 3 stub\n"); + s = sizeof(JOB_INFO_3); + + if (size >= s) + memset(data, 0, sizeof(JOB_INFO_3)); + break; + default: + SetLastError(ERROR_INVALID_LEVEL); + ret = FALSE; + break; + } + + LeaveCriticalSection(&printer->info->jobs_cs); + + *needed = s; + if (size < s) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + return ret; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, fpSetJob, - NULL, /* fpGetJob */ + fpGetJob, NULL, /* fpEnumJobs */ NULL, /* fpAddPrinter */ NULL, /* fpDeletePrinter */

1 0

Piotr Caban : localspl: Add EndDocPrinter implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 06aac5a4f790e5c3954332a963f99c1c9db26d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/06aac5a4f790e5c3954332a963f99c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 15:21:34 2022 +0100 localspl: Add EndDocPrinter implementation. --- dlls/localspl/provider.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index d26c710fd6e..fcddd2a7018 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3322,6 +3322,30 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) return ret; } +static BOOL WINAPI fpEndDocPrinter(HANDLE hprinter) +{ + printer_t *printer = (printer_t *)hprinter; + BOOL ret; + + TRACE("%p\n", hprinter); + + if (!printer || !printer->info) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!printer->doc) + { + SetLastError(ERROR_SPL_NO_STARTDOC); + return FALSE; + } + + ret = fpScheduleJob(hprinter, printer->doc->id); + printer->doc = NULL; + return ret; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, fpSetJob, @@ -3348,7 +3372,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpEndPagePrinter */ NULL, /* fpAbortPrinter */ NULL, /* fpReadPrinter */ - NULL, /* fpEndDocPrinter */ + fpEndDocPrinter, fpAddJob, fpScheduleJob, NULL, /* fpGetPrinterData */

1 0

Piotr Caban : localspl: Add partial ScheduleJob implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 35c393fd0429879f616f8592d11be78d1fa56d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/35c393fd0429879f616f8592d11be7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 09:20:54 2022 +0100 localspl: Add partial ScheduleJob implementation. --- dlls/localspl/provider.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 589023b800c..d26c710fd6e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -232,6 +232,8 @@ typedef struct { struct list entry; LONG ref; + WCHAR *port; + CRITICAL_SECTION jobs_cs; struct list jobs; } printer_info_t; @@ -474,7 +476,9 @@ static printer_info_t* get_printer_info(const WCHAR *name) { HKEY hkey, hprinter = NULL; printer_info_t *info; + WCHAR port[MAX_PATH]; LSTATUS ret; + DWORD size; EnterCriticalSection(&printers_cs); LIST_FOR_EACH_ENTRY(info, &printers, printer_info_t, entry) @@ -491,6 +495,9 @@ static printer_info_t* get_printer_info(const WCHAR *name) if (ret == ERROR_SUCCESS) ret = RegOpenKeyW(hkey, name, &hprinter); RegCloseKey(hkey); + size = sizeof(port); + if (ret == ERROR_SUCCESS) + ret = RegQueryValueExW(hprinter, L"Port", 0, NULL, (BYTE*)port, &size); RegCloseKey(hprinter); if (ret != ERROR_SUCCESS) { @@ -498,7 +505,8 @@ static printer_info_t* get_printer_info(const WCHAR *name) return NULL; } - if ((info = calloc(1, sizeof(*info))) && (info->name = wcsdup(name))) + if ((info = calloc(1, sizeof(*info))) && (info->name = wcsdup(name)) && + (info->port = wcsdup(port))) { info->ref = 1; list_add_head(&printers, &info->entry); @@ -507,6 +515,7 @@ static printer_info_t* get_printer_info(const WCHAR *name) } else if (info) { + free(info->name); free(info); info = NULL; } @@ -537,6 +546,7 @@ static void release_printer_info(printer_info_t *info) LeaveCriticalSection(&printers_cs); free(info->name); + free(info->port); DeleteCriticalSection(&info->jobs_cs); while (!list_empty(&info->jobs)) { @@ -3225,6 +3235,93 @@ static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, return ret; } +static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) +{ + BOOL ret_startdoc = FALSE, ret_open = FALSE, ret = TRUE; + printer_t *printer = (printer_t *)hprinter; + const WCHAR *port_name, *port; + DOC_INFO_1W info; + monitor_t *mon; + BYTE buf[4096]; + HANDLE hport; + DWORD r, w; + job_t *job; + HANDLE hf; + + TRACE("%p %ld\n", hprinter, job_id); + + if (!printer || !printer->info) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + EnterCriticalSection(&printer->info->jobs_cs); + job = get_job(printer->info, job_id); + if (!job) + { + LeaveCriticalSection(&printer->info->jobs_cs); + return FALSE; + } + + port = job->port; + if (!port) + port = printer->info->port; + TRACE("need to schedule job %ld filename %s to port %s\n", job->id, + debugstr_w(job->filename), debugstr_w(port)); + + hf = CreateFileW(job->filename, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (hf == INVALID_HANDLE_VALUE) + { + DeleteFileW(job->filename); + free_job(job); + LeaveCriticalSection(&printer->info->jobs_cs); + } + + /* TODO: use print processor */ + if (isalpha(port[0]) && port[1] == ':') + port_name = L"FILE:"; + else + port_name = port; + + if (!(mon = monitor_load_by_port(port_name)) || !mon->monitor.pfnOpenPort || + !mon->monitor.pfnStartDocPort || !mon->monitor.pfnWritePort || + !mon->monitor.pfnEndDocPort || !mon->monitor.pfnClosePort) + { + FIXME("port not supported: %s\n", debugstr_w(port_name)); + ret = FALSE; + } + + if (ret) + ret = ret_open = mon->monitor.pfnOpenPort(mon->hmon, (WCHAR *)port_name, &hport); + + if (ret) + { + info.pDocName = job->document_title; + info.pOutputFile = (WCHAR *)port; + info.pDatatype = NULL; + ret = ret_startdoc = mon->monitor.pfnStartDocPort(hport, printer->info->name, + job_id, 1, (BYTE *)&info); + } + + while (ret && ReadFile(hf, buf, sizeof(buf), &r, NULL) && r) + ret = mon->monitor.pfnWritePort(hport, buf, r, &w) && r == w; + + if (ret_startdoc) + mon->monitor.pfnEndDocPort(hport); + if (ret_open) + mon->monitor.pfnClosePort(hport); + if (mon) + monitor_unload(mon); + + CloseHandle(hf); + DeleteFileW(job->filename); + free_job(job); + LeaveCriticalSection(&printer->info->jobs_cs); + return ret; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, fpSetJob, @@ -3253,7 +3350,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpReadPrinter */ NULL, /* fpEndDocPrinter */ fpAddJob, - NULL, /* fpScheduleJob */ + fpScheduleJob, NULL, /* fpGetPrinterData */ NULL, /* fpSetPrinterData */ NULL, /* fpWaitForPrinterChange */

1 0