wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Eric Pouech : msvcrt: Rename modifier into qualifier.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 56b973cdb9c0323b98d11fc53e9d1663486619c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56b973cdb9c0323b98d11fc53e9d16… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:11 2022 +0100 msvcrt: Rename modifier into qualifier. That's how they are defined in C/C++ standard. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-)

1 0

Eric Pouech : ucrtbase: Extend ucrtbase's undname tests.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 854eb9990f53fab80ac37af4a44d3436ab00da97 URL: https://gitlab.winehq.org/wine/wine/-/commit/854eb9990f53fab80ac37af4a44d34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:10 2022 +0100 ucrtbase: Extend ucrtbase's undname tests. Renumbering entries' comment to match actual output. Adding ability to pass flags. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ucrtbase/tests/cpp.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index a22138889cb..b9b36a1e740 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -192,21 +192,36 @@ static void test___std_type_info(void) static void test___unDName(void) { - static struct {const char *in; const char *out; const char *broken;} und_tests[] = + static struct {const char *in; const char *out; const char *broken; unsigned int flags;} und_tests[] = { -/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", +/* 0 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"}, -/* 2 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", +/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"}, -/* 3 */ {"??__K_l@@YA?AUCC@@I@Z", "struct CC __cdecl operator \"\" _l(unsigned int)", +/* 2 */ {"??__K_l@@YA?AUCC@@I@Z", "struct CC __cdecl operator \"\" _l(unsigned int)", "??__K_l@@YA?AUCC@@I@Z" /* W10 1507 fails on this :-( */}, +/* 3 */ {"?meth@Q@@QEGBA?AV1@XZ", + "public: class Q __cdecl Q::meth(void)const __ptr64& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 4 */ {"?meth@Q@@QEHAA?AV1@XZ", + "public: class Q __cdecl Q::meth(void) __ptr64&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 5 */ {"?meth@Q@@QEGBA?AV1@XZ", + "public: class Q Q::meth(void)const & ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, +/* 6 */ {"?meth@Q@@QEHAA?AV1@XZ", + "public: class Q Q::meth(void)&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++) { - char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, 0); + char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, und_tests[i].flags); + todo_wine_if(i >= 3) ok(!strcmp(name, und_tests[i].out) || - (broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name))), + broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name)), "unDName returned %s for #%u\n", wine_dbgstr_a(name), i); free(name); }

1 0

Alexandre Julliard : ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 9f363a69055182c3cba47f664098e9f1bfa98294 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f363a69055182c3cba47f664098e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:34:52 2022 +0100 ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/unix/cdrom.c | 13 +++++---- dlls/ntdll/unix/debug.c | 11 ++++---- dlls/ntdll/unix/env.c | 5 ++-- dlls/ntdll/unix/file.c | 57 ++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 3 +-- dlls/ntdll/unix/process.c | 17 ++++++------ dlls/ntdll/unix/registry.c | 37 +++++++++++++------------- dlls/ntdll/unix/security.c | 30 ++++++++++----------- dlls/ntdll/unix/serial.c | 5 ++-- dlls/ntdll/unix/server.c | 5 ++-- dlls/ntdll/unix/signal_arm.c | 34 +++++++++++------------- dlls/ntdll/unix/signal_i386.c | 22 +++++++-------- dlls/ntdll/unix/sync.c | 42 ++++++++++++++--------------- dlls/ntdll/unix/system.c | 52 ++++++++++++++++++------------------ dlls/ntdll/unix/tape.c | 25 +++++++++-------- dlls/ntdll/unix/thread.c | 18 ++++++------- dlls/ntdll/unix/virtual.c | 62 +++++++++++++++++++++---------------------- 17 files changed, 212 insertions(+), 226 deletions(-)

1 0

