November 2022 - Wine-commits

Alexandre Julliard : gphoto2.ds: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 0e10e6ab552c6d122e148c65a18d4081b0fbda3c URL: https://gitlab.winehq.org/wine/wine/-/commit/0e10e6ab552c6d122e148c65a18d40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:40:22 2022 +0100 gphoto2.ds: Use the Unix call helpers. --- dlls/gphoto2.ds/gphoto2_main.c | 4 +--- dlls/gphoto2.ds/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 68c628b4d89..a47fdcc67f4 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -477,7 +477,6 @@ static TW_UINT16 GPHOTO2_XferGroupSet (pTW_IDENTITY pOrigin, } HINSTANCE GPHOTO2_instance = 0; -unixlib_handle_t gphoto2_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -488,8 +487,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: GPHOTO2_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); - NtQueryVirtualMemory( GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, - &gphoto2_handle, sizeof(gphoto2_handle), NULL ); + __wine_init_unix_call(); break; } diff --git a/dlls/gphoto2.ds/unixlib.h b/dlls/gphoto2.ds/unixlib.h index bc2f086694e..0e8ea87f93e 100644 --- a/dlls/gphoto2.ds/unixlib.h +++ b/dlls/gphoto2.ds/unixlib.h @@ -71,6 +71,4 @@ enum gphoto2_funcs unix_close_file, }; -extern unixlib_handle_t gphoto2_handle DECLSPEC_HIDDEN; - -#define GPHOTO2_CALL( func, params ) __wine_unix_call( gphoto2_handle, unix_ ## func, params ) +#define GPHOTO2_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0

Alexandre Julliard : msv1_0: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 6674e6d713634a8ccf5d622381ca3a43aa375ae1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6674e6d713634a8ccf5d622381ca3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:40:36 2022 +0100 msv1_0: Use the Unix call helpers. --- dlls/msv1_0/main.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 8785754cd51..d416da13465 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -43,30 +43,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); static ULONG ntlm_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; -static unixlib_handle_t ntlm_handle; - static NTSTATUS ntlm_check_version(void) { - return __wine_unix_call( ntlm_handle, unix_check_version, NULL ); + return WINE_UNIX_CALL( unix_check_version, NULL ); } static void ntlm_cleanup( struct ntlm_ctx *ctx ) { - __wine_unix_call( ntlm_handle, unix_cleanup, ctx ); + WINE_UNIX_CALL( unix_cleanup, ctx ); } static NTSTATUS ntlm_chat( struct ntlm_ctx *ctx, char *buf, unsigned int buflen, unsigned int *retlen ) { struct chat_params params = { ctx, buf, buflen, retlen }; - return __wine_unix_call( ntlm_handle, unix_chat, &params ); + return WINE_UNIX_CALL( unix_chat, &params ); } static NTSTATUS ntlm_fork( struct ntlm_ctx *ctx, char **argv ) { struct fork_params params = { ctx, argv }; - return __wine_unix_call( ntlm_handle, unix_fork, &params ); + return WINE_UNIX_CALL( unix_fork, &params ); } #define NTLM_CAPS \ @@ -1608,8 +1606,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) switch (reason) { case DLL_PROCESS_ATTACH: - if (NtQueryVirtualMemory( GetCurrentProcess(), hinst, MemoryWineUnixFuncs, - &ntlm_handle, sizeof(ntlm_handle), NULL )) + if (__wine_init_unix_call()) return FALSE; DisableThreadLibraryCalls( hinst ); break;

1 0

