- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : wintab32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 24e93f29d0f81bedf60a8d0bcca0960b1e8a431e URL: https://gitlab.winehq.org/wine/wine/-/commit/24e93f29d0f81bedf60a8d0bcca096… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:29 2023 +1000 wintab32: Remove DECLSPEC_HIDDEN usage. --- dlls/wintab32/wintab_internal.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 18c64bfe700..b0a2e8fd58f 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -147,16 +147,16 @@ typedef struct tagOPENCONTEXT } OPENCONTEXT, *LPOPENCONTEXT; int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL send_always) DECLSPEC_HIDDEN; -LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) DECLSPEC_HIDDEN; + LPARAM lParam, BOOL send_always); +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); /* X11drv functions */ -extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault) DECLSPEC_HIDDEN; -extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) DECLSPEC_HIDDEN; -extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) DECLSPEC_HIDDEN; -extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) DECLSPEC_HIDDEN; +extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault); +extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet); +extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner); +extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput); -extern HWND hwndDefault DECLSPEC_HIDDEN; -extern CRITICAL_SECTION csTablet DECLSPEC_HIDDEN; +extern HWND hwndDefault; +extern CRITICAL_SECTION csTablet; #endif /* __WINE_WINTAB_INTERNAL_H */

1 0

Alistair Leslie-Hughes : mscms: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: ec39a367eab7aab1db8f6c7dd686e668c60444b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec39a367eab7aab1db8f6c7dd686e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:29 2023 +1000 mscms: Remove DECLSPEC_HIDDEN usage. --- dlls/mscms/mscms_priv.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index c32b5dc6158..06f55606719 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -56,11 +56,11 @@ struct transform cmsHTRANSFORM cmstransform; }; -extern HANDLE alloc_handle( struct object *obj ) DECLSPEC_HIDDEN; -extern void free_handle( HANDLE ) DECLSPEC_HIDDEN; +extern HANDLE alloc_handle( struct object *obj ); +extern void free_handle( HANDLE ); -struct object *grab_object( HANDLE, enum object_type ) DECLSPEC_HIDDEN; -void release_object( struct object * ) DECLSPEC_HIDDEN; +struct object *grab_object( HANDLE, enum object_type ); +void release_object( struct object * ); struct tag_entry { @@ -69,12 +69,12 @@ struct tag_entry DWORD size; }; -extern DWORD get_tag_count( const struct profile * ) DECLSPEC_HIDDEN; -extern BOOL get_tag_entry( const struct profile *, DWORD, struct tag_entry * ) DECLSPEC_HIDDEN; -extern BOOL get_adjusted_tag( const struct profile *, TAGTYPE, struct tag_entry * ) DECLSPEC_HIDDEN; -extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD *, BOOL * ) DECLSPEC_HIDDEN; -extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, DWORD * ) DECLSPEC_HIDDEN; -extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; -extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; +extern DWORD get_tag_count( const struct profile * ); +extern BOOL get_tag_entry( const struct profile *, DWORD, struct tag_entry * ); +extern BOOL get_adjusted_tag( const struct profile *, TAGTYPE, struct tag_entry * ); +extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD *, BOOL * ); +extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, DWORD * ); +extern void get_profile_header( const struct profile *, PROFILEHEADER * ); +extern void set_profile_header( const struct profile *, const PROFILEHEADER * ); -extern const char *dbgstr_tag(DWORD) DECLSPEC_HIDDEN; +extern const char *dbgstr_tag(DWORD);

1 0

Alistair Leslie-Hughes : shlwapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: cdf325c7350a5b7c58a42598d18e199e3c1a77de URL: https://gitlab.winehq.org/wine/wine/-/commit/cdf325c7350a5b7c58a42598d18e19… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:29 2023 +1000 shlwapi: Remove DECLSPEC_HIDDEN usage. --- dlls/shlwapi/shlwapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 1843fa04951..7820bc56281 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; +HINSTANCE shlwapi_hInstance = 0; /************************************************************************* * SHLWAPI {SHLWAPI}

1 0