Alexandre Julliard : ntdll: Build the PE side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 0adec25f92219b5626b8ee3c1c13396d36e56ed3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0adec25f92219b5626b8ee3c1c1339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:27:08 2022 +0100 ntdll: Build the PE side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/actctx.c | 44 +++++++++++++++---------------- dlls/ntdll/atom.c | 2 +- dlls/ntdll/debugbuffer.c | 42 ++++++++++++++--------------- dlls/ntdll/error.c | 2 +- dlls/ntdll/exception.c | 24 ++++++++--------- dlls/ntdll/handletable.c | 4 +-- dlls/ntdll/heap.c | 36 ++++++++++++------------- dlls/ntdll/loader.c | 57 ++++++++++++++++++++-------------------- dlls/ntdll/locale.c | 28 ++++++++++---------- dlls/ntdll/misc.c | 20 +++++++------- dlls/ntdll/path.c | 4 +-- dlls/ntdll/reg.c | 10 +++---- dlls/ntdll/relay.c | 34 ++++++++++++------------ dlls/ntdll/resource.c | 4 +-- dlls/ntdll/rtl.c | 26 +++++++++--------- dlls/ntdll/rtlbitmap.c | 32 +++++++++++------------ dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 40 ++++++++++++++-------------- dlls/ntdll/signal_arm.c | 61 +++++++++++++++++++++---------------------- dlls/ntdll/signal_arm64.c | 33 ++++++++++++----------- dlls/ntdll/signal_i386.c | 31 +++++++++++----------- dlls/ntdll/signal_x86_64.c | 31 +++++++++++----------- dlls/ntdll/sync.c | 8 +++--- dlls/ntdll/thread.c | 12 ++++----- dlls/ntdll/threadpool.c | 26 +++++++++--------- dlls/ntdll/unix/cdrom.c | 1 + dlls/ntdll/unix/debug.c | 1 + dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 1 + dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/serial.c | 1 + dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_i386.c | 1 + dlls/ntdll/unix/sync.c | 1 + dlls/ntdll/unix/system.c | 1 + dlls/ntdll/unix/tape.c | 1 + dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/virtual.c | 1 + dlls/ntdll/version.c | 6 ++--- 44 files changed, 325 insertions(+), 313 deletions(-)

1 0

Alexandre Julliard : ntdll: Use unsigned int for the return value of server calls.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: af4378d46dbb72e682017485212442bf865c2226 URL: https://gitlab.winehq.org/wine/wine/-/commit/af4378d46dbb72e682017485212442… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:21:43 2022 +0100 ntdll: Use unsigned int for the return value of server calls. To avoid typecasts in debug traces. --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 102 +++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 10 ++-- dlls/ntdll/unix/process.c | 24 ++++----- dlls/ntdll/unix/registry.c | 28 +++++------ dlls/ntdll/unix/security.c | 24 ++++----- dlls/ntdll/unix/serial.c | 4 +- dlls/ntdll/unix/server.c | 10 ++-- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/socket.c | 9 ++-- dlls/ntdll/unix/sync.c | 110 ++++++++++++++++++++--------------------- dlls/ntdll/unix/system.c | 8 +-- dlls/ntdll/unix/thread.c | 28 +++++------ dlls/ntdll/unix/unix_private.h | 4 +- dlls/ntdll/unix/virtual.c | 77 ++++++++++++++--------------- 15 files changed, 219 insertions(+), 223 deletions(-)

1 0

Alexandre Julliard : ntdll: Use int instead of long types in a few places.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 74a5851ef48cafe02e4383df4dd5742ae55ba75f URL: https://gitlab.winehq.org/wine/wine/-/commit/74a5851ef48cafe02e4383df4dd574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:21:16 2022 +0100 ntdll: Use int instead of long types in a few places. To avoid typecasts in debug traces. --- dlls/ntdll/unix/debug.c | 2 +- dlls/ntdll/unix/env.c | 6 ++--- dlls/ntdll/unix/file.c | 16 ++++++------ dlls/ntdll/unix/serial.c | 18 +++++++------- dlls/ntdll/unix/signal_arm.c | 49 ++++++++++++++++++------------------ dlls/ntdll/unix/signal_i386.c | 58 +++++++++++++++++++++---------------------- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 2 +- include/wine/afd.h | 4 +-- 9 files changed, 78 insertions(+), 79 deletions(-)