Alexandre Julliard : netapi32: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: c46d25b1356623424f0c48d82106d2f16ae70a64 URL: https://gitlab.winehq.org/wine/wine/-/commit/c46d25b1356623424f0c48d82106d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:40:53 2022 +0100 netapi32: Use the Unix call helpers. --- dlls/netapi32/netapi32.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index e1c465c2243..d9694cc38e3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -55,9 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static unixlib_handle_t samba_handle; - -#define SAMBA_CALL(func, args) __wine_unix_call( samba_handle, unix_ ## func, args ) +#define SAMBA_CALL(func, args) WINE_UNIX_CALL( unix_ ## func, args ) static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; @@ -69,7 +67,7 @@ static BOOL WINAPI load_samba( INIT_ONCE *once, void *param, void **context ) static BOOL samba_init(void) { - return samba_handle && InitOnceExecuteOnce( &init_once, load_samba, NULL, NULL ); + return __wine_unixlib_handle && InitOnceExecuteOnce( &init_once, load_samba, NULL, NULL ); } /************************************************************ @@ -96,8 +94,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - NtQueryVirtualMemory( GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, - &samba_handle, sizeof(samba_handle), NULL ); + __wine_init_unix_call(); DisableThreadLibraryCalls(hinstDLL); NetBIOSInit(); NetBTInit();

1 0

Alexandre Julliard : qcap: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 15e044905b95040d46510bb27317a620aa8e90d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/15e044905b95040d46510bb27317a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:41:13 2022 +0100 qcap: Use the Unix call helpers. --- dlls/qcap/qcap_main.c | 12 ------------ dlls/qcap/qcap_private.h | 2 -- dlls/qcap/vfwcapture.c | 9 +++------ 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 3a8c89fe077..cd4a6ebc0ab 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -HINSTANCE qcap_instance; - struct class_factory { IClassFactory IClassFactory_iface; @@ -109,16 +107,6 @@ static struct class_factory file_writer_cf = {{&class_factory_vtbl}, file_writer static struct class_factory smart_tee_cf = {{&class_factory_vtbl}, smart_tee_create}; static struct class_factory vfw_capture_cf = {{&class_factory_vtbl}, vfw_capture_create}; -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - { - qcap_instance = instance; - DisableThreadLibraryCalls(instance); - } - return TRUE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { struct class_factory *factory; diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index e22815ff5cf..140e56539b5 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -30,8 +30,6 @@ #include "wine/debug.h" #include "wine/strmbase.h" -extern HINSTANCE qcap_instance DECLSPEC_HIDDEN; - HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index d842117e9a5..a51b39c0a11 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -23,9 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static unixlib_handle_t v4l_handle; - -#define V4L_CALL( func, params ) __wine_unix_call( v4l_handle, unix_ ## func, params ) +#define V4L_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) struct vfw_capture { @@ -876,8 +874,7 @@ static const IAMVideoControlVtbl IAMVideoControl_VTable = static BOOL WINAPI load_capture_funcs(INIT_ONCE *once, void *param, void **context) { - NtQueryVirtualMemory( GetCurrentProcess(), qcap_instance, MemoryWineUnixFuncs, - &v4l_handle, sizeof(v4l_handle), NULL ); + __wine_init_unix_call(); return TRUE; } @@ -887,7 +884,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { struct vfw_capture *object; - if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !v4l_handle) + if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !__wine_unixlib_handle) return E_FAIL; if (!(object = calloc(1, sizeof(*object))))

1 0

Alexandre Julliard : sane.ds: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 3e5bf70341b8b155fe96b55490fef94d1bd7b073 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e5bf70341b8b155fe96b55490fef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:41:28 2022 +0100 sane.ds: Use the Unix call helpers. --- dlls/sane.ds/sane_main.c | 4 +--- dlls/sane.ds/unixlib.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 832c333ae57..8f07ce6d52a 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,7 +30,6 @@ struct tagActiveDS activeDS; DSMENTRYPROC SANE_dsmentry; HINSTANCE SANE_instance; -unixlib_handle_t sane_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,8 +40,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); - if (NtQueryVirtualMemory( GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs, - &sane_handle, sizeof(sane_handle), NULL )) return FALSE; + if (__wine_init_unix_call()) return FALSE; SANE_CALL( process_attach, NULL ); break; } diff --git a/dlls/sane.ds/unixlib.h b/dlls/sane.ds/unixlib.h index 6e38936ae90..d3ffbf1878d 100644 --- a/dlls/sane.ds/unixlib.h +++ b/dlls/sane.ds/unixlib.h @@ -97,6 +97,4 @@ enum sane_funcs unix_option_find_descriptor, }; -extern unixlib_handle_t sane_handle DECLSPEC_HIDDEN; - -#define SANE_CALL( func, params ) __wine_unix_call( sane_handle, unix_ ## func, params ) +#define SANE_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0