Alistair Leslie-Hughes : msdaps: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: a8428e8efa7b6f8e1bebeaee3416d6586a287fcc URL: https://gitlab.winehq.org/wine/wine/-/commit/a8428e8efa7b6f8e1bebeaee3416d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:29 2023 +1000 msdaps: Remove DECLSPEC_HIDDEN usage. --- dlls/msdaps/main.c | 10 +++++----- dlls/msdaps/row_server.idl | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 403df3a100b..9143b768fc4 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -39,11 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -extern BOOL WINAPI msdaps_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -extern HRESULT WINAPI msdaps_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI msdaps_DllCanUnloadNow(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI msdaps_DllRegisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI msdaps_DllUnregisterServer(void) DECLSPEC_HIDDEN; +extern BOOL WINAPI msdaps_DllMain(HINSTANCE, DWORD, LPVOID); +extern HRESULT WINAPI msdaps_DllGetClassObject(REFCLSID, REFIID, LPVOID *); +extern HRESULT WINAPI msdaps_DllCanUnloadNow(void); +extern HRESULT WINAPI msdaps_DllRegisterServer(void); +extern HRESULT WINAPI msdaps_DllUnregisterServer(void); /***************************************************************************** * DllMain diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 2434632009d..ff16480d4ec 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -232,7 +232,7 @@ coclass wine_rowset_proxy } -cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") -cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") -cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") -cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* );")

1 0

Alistair Leslie-Hughes : adsldp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: ba0841defa9ff23988569cc68fd921340026d47e URL: https://gitlab.winehq.org/wine/wine/-/commit/ba0841defa9ff23988569cc68fd921… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:28 2023 +1000 adsldp: Remove DECLSPEC_HIDDEN usage. --- dlls/adsldp/adsldp_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 14cfc0c359e..5d8b8177a7b 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -47,9 +47,9 @@ struct attribute_type int single_value; }; -DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; -struct attribute_type *load_schema(LDAP *ld, ULONG *, ULONG *) DECLSPEC_HIDDEN; -ADSTYPEENUM get_schema_type(const WCHAR *, const struct attribute_type *, ULONG, ULONG) DECLSPEC_HIDDEN; -void free_attribute_types(struct attribute_type *, ULONG) DECLSPEC_HIDDEN; +DWORD map_ldap_error(DWORD); +struct attribute_type *load_schema(LDAP *ld, ULONG *, ULONG *); +ADSTYPEENUM get_schema_type(const WCHAR *, const struct attribute_type *, ULONG, ULONG); +void free_attribute_types(struct attribute_type *, ULONG); #endif

1 0