1 0

Alexandre Julliard : ntdll: Use unsigned int instead of NTSTATUS in async callbacks.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 1a7cacc48949b9a4182539d7f7f2c0db32be7cee URL: https://gitlab.winehq.org/wine/wine/-/commit/1a7cacc48949b9a4182539d7f7f2c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:19:08 2022 +0100 ntdll: Use unsigned int instead of NTSTATUS in async callbacks. To avoid typecasts in debug traces. --- dlls/ntdll/unix/file.c | 8 ++++---- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/socket.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 95ca5fa9b51..c40447933f0 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4903,7 +4903,7 @@ struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE } /* callback for irp async I/O completion */ -static BOOL irp_completion( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL irp_completion( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_irp *async = user; @@ -4921,7 +4921,7 @@ static BOOL irp_completion( void *user, ULONG_PTR *info, NTSTATUS *status ) return TRUE; } -static BOOL async_read_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL async_read_proc( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -4971,7 +4971,7 @@ static BOOL async_read_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) return TRUE; } -static BOOL async_write_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL async_write_proc( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -6327,7 +6327,7 @@ NTSTATUS WINAPI NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_I } -static BOOL read_changes_apc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL read_changes_apc( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_fileio_read_changes *fileio = user; int size = 0; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 3daaf95d8ee..a960e881395 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -371,7 +371,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); ULONG_PTR info = call->async_io.result; - NTSTATUS status; + unsigned int status; result->type = call->type; status = call->async_io.status; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 779cc46fe32..3cddc7da965 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -809,7 +809,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } -static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL async_recv_proc( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_recv_ioctl *async = user; int fd, needs_close; @@ -1046,7 +1046,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) return STATUS_SUCCESS; } -static BOOL async_send_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL async_send_proc( void *user, ULONG_PTR *info, unsigned int *status ) { struct async_send_ioctl *async = user; int fd, needs_close; @@ -1293,7 +1293,7 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io return STATUS_SUCCESS; } -static BOOL async_transmit_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) +static BOOL async_transmit_proc( void *user, ULONG_PTR *info, unsigned int *status ) { int sock_fd, file_fd = -1, sock_needs_close = FALSE, file_needs_close = FALSE; struct async_transmit_ioctl *async = user; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index afdb8397415..b8570e642ac 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -76,7 +76,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) } /* returns TRUE if the async is complete; FALSE if it should be restarted */ -typedef BOOL async_callback_t( void *user, ULONG_PTR *info, NTSTATUS *status ); +typedef BOOL async_callback_t( void *user, ULONG_PTR *info, unsigned int *status ); struct async_fileio {

1 0