Alexandre Julliard : winspool.drv: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: c37f91c78b467c366c0babb747e8655a14cd4d63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c37f91c78b467c366c0babb747e865… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:41:44 2022 +0100 winspool.drv: Use the Unix call helpers. --- dlls/winspool.drv/wspool.c | 4 +--- dlls/winspool.drv/wspool.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index ff0e4418719..1454cd18e2c 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -48,7 +48,6 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ############################### */ HINSTANCE WINSPOOL_hInstance = NULL; -unixlib_handle_t winspool_handle = 0; static HMODULE hlocalspl; static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); @@ -115,8 +114,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: WINSPOOL_hInstance = instance; DisableThreadLibraryCalls( instance ); - if (!NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, - &winspool_handle, sizeof(winspool_handle), NULL )) + if (!__wine_init_unix_call()) UNIX_CALL( process_attach, NULL ); WINSPOOL_LoadSystemPrinters(); break; diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index a464e2aaf12..63b8ccae466 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -72,9 +72,7 @@ struct schedule_job_params const WCHAR *wine_port; }; -extern unixlib_handle_t winspool_handle DECLSPEC_HIDDEN; - -#define UNIX_CALL( func, params ) __wine_unix_call( winspool_handle, unix_ ## func, params ) +#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) enum cups_funcs {

1 0

Alexandre Julliard : wpcap: Use the Unix call helpers.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 7eb08bd230fc624d35005f16a0fefc59b01083a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb08bd230fc624d35005f16a0fefc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 11:41:57 2022 +0100 wpcap: Use the Unix call helpers. --- dlls/wpcap/wpcap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index df35954bfa7..c93c8540145 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -33,9 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); -static unixlib_handle_t pcap_handle; - -#define PCAP_CALL( func, params ) __wine_unix_call( pcap_handle, unix_ ## func, params ) +#define PCAP_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) int CDECL pcap_activate( struct pcap *pcap ) { @@ -830,8 +828,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); - if (NtQueryVirtualMemory( GetCurrentProcess(), hinst, MemoryWineUnixFuncs, - &pcap_handle, sizeof(pcap_handle), NULL )) + if (__wine_init_unix_call()) ERR( "No pcap support, expect problems\n" ); break; case DLL_PROCESS_DETACH:

1 0

Zhiyi Zhang : winex11.drv: Support _KDE_NET_WM_STATE_SKIP_SWITCHER.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 5c64b505c2f27d6839dce56c038d445b905161db URL: https://gitlab.winehq.org/wine/wine/-/commit/5c64b505c2f27d6839dce56c038d44… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Nov 20 22:52:40 2022 +0800 winex11.drv: Support _KDE_NET_WM_STATE_SKIP_SWITCHER. KWin has a switcher that triggered by Alt+Tab that basically acts like a pager. And hiding items in the switcher is controlled by _KDE_NET_WM_STATE_SKIP_SWITCHER. --- dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6b082ecdbec..603314ff3bb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -80,6 +80,7 @@ WINE_DECLARE_DEBUG_CHANNEL(systray); static const unsigned int net_wm_state_atoms[NB_NET_WM_STATES] = { + XATOM__KDE_NET_WM_STATE_SKIP_SWITCHER, XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_ABOVE, XATOM__NET_WM_STATE_MAXIMIZED_VERT, @@ -1040,7 +1041,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) { if (data->skip_taskbar || (ex_style & WS_EX_NOACTIVATE) || (ex_style & WS_EX_TOOLWINDOW && !(ex_style & WS_EX_APPWINDOW))) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER) | (1 << KDE_NET_WM_STATE_SKIP_SWITCHER); else if (!(ex_style & WS_EX_APPWINDOW) && NtUserGetWindowRelative( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 47a29c8eb98..b394795a326 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -482,6 +482,7 @@ enum x11drv_atoms XATOM_DndProtocol, XATOM_DndSelection, XATOM__ICC_PROFILE, + XATOM__KDE_NET_WM_STATE_SKIP_SWITCHER, XATOM__MOTIF_WM_HINTS, XATOM__NET_STARTUP_INFO_BEGIN, XATOM__NET_STARTUP_INFO, @@ -594,6 +595,7 @@ enum x11drv_window_messages /* _NET_WM_STATE properties that we keep track of */ enum x11drv_net_wm_state { + KDE_NET_WM_STATE_SKIP_SWITCHER, NET_WM_STATE_FULLSCREEN, NET_WM_STATE_ABOVE, NET_WM_STATE_MAXIMIZED, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 561f25783b6..797e4f92d38 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -155,6 +155,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "DndProtocol", "DndSelection", "_ICC_PROFILE", + "_KDE_NET_WM_STATE_SKIP_SWITCHER", "_MOTIF_WM_HINTS", "_NET_STARTUP_INFO_BEGIN", "_NET_STARTUP_INFO",