Alistair Leslie-Hughes : appwiz: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 4bcaedb0f7ea39f7399f103a66d58b0539819f76 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bcaedb0f7ea39f7399f103a66d58b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:28 2023 +1000 appwiz: Remove DECLSPEC_HIDDEN usage. --- dlls/appwiz.cpl/appwiz.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index c6562e78cba..9d55310fc3c 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -23,9 +23,9 @@ typedef enum { ADDON_MONO } addon_t; -BOOL install_addon(addon_t) DECLSPEC_HIDDEN; +BOOL install_addon(addon_t); -extern HINSTANCE hInst DECLSPEC_HIDDEN; +extern HINSTANCE hInst; static inline WCHAR *strdupAtoW(const char *str) {

1 0

Alistair Leslie-Hughes : sxs: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 4a83ffa45d72503a1df95389a265ab775a044b9c URL: https://gitlab.winehq.org/wine/wine/-/commit/4a83ffa45d72503a1df95389a265ab… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:28 2023 +1000 sxs: Remove DECLSPEC_HIDDEN usage. --- dlls/sxs/sxs_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h index 4ae6bb8e2fc..ac769527773 100644 --- a/dlls/sxs/sxs_private.h +++ b/dlls/sxs/sxs_private.h @@ -25,4 +25,4 @@ enum name_attr_id NAME_ATTR_ID_VERSION }; -const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id );

1 0

Alistair Leslie-Hughes : netprofm: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 314f113cba608cca3174d2b08fcee6f304a2b1b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/314f113cba608cca3174d2b08fcee6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 10 18:59:28 2023 +1000 netprofm: Remove DECLSPEC_HIDDEN usage. --- dlls/netprofm/netprofm_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netprofm/netprofm_private.h b/dlls/netprofm/netprofm_private.h index 5e863c4d708..86da00d4ee6 100644 --- a/dlls/netprofm/netprofm_private.h +++ b/dlls/netprofm/netprofm_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT list_manager_create(void **) DECLSPEC_HIDDEN; +HRESULT list_manager_create(void **);

1 0

Brendan Shanks : win32u: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 726472fef69341ff20bea068b80da84c3a689bab URL: https://gitlab.winehq.org/wine/wine/-/commit/726472fef69341ff20bea068b80da8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 3 09:40:44 2023 -0700 win32u: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/win32u/dc.c | 2 +- dlls/win32u/dib.c | 2 +- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/syscall.c | 11 +++++++++++ dlls/win32u/win32u_private.h | 11 ++--------- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 0b7d2cd023d..0ff624068cb 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -112,7 +112,7 @@ static DC_ATTR *alloc_dc_attr(void) { SIZE_T size = system_info.AllocationGranularity; bucket->entries = NULL; - if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits(), + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) { bucket->next_free = NULL; diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index acd3f442e49..23dbfbcbfaf 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -1549,7 +1549,7 @@ HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, con { SIZE_T size = bmp->dib.dsBmih.biSizeImage; offset = 0; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits(), + if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) goto error; } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 2201ac4b01e..057988e99e9 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -566,7 +566,7 @@ static void init_gdi_shared(void) { SIZE_T size = sizeof(*gdi_shared); - if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits(), + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) return; next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 4004df3f3d6..99fd7859250 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -33,6 +33,7 @@ #include "ntuser.h" #include "wine/unixlib.h" +ULONG_PTR zero_bits = 0; static void * const syscalls[] = { @@ -450,6 +451,16 @@ static SYSTEM_SERVICE_TABLE syscall_table = static NTSTATUS init( void *dispatcher ) { +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 922fd22fe46..005ab53cc01 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -271,6 +271,8 @@ extern HKEY hkcu_key DECLSPEC_HIDDEN; extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN; +extern ULONG_PTR zero_bits DECLSPEC_HIDDEN; + static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) RtlSetLastWin32Error( RtlNtStatusToDosError( status )); @@ -330,15 +332,6 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } -static inline ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>";

1 0

Piotr Caban : wineps: Buffer data sent to printer port.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: d5373ef6f92d36971859db0746600188ada22a7d URL: https://gitlab.winehq.org/wine/wine/-/commit/d5373ef6f92d36971859db07466001… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 9 13:05:42 2023 +0200 wineps: Buffer data sent to printer port. --- dlls/wineps.drv/escape.c | 32 ++++++++++++++++++++++++++++++-- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 5 ++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 2c1b18fb711..19c1125e50c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -38,13 +38,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +BOOL flush_spool( print_ctx *ctx ) +{ + DWORD written; + + if (ctx->job.data_cnt) + { + if (!WritePrinter(ctx->job.hprinter, ctx->job.data, ctx->job.data_cnt, &written) || + written != ctx->job.data_cnt) + return FALSE; + } + ctx->job.data_cnt = 0; + return TRUE; +} + DWORD write_spool( print_ctx *ctx, const void *data, DWORD num ) { DWORD written; - if (!WritePrinter(ctx->job.hprinter, (LPBYTE) data, num, &written) || (written != num)) - return SP_OUTOFDISK; + if (ctx->job.data_cnt + num > ARRAY_SIZE(ctx->job.data)) + { + if (!flush_spool(ctx)) + return SP_OUTOFDISK; + } + if (ctx->job.data_cnt + num > ARRAY_SIZE(ctx->job.data)) + { + if (!WritePrinter(ctx->job.hprinter, (LPBYTE) data, num, &written) || + written != num) + return SP_OUTOFDISK; + } + else + { + memcpy(ctx->job.data + ctx->job.data_cnt, data, num); + ctx->job.data_cnt += num; + } return num; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a8050abe19b..f9f54fa9bc6 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -502,7 +502,7 @@ INT PSDRV_WriteFooter( print_ctx *ctx ) sprintf(buf, psfooter, ctx->job.PageNo); - if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { + if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) || !flush_spool(ctx) ) { WARN("WriteSpool error\n"); ret = 0; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 7b0582bd258..58b5062a01a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -352,6 +352,8 @@ typedef struct { INT PageNo; BOOL quiet; /* Don't actually output anything */ enum passthrough passthrough_state; + BYTE data[4096]; + int data_cnt; } JOB; typedef struct @@ -519,7 +521,8 @@ extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical); extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count); extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef); -extern DWORD write_spool( print_ctx *ctx, const void *data, DWORD num ); +extern BOOL flush_spool(print_ctx *ctx); +extern DWORD write_spool(print_ctx *ctx, const void *data, DWORD num); #define MAX_G_NAME 31 /* max length of PS glyph name */ extern void get_glyph_name(HDC hdc, WORD index, char *name);

1 0