Alexandre Julliard : ntdll: Use UINT instead of ULONG in ioctl helpers.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: 7afd11232eeb9fd019f7ea3cc5a65d7811a028fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7afd11232eeb9fd019f7ea3cc5a65d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:19:31 2022 +0100 ntdll: Use UINT instead of ULONG in ioctl helpers. To avoid typecasts in debug traces. --- dlls/ntdll/unix/cdrom.c | 4 ++-- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/serial.c | 10 +++++----- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a4a9400a518..a9acdf7a645 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2814,8 +2814,8 @@ static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD O * cdrom_DeviceIoControl */ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e80eb368e8a..95ca5fa9b51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5095,9 +5095,9 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE /* do an ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, - IO_STATUS_BLOCK *io, ULONG code, - const void *in_buffer, ULONG in_size, - PVOID out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + const void *in_buffer, UINT in_size, + PVOID out_buffer, UINT out_size ) { struct async_irp *async; NTSTATUS status; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 16c5964b77b..fce09500c91 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -71,7 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); -static const char* iocode2str(DWORD ioc) +static const char* iocode2str(UINT ioc) { switch (ioc) { @@ -1096,8 +1096,8 @@ static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, const char* ptr) } static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0, access = FILE_READ_DATA; NTSTATUS status = STATUS_SUCCESS; @@ -1320,8 +1320,8 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo * serial_DeviceIoControl */ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { NTSTATUS status; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index beb8382687a..779cc46fe32 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1487,7 +1487,7 @@ static int get_sock_type( HANDLE handle ) NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { int fd, needs_close = FALSE; NTSTATUS status; diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 40ac307a632..a7ca04badb0 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -66,7 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(tape); -static const char *io2str( DWORD io ) +static const char *io2str( unsigned int io ) { switch (io) { @@ -519,8 +519,8 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data ) * tape_DeviceIoControl */ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, - void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9cf8989fb0d..afdb8397415 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,21 +252,21 @@ extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDD extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; extern NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS sock_read( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS sock_write( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle ) DECLSPEC_HIDDEN; extern void release_fileio( struct async_fileio *io ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Fix int/long type mismatches.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: d5e2ab1a9858135ba778ee642a5b91325d33e928 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5e2ab1a9858135ba778ee642a5b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:18:44 2022 +0100 ntdll: Fix int/long type mismatches. --- dlls/ntdll/unix/server.c | 5 +++-- dlls/ntdll/unix/socket.c | 4 ++-- dlls/ntdll/unix/sync.c | 12 ++++++------ dlls/ntdll/unix/system.c | 19 ++++++++++--------- dlls/ntdll/unix/thread.c | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 07d9c8d3acd..3daaf95d8ee 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -474,11 +474,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO size = call->virtual_protect.size; if ((ULONG_PTR)addr == call->virtual_protect.addr && size == call->virtual_protect.size) { + ULONG prot; result->virtual_protect.status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, - call->virtual_protect.prot, - &result->virtual_protect.prot ); + call->virtual_protect.prot, &prot ); result->virtual_protect.addr = wine_server_client_ptr( addr ); result->virtual_protect.size = size; + result->virtual_protect.prot = prot; } else result->virtual_protect.status = STATUS_INVALID_PARAMETER; break; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7dbf03365bb..beb8382687a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -113,7 +113,7 @@ struct async_recv_ioctl void *control; struct WS_sockaddr *addr; int *addr_len; - DWORD *ret_flags; + unsigned int *ret_flags; int unix_flags; unsigned int count; BOOL icmp_over_dgram; @@ -907,7 +907,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi static NTSTATUS sock_ioctl_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, - struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) + struct WS_sockaddr *addr, int *addr_len, unsigned int *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; DWORD async_size; diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 9112572c67d..c085bffe34d 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -109,7 +109,7 @@ static inline ULONGLONG monotonic_counter(void) static int futex_private = 128; -static inline int futex_wait( const int *addr, int val, struct timespec *timeout ) +static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) { #if (defined(__i386__) || defined(__arm__)) && _TIME_BITS==64 if (timeout && sizeof(*timeout) != 8) @@ -125,14 +125,14 @@ static inline int futex_wait( const int *addr, int val, struct timespec *timeout return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, timeout, 0, 0 ); } -static inline int futex_wake( const int *addr, int val ) +static inline int futex_wake( const LONG *addr, int val ) { return syscall( __NR_futex, addr, FUTEX_WAKE | futex_private, val, NULL, 0, 0 ); } static inline int use_futexes(void) { - static int supported = -1; + static LONG supported = -1; if (supported == -1) { @@ -2309,7 +2309,7 @@ union tid_alert_entry #else HANDLE event; #ifdef __linux__ - int futex; + LONG futex; #endif #endif }; @@ -2395,7 +2395,7 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #ifdef __linux__ if (use_futexes()) { - int *futex = &entry->futex; + LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) futex_wake( futex, 1 ); return STATUS_SUCCESS; @@ -2496,7 +2496,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #ifdef __linux__ if (use_futexes()) { - int *futex = &entry->futex; + LONG *futex = &entry->futex; ULONGLONG end; int ret; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index ba2051da65e..4551c9603a3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -777,7 +777,7 @@ static BOOL logical_proc_info_add_group( DWORD num_cpus, ULONG_PTR mask ) static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask) { FILE *f; - DWORD r; + unsigned int r; f = fopen(filename, "r"); if (!f) return FALSE; @@ -802,7 +802,7 @@ static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR *mask) * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_list * - /sys/devices/system/cpu/cpu0/topology/thread_siblings_list. */ -static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) +static BOOL sysfs_count_list_elements(const char *filename, unsigned int *result) { FILE *f; @@ -812,7 +812,7 @@ static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) while (!feof(f)) { char op; - DWORD beg, end; + unsigned int beg, end; if (!fscanf(f, "%u%c ", &beg, &op)) break; if(op == '-') @@ -834,7 +834,7 @@ static NTSTATUS create_logical_proc_info(void) static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; FILE *fcpu_list, *fnuma_list, *f; - DWORD beg, end, i, j, r, num_cpus = 0, max_cpus = 0; + unsigned int beg, end, i, j, r, num_cpus = 0, max_cpus = 0; char op, name[MAX_PATH]; ULONG_PTR all_cpus_mask = 0; @@ -863,7 +863,7 @@ static NTSTATUS create_logical_proc_info(void) for(i = beg; i <= end; i++) { - DWORD phys_core = 0; + unsigned int phys_core = 0; ULONG_PTR thread_mask = 0; if (i > 8 * sizeof(ULONG_PTR)) @@ -3682,14 +3682,15 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, if ((out_size / sizeof(PROCESSOR_POWER_INFORMATION)) < out_cpus) return STATUS_BUFFER_TOO_SMALL; #if defined(linux) { + unsigned int val; char filename[128]; FILE* f; for(i = 0; i < out_cpus; i++) { sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); f = fopen(filename, "r"); - if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { - cpu_power[i].MaxMhz /= 1000; + if (f && (fscanf(f, "%u", &val) == 1)) { + cpu_power[i].MaxMhz = val / 1000; fclose(f); cpu_power[i].CurrentMhz = cpu_power[i].MaxMhz; } @@ -3707,8 +3708,8 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", i); f = fopen(filename, "r"); - if(f && (fscanf(f, "%d", &cpu_power[i].MhzLimit) == 1)) { - cpu_power[i].MhzLimit /= 1000; + if(f && (fscanf(f, "%u", &val) == 1)) { + cpu_power[i].MhzLimit = val / 1000; fclose(f); } else diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 711cb4cb13c..5d140c90c42 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -79,7 +79,7 @@ WINE_DECLARE_DEBUG_CHANNEL(threadname); pthread_key_t teb_key = 0; -static int nb_threads = 1; +static LONG nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status ) {

1 0

Piotr Caban : winprint: Implement RAW print processor.
by Alexandre Julliard 21 Nov '22

21 Nov '22

Module: wine Branch: master Commit: f63a9b592ce29bb5cd081d441ab4dbdc1b373478 URL: https://gitlab.winehq.org/wine/wine/-/commit/f63a9b592ce29bb5cd081d441ab4db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:33:37 2022 +0200 winprint: Implement RAW print processor. --- dlls/winprint/Makefile.in | 1 + dlls/winprint/printproc.c | 161 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 147 insertions(+), 15 deletions(-) diff --git a/dlls/winprint/Makefile.in b/dlls/winprint/Makefile.in index 002004b1d0d..57851fc5b04 100644 --- a/dlls/winprint/Makefile.in +++ b/dlls/winprint/Makefile.in @@ -1,4 +1,5 @@ MODULE = winprint.dll +IMPORTS = winspool C_SRCS = \ printproc.c diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 7cc8759d801..d7d9cce9d93 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Missing datatypes support: + * RAW [FF appended] + * RAW [FF auto] + * NT EMF 1.003 + * NT EMF 1.006 + * NT EMF 1.007 + * NT EMF 1.008 + * TEXT + * XPS2GDI + * + * Implement print processor features like e.g. printing multiple copies. */ + +#include <stdlib.h> + #include "windows.h" #include "winspool.h" #include "ddk/winsplp.h" @@ -26,34 +40,133 @@ WINE_DEFAULT_DEBUG_CHANNEL(winprint); +#define PP_MAGIC 0x952173fd + +struct pp_data +{ + DWORD magic; + HANDLE hport; + WCHAR *doc_name; + WCHAR *out_file; +}; + +static struct pp_data* get_handle_data(HANDLE pp) +{ + struct pp_data *ret = (struct pp_data *)pp; + + if (!ret || ret->magic != PP_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { - FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + static const WCHAR raw[] = L"RAW"; + + DATATYPES_INFO_1W *info = (DATATYPES_INFO_1W *)datatypes; + + TRACE("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), level, datatypes, size, needed, no); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (!needed || !no) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *no = 0; + *needed = sizeof(*info) + sizeof(raw); + + if (level != 1 || !datatypes) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (size < *needed) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *no = 1; + info->pName = (WCHAR*)(info + 1); + memcpy(info + 1, raw, sizeof(raw)); + return TRUE; } HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) { - FIXME("%s, %p\n", debugstr_w(port), open_data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; -} + struct pp_data *data; + HANDLE hport; -BOOL WINAPI ClosePrintProcessor(HANDLE pp) -{ - FIXME("%p\n", pp); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s, %p\n", debugstr_w(port), open_data); + + if (!port || !open_data || !open_data->pDatatype) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (!wcscmp(open_data->pDatatype, L"RAW")) + { + SetLastError(ERROR_INVALID_DATATYPE); + return NULL; + } + + if (!OpenPrinterW(port, &hport, NULL)) + return NULL; + + data = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(*data)); + if (!data) + return NULL; + data->magic = PP_MAGIC; + data->hport = hport; + data->doc_name = wcsdup(open_data->pDocumentName); + data->out_file = wcsdup(open_data->pOutputFile); + return (HANDLE)data; } BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { - FIXME("%p, %s\n", pp, debugstr_w(doc_name)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct pp_data *data = get_handle_data(pp); + HANDLE spool_data; + DOC_INFO_1W info; + BYTE buf[0x1000]; + DWORD r, w; + + TRACE("%p, %s\n", pp, debugstr_w(doc_name)); + + if (!data) + return FALSE; + + if (!OpenPrinterW(doc_name, &spool_data, NULL)) + return FALSE; + + info.pDocName = data->doc_name; + info.pOutputFile = data->out_file; + info.pDatatype = (WCHAR *)L"RAW"; + if (!StartDocPrinterW(data->hport, 1, (BYTE *)&info)) + { + ClosePrinter(spool_data); + return FALSE; + } + + while (ReadPrinter(spool_data, buf, sizeof(buf), &r) && r) + { + if (!WritePrinter(data->hport, buf, r, &w) || r != w) + { + ClosePrinter(spool_data); + EndDocPrinter(data->hport); + return FALSE; + } + } + ClosePrinter(spool_data); + + return EndDocPrinter(data->hport); } BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) @@ -62,3 +175,21 @@ BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI ClosePrintProcessor(HANDLE pp) +{ + struct pp_data *data = get_handle_data(pp); + + TRACE("%p\n", pp); + + if (!data) + return FALSE; + + ClosePrinter(data->hport); + free(data->doc_name); + free(data->out_file); + + memset(data, 0, sizeof(*data)); + LocalFree(data); + return TRUE; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022