1 0

Piotr Caban : localspl: Add FILE: port monitor implementation.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: bdd561cfa352ce18197a2d9018d7d6819db485fd URL: https://gitlab.winehq.org/wine/wine/-/commit/bdd561cfa352ce18197a2d9018d7d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 27 14:36:12 2022 +0100 localspl: Add FILE: port monitor implementation. --- dlls/localspl/localmon.c | 111 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 28 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 381b36dd2e2..a982d359058 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -65,6 +65,7 @@ static CRITICAL_SECTION xcv_handles_cs = { &xcv_handles_cs_debug, -1, 0, 0, 0, 0 typedef struct { struct list entry; DWORD type; + HANDLE hfile; WCHAR nameW[1]; } port_t; @@ -385,31 +386,6 @@ static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer return (res == ERROR_SUCCESS); } -/***************************************************** - * localmon_ClosePort [exported through MONITOREX] - * - * Close a - * - * PARAMS - * hPort [i] The Handle to close - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - */ -static BOOL WINAPI localmon_ClosePort(HANDLE hPort) -{ - port_t * port = hPort; - - TRACE("(%p)\n", port); - EnterCriticalSection(&port_handles_cs); - list_remove(&port->entry); - LeaveCriticalSection(&port_handles_cs); - free(port); - return TRUE; -} - /***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * @@ -501,6 +477,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) if (!port) return FALSE; port->type = type; + port->hfile = INVALID_HANDLE_VALUE; lstrcpyW(port->nameW, pName); *phPort = port; @@ -512,6 +489,84 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) return TRUE; } +static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, + DWORD job_id, DWORD level, BYTE *info) +{ + DOC_INFO_1W *doc_info = (DOC_INFO_1W *)info; + port_t *port = hport; + + TRACE("(%p %s %ld %ld %p)\n", hport, debugstr_w(printer_name), + job_id, level, doc_info); + + if (port->type != PORT_IS_FILE) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (port->hfile != INVALID_HANDLE_VALUE) + return TRUE; + + if (!doc_info || !doc_info->pOutputFile) + { + FIXME("set error\n"); + return FALSE; + } + + port->hfile = CreateFileW(doc_info->pOutputFile, GENERIC_WRITE, + FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + return port->hfile != INVALID_HANDLE_VALUE; +} + +static BOOL WINAPI localmon_WritePort(HANDLE hport, BYTE *buf, DWORD size, + DWORD *written) +{ + port_t *port = hport; + + TRACE("(%p %p %lu %p)\n", hport, buf, size, written); + + return WriteFile(port->hfile, buf, size, written, NULL); +} + +static BOOL WINAPI localmon_EndDocPort(HANDLE hport) +{ + port_t *port = hport; + + TRACE("(%p)\n", hport); + + CloseHandle(port->hfile); + port->hfile = INVALID_HANDLE_VALUE; + return TRUE; +} + +/***************************************************** + * localmon_ClosePort [exported through MONITOREX] + * + * Close a Port + * + * PARAMS + * hport [i] The Handle to close + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localmon_ClosePort(HANDLE hport) +{ + port_t *port = hport; + + TRACE("(%p)\n", port); + + localmon_EndDocPort(hport); + + EnterCriticalSection(&port_handles_cs); + list_remove(&port->entry); + LeaveCriticalSection(&port_handles_cs); + free(port); + return TRUE; +} + /***************************************************** * localmon_XcvClosePort [exported through MONITOREX] * @@ -755,10 +810,10 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) localmon_EnumPortsW, localmon_OpenPortW, NULL, /* localmon_OpenPortExW */ - NULL, /* localmon_StartDocPortW */ - NULL, /* localmon_WritePortW */ + localmon_StartDocPort, + localmon_WritePort, NULL, /* localmon_ReadPortW */ - NULL, /* localmon_EndDocPortW */ + localmon_EndDocPort, localmon_ClosePort, NULL, /* Use AddPortUI in localui.dll */ localmon_AddPortExW,

1 0

Piotr Caban : localspl: Add FILE: port tests.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 2aa9400897b65d26a46d9ac9d84a9d19f2e60db0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2aa9400897b65d26a46d9ac9d84a9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 27 14:04:50 2022 +0100 localspl: Add FILE: port tests. --- dlls/localspl/tests/Makefile.in | 2 +- dlls/localspl/tests/localmon.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in index 2c2785fae16..9638788307e 100644 --- a/dlls/localspl/tests/Makefile.in +++ b/dlls/localspl/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = localspl.dll -IMPORTS = advapi32 +IMPORTS = advapi32 winspool C_SRCS = \ localmon.c diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 9f10ed8e3bf..edc0b1f7cbb 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -874,6 +874,75 @@ static void test_OpenPort(void) } +static void test_file_port(void) +{ + WCHAR printer_name[256]; + DOC_INFO_1W doc_info; + HANDLE hport, hf; + BYTE buf[16]; + DWORD no; + BOOL res; + + if ((!pOpenPort && !pOpenPort2) || !pClosePort || !pStartDocPort || + !pWritePort || !pEndDocPort) + { + win_skip("FILE: port\n"); + return; + } + + no = ARRAY_SIZE(printer_name); + if (!GetDefaultPrinterW(printer_name, &no)) + { + skip("no default printer\n"); + return; + } + + SetLastError(0xdeadbeef); + res = call_OpenPort(tempfileW, &hport); + ok(!res, "OpenPort succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %lu\n", GetLastError()); + + res = call_OpenPort((WCHAR *)L"FILE", &hport); + ok(!res, "OpenPort succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %lu\n", GetLastError()); + + res = call_OpenPort((WCHAR *)L"FILE:", &hport); + ok(res, "OpenPort failed (%lu)\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = pWritePort(hport, (BYTE *)"test", 4, &no); + ok(!res, "WritePort succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); + + doc_info.pDocName = (WCHAR *)L"not used"; + doc_info.pOutputFile = tempfileW; + doc_info.pDatatype = (WCHAR *)L"not used"; + res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); + ok(res, "StartDocPort failed (%lu)\n", GetLastError()); + + res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); + ok(res, "StartDocPort failed (%lu)\n", GetLastError()); + + res = pWritePort(hport, (BYTE *)"test", 4, &no); + ok(res, "WritePort failed (%lu)\n", GetLastError()); + ok(no == 4, "no = %ld\n", no); + + res = pEndDocPort(hport); + ok(res, "EndDocPort failed (%lu)\n", GetLastError()); + res = pEndDocPort(hport); + ok(res, "EndDocPort failed (%lu)\n", GetLastError()); + + hf = CreateFileW(tempfileW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hf != INVALID_HANDLE_VALUE, "CreateFile failed (%lu)\n", GetLastError()); + res = ReadFile(hf, buf, sizeof(buf), &no, NULL); + ok(res, "ReadFile failed (%lu)\n", GetLastError()); + ok(no == 4, "no = %ld\n", no); + CloseHandle(hf); + + res = pClosePort(hport); + ok(res, "ClosePort failed (%lu)\n", GetLastError()); +} + /* ########################### */ static void test_XcvClosePort(void) @@ -1611,6 +1680,7 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_OpenPort(); + test_file_port(); if ( !hXcv ) { skip("Xcv not supported\n");

1 0