wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Alexandre Julliard : winspool.drv: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e5d37832ee66d011ba572a9b571e9fb44a7b2b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d37832ee66d011ba572a9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:46:02 2021 +0100 winspool.drv: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/cups.c | 144 ++++++++++++++++++++++++++++++++++++++++----- dlls/winspool.drv/info.c | 21 +++---- dlls/winspool.drv/wspool.h | 6 +- 3 files changed, 143 insertions(+), 28 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 1cc9bd23a20..830f0c91332 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -337,14 +337,14 @@ static int get_cups_default_options( const char *printer, int num_options, cups_ static NTSTATUS enum_printers( void *args ) { - struct enum_printers_params *params = args; + const struct enum_printers_params *params = args; #ifdef SONAME_LIBCUPS unsigned int num, i, name_len, comment_len, location_len, needed; WCHAR *comment, *location, *ptr; struct printer_info *info; cups_dest_t *dests; - params->num = 0; + *params->num = 0; if (!pcupsGetDests) return STATUS_NOT_SUPPORTED; num = pcupsGetDests( &dests ); @@ -357,12 +357,12 @@ static NTSTATUS enum_printers( void *args ) continue; } TRACE( "Printer %d: %s\n", i, debugstr_a( dests[i].name ) ); - params->num++; + (*params->num)++; } - needed = sizeof( *info ) * params->num; + needed = sizeof( *info ) * *params->num; info = params->printers; - ptr = (WCHAR *)(info + params->num); + ptr = (WCHAR *)(info + *params->num); for (i = 0; i < num; i++) { @@ -376,7 +376,7 @@ static NTSTATUS enum_printers( void *args ) location_len = location ? strlenW( location ) + 1 : 0; needed += (name_len + comment_len + location_len) * sizeof(WCHAR); - if (needed <= params->size) + if (needed <= *params->size) { info->name = ptr; ntdll_umbstowcs( dests[i].name, name_len, info->name, name_len ); @@ -393,21 +393,21 @@ static NTSTATUS enum_printers( void *args ) } pcupsFreeDests( num, dests ); - if (needed > params->size) + if (needed > *params->size) { - params->size = needed; + *params->size = needed; return STATUS_BUFFER_OVERFLOW; } return STATUS_SUCCESS; #else - params->num = 0; + *params->num = 0; return STATUS_NOT_SUPPORTED; #endif /* SONAME_LIBCUPS */ } static NTSTATUS get_ppd( void *args ) { - struct get_ppd_params *params = args; + const struct get_ppd_params *params = args; char *unix_ppd = get_unix_file_name( params->ppd ); NTSTATUS status = STATUS_SUCCESS; @@ -449,7 +449,7 @@ static NTSTATUS get_ppd( void *args ) static NTSTATUS get_default_page_size( void *args ) { #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - struct get_default_page_size_params *params = args; + const struct get_default_page_size_params *params = args; NTSTATUS status = STATUS_UNSUCCESSFUL; PMPrintSession session = NULL; PMPageFormat format = NULL; @@ -468,7 +468,7 @@ static NTSTATUS get_default_page_size( void *args ) range.length = CFStringGetLength( paper_name ); size = (range.length + 1) * sizeof(WCHAR); - if (params->name_size >= size) + if (*params->name_size >= size) { CFStringGetCharacters( paper_name, range, (UniChar*)params->name ); params->name[range.length] = 0; @@ -476,7 +476,7 @@ static NTSTATUS get_default_page_size( void *args ) } else status = STATUS_BUFFER_OVERFLOW; - params->name_size = size; + *params->name_size = size; end: if (format) PMRelease( format ); @@ -663,7 +663,7 @@ static BOOL schedule_cups( const WCHAR *printer_name, const WCHAR *filename, con static NTSTATUS schedule_job( void *args ) { - struct schedule_job_params *params = args; + const struct schedule_job_params *params = args; if (params->wine_port[0] == '|') return schedule_pipe( params->wine_port + 1, params->filename ); @@ -680,7 +680,7 @@ static NTSTATUS schedule_job( void *args ) return FALSE; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { process_attach, enum_printers, @@ -688,3 +688,117 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_ppd, schedule_job, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +struct printer_info32 +{ + PTR32 name; + PTR32 comment; + PTR32 location; + BOOL is_default; +}; + +static NTSTATUS wow64_enum_printers( void *args ) +{ + struct + { + PTR32 printers; + PTR32 size; + PTR32 num; + } const *params32 = args; + + NTSTATUS status; + unsigned int i; + struct enum_printers_params params = + { + ULongToPtr( params32->printers ), + ULongToPtr( params32->size ), + ULongToPtr( params32->num ) + }; + + if (!(status = enum_printers( &params ))) + { + /* convert structures in place */ + struct printer_info *info = ULongToPtr( params32->printers ); + struct printer_info32 *info32 = (struct printer_info32 *)info; + unsigned int num = *(unsigned int *)ULongToPtr( params32->num ); + + for (i = 0; i < num; i++) + { + info32[i].name = PtrToUlong(info[i].name); + info32[i].comment = PtrToUlong(info[i].comment); + info32[i].location = PtrToUlong(info[i].location); + info32[i].is_default = info[i].is_default; + } + } + return status; +} + +static NTSTATUS wow64_get_default_page_size( void *args ) +{ + struct + { + PTR32 name; + PTR32 name_size; + } const *params32 = args; + + struct get_default_page_size_params params = + { + ULongToPtr( params32->name ), + ULongToPtr( params32->name_size ) + }; + + return get_default_page_size( &params ); +} + +static NTSTATUS wow64_get_ppd( void *args ) +{ + struct + { + PTR32 printer; + PTR32 ppd; + } const *params32 = args; + + struct get_ppd_params params = + { + ULongToPtr( params32->printer ), + ULongToPtr( params32->ppd ) + }; + + return get_ppd( &params ); +} + +static NTSTATUS wow64_schedule_job( void *args ) +{ + struct + { + PTR32 filename; + PTR32 port; + PTR32 document_title; + PTR32 wine_port; + } const *params32 = args; + + struct schedule_job_params params = + { + ULongToPtr( params32->filename ), + ULongToPtr( params32->port ), + ULongToPtr( params32->document_title ), + ULongToPtr( params32->wine_port ) + }; + + return schedule_job( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + wow64_enum_printers, + wow64_get_default_page_size, + wow64_get_ppd, + wow64_schedule_job, +}; + +#endif /* _WIN64 */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1b9586f9c52..3424c69d196 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -728,7 +728,8 @@ static WCHAR *get_ppd_dir( void ) static BOOL init_unix_printers( void ) { WCHAR *port, *ppd_dir = NULL, *default_printer = NULL; - struct enum_printers_params enum_params; + unsigned int size, num; + struct enum_printers_params enum_params = { NULL, &size, &num }; HKEY printer_key, printers_key; HANDLE added_printer; PRINTER_INFO_2W pi2; @@ -742,19 +743,18 @@ static BOOL init_unix_printers( void ) return FALSE; } - enum_params.size = 10000; - enum_params.printers = NULL; + size = 10000; do { - enum_params.size *= 2; + size *= 2; heap_free( enum_params.printers ); - enum_params.printers = heap_alloc( enum_params.size ); + enum_params.printers = heap_alloc( size ); status = UNIX_CALL( enum_printers, &enum_params ); } while (status == STATUS_BUFFER_OVERFLOW); if (status) goto end; - TRACE( "Found %d CUPS %s:\n", enum_params.num, (enum_params.num == 1) ? "printer" : "printers" ); - for (i = 0; i < enum_params.num; i++) + TRACE( "Found %d CUPS %s:\n", num, (num == 1) ? "printer" : "printers" ); + for (i = 0; i < num; i++) { struct printer_info *printer = enum_params.printers + i; @@ -817,7 +817,8 @@ end: static void set_ppd_overrides( HANDLE printer ) { WCHAR buffer[256]; - struct get_default_page_size_params params = { .name = buffer, .name_size = sizeof(buffer) }; + unsigned int name_size = sizeof(buffer); + struct get_default_page_size_params params = { .name = buffer, .name_size = &name_size }; NTSTATUS status; while (1) @@ -825,10 +826,10 @@ static void set_ppd_overrides( HANDLE printer ) status = UNIX_CALL( get_default_page_size, &params ); if (status != STATUS_BUFFER_OVERFLOW) break; if (params.name != buffer) heap_free( params.name ); - params.name = heap_alloc( params.name_size ); + params.name = heap_alloc( name_size ); if (!params.name) break; } - if (!status) SetPrinterDataExW( printer, L"PPD Overrides", L"DefaultPageSize", REG_SZ, (BYTE*)params.name, params.name_size ); + if (!status) SetPrinterDataExW( printer, L"PPD Overrides", L"DefaultPageSize", REG_SZ, (BYTE*)params.name, name_size ); if (params.name != buffer) heap_free( params.name ); } diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 39c14f24358..a464e2aaf12 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -48,14 +48,14 @@ struct printer_info struct enum_printers_params { struct printer_info *printers; - unsigned int size; - unsigned int num; + unsigned int *size; + unsigned int *num; }; struct get_default_page_size_params { WCHAR *name; - unsigned int name_size; + unsigned int *name_size; }; struct get_ppd_params

1 0

Alexandre Julliard : qcap: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: bd610fd705c3cd81e9479d35b9c8e392bd031166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd610fd705c3cd81e9479d35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:43:55 2021 +0100 qcap: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 26 ++-- dlls/qcap/v4l.c | 324 +++++++++++++++++++++++++++++++++++++++++++---- dlls/qcap/vfwcapture.c | 4 +- 3 files changed, 312 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd610fd705c3cd81e947…

1 0

Alexandre Julliard : msv1_0: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 78cdb254dd311291ab3f02f8bc10d4d0b510b338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78cdb254dd311291ab3f02f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:41:29 2021 +0100 msv1_0: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 4 +-- dlls/msv1_0/unixlib.c | 78 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msv1_0/unixlib.h | 9 ++---- 3 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 73d7faef456..32783f2f6cf 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -51,9 +51,7 @@ static NTSTATUS ntlm_check_version(void) static void ntlm_cleanup( struct ntlm_ctx *ctx ) { - struct cleanup_params params = { ctx }; - - __wine_unix_call( ntlm_handle, unix_cleanup, &params ); + __wine_unix_call( ntlm_handle, unix_cleanup, ctx ); } static NTSTATUS ntlm_chat( struct ntlm_ctx *ctx, char *buf, unsigned int buflen, unsigned int *retlen ) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 674b61c1f7b..799577fd4a5 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -54,7 +54,7 @@ struct com_buf static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) { char *newline; - struct com_buf *com_buf = ctx->com_buf; + struct com_buf *com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; if (!com_buf) { @@ -66,7 +66,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) } com_buf->size = INITIAL_BUFFER_SIZE; com_buf->offset = 0; - ctx->com_buf = com_buf; + ctx->com_buf = (ULONG_PTR)com_buf; } do @@ -97,7 +97,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) static NTSTATUS ntlm_chat( void *args ) { - struct chat_params *params = args; + const struct chat_params *params = args; struct ntlm_ctx *ctx = params->ctx; struct com_buf *com_buf; SECURITY_STATUS status = SEC_E_OK; @@ -107,7 +107,7 @@ static NTSTATUS ntlm_chat( void *args ) write( ctx->pipe_out, "\n", 1 ); if ((status = read_line( ctx, &offset )) != SEC_E_OK) return status; - com_buf = ctx->com_buf; + com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; *params->retlen = strlen( com_buf->buffer ); if (*params->retlen > params->buflen) return SEC_E_BUFFER_TOO_SMALL; @@ -128,9 +128,8 @@ static NTSTATUS ntlm_chat( void *args ) static NTSTATUS ntlm_cleanup( void *args ) { - struct cleanup_params *params = args; - struct ntlm_ctx *ctx = params->ctx; - struct com_buf *com_buf = ctx->com_buf; + struct ntlm_ctx *ctx = args; + struct com_buf *com_buf = (struct com_buf *)(ULONG_PTR)ctx->com_buf; if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return STATUS_INVALID_HANDLE; ctx->mode = MODE_INVALID; @@ -154,7 +153,7 @@ static NTSTATUS ntlm_cleanup( void *args ) static NTSTATUS ntlm_fork( void *args ) { - struct fork_params *params = args; + const struct fork_params *params = args; struct ntlm_ctx *ctx = params->ctx; int pipe_in[2], pipe_out[2]; @@ -216,7 +215,6 @@ static NTSTATUS ntlm_check_version( void *args ) char *argv[3], buf[80]; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct fork_params params = { &ctx, argv }; - struct cleanup_params cleanup_params = { &ctx }; int len; argv[0] = (char *)"ntlm_auth"; @@ -249,7 +247,7 @@ static NTSTATUS ntlm_check_version( void *args ) "Make sure that ntlm_auth >= %d.%d.%d is in your path. " "Usually, you can find it in the winbind package of your distribution.\n", NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); - ntlm_cleanup( &cleanup_params ); + ntlm_cleanup( &ctx ); return status; } @@ -260,3 +258,63 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ntlm_fork, ntlm_check_version, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_ntlm_chat( void *args ) +{ + struct + { + PTR32 ctx; + PTR32 buf; + UINT buflen; + PTR32 retlen; + } const *params32 = args; + + struct chat_params params = + { + ULongToPtr(params32->ctx), + ULongToPtr(params32->buf), + params32->buflen, + ULongToPtr(params32->retlen) + }; + + return ntlm_chat( &params ); +} + +static NTSTATUS wow64_ntlm_fork( void *args ) +{ + struct + { + PTR32 ctx; + PTR32 argv; + } const *params32 = args; + + struct fork_params params; + PTR32 *argv32 = ULongToPtr(params32->argv); + char **argv; + NTSTATUS ret; + int i, argc = 0; + + while (argv32[argc]) argc++; + argv = malloc( (argc + 1) * sizeof(*argv) ); + for (i = 0; i <= argc; i++) argv[i] = ULongToPtr( argv32[i] ); + + params.ctx = ULongToPtr(params32->ctx); + params.argv = argv; + ret = ntlm_fork( &params ); + free( argv ); + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_ntlm_chat, + ntlm_cleanup, + wow64_ntlm_fork, + ntlm_check_version, +}; + +#endif /* _WIN64 */ diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index efd640aaa4a..7aee646ed50 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -57,7 +57,7 @@ struct arc4_info #define FLAG_NEGOTIATE_NTLM2 0x00080000 #define FLAG_NEGOTIATE_KEY_EXCHANGE 0x40000000 -struct com_buf; +typedef UINT64 com_buf_ptr; struct ntlm_ctx { @@ -68,7 +68,7 @@ struct ntlm_ctx int pipe_out; char session_key[16]; unsigned int flags; - struct com_buf *com_buf; + com_buf_ptr com_buf; struct { struct @@ -99,11 +99,6 @@ struct chat_params unsigned int *retlen; }; -struct cleanup_params -{ - struct ntlm_ctx *ctx; -}; - struct fork_params { struct ntlm_ctx *ctx;

1 0

Alexandre Julliard : msv1_0: Define the communication structure only on the Unix side.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 1307d44f43b78b141dc3916f248c4920c4a81229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1307d44f43b78b141dc3916f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:40:39 2021 +0100 msv1_0: Define the communication structure only on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/unixlib.c | 55 +++++++++++++++++++++++++++++++++------------------ dlls/msv1_0/unixlib.h | 6 +++--- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 789dfbbe8cb..674b61c1f7b 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -44,38 +44,51 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define INITIAL_BUFFER_SIZE 200 +struct com_buf +{ + char *buffer; + unsigned int size; + unsigned int offset; +}; + static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) { char *newline; + struct com_buf *com_buf = ctx->com_buf; - if (!ctx->com_buf) + if (!com_buf) { - if (!(ctx->com_buf = malloc( INITIAL_BUFFER_SIZE ))) + if (!(com_buf = malloc( sizeof(*com_buf) ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(com_buf->buffer = malloc( INITIAL_BUFFER_SIZE ))) + { + free( com_buf ); return SEC_E_INSUFFICIENT_MEMORY; - ctx->com_buf_size = INITIAL_BUFFER_SIZE; - ctx->com_buf_offset = 0; + } + com_buf->size = INITIAL_BUFFER_SIZE; + com_buf->offset = 0; + ctx->com_buf = com_buf; } do { ssize_t size; - if (ctx->com_buf_offset + INITIAL_BUFFER_SIZE > ctx->com_buf_size) + if (com_buf->offset + INITIAL_BUFFER_SIZE > com_buf->size) { - char *buf = realloc( ctx->com_buf, ctx->com_buf_size + INITIAL_BUFFER_SIZE ); + char *buf = realloc( com_buf->buffer, com_buf->size + INITIAL_BUFFER_SIZE ); if (!buf) return SEC_E_INSUFFICIENT_MEMORY; - ctx->com_buf_size += INITIAL_BUFFER_SIZE; - ctx->com_buf = buf; + com_buf->size += INITIAL_BUFFER_SIZE; + com_buf->buffer = buf; } - size = read( ctx->pipe_in, ctx->com_buf + ctx->com_buf_offset, ctx->com_buf_size - ctx->com_buf_offset ); + size = read( ctx->pipe_in, com_buf->buffer + com_buf->offset, com_buf->size - com_buf->offset ); if (size <= 0) return SEC_E_INTERNAL_ERROR; - ctx->com_buf_offset += size; - newline = memchr( ctx->com_buf, '\n', ctx->com_buf_offset ); + com_buf->offset += size; + newline = memchr( com_buf->buffer, '\n', com_buf->offset ); } while (!newline); /* if there's a newline character, and we read more than that newline, we have to store the offset so we can preserve the additional data */ - if (newline != ctx->com_buf + ctx->com_buf_offset) *offset = (ctx->com_buf + ctx->com_buf_offset) - (newline + 1); + if (newline != com_buf->buffer + com_buf->offset) *offset = (com_buf->buffer + com_buf->offset) - (newline + 1); else *offset = 0; *newline = 0; @@ -86,6 +99,7 @@ static NTSTATUS ntlm_chat( void *args ) { struct chat_params *params = args; struct ntlm_ctx *ctx = params->ctx; + struct com_buf *com_buf; SECURITY_STATUS status = SEC_E_OK; unsigned int offset; @@ -93,19 +107,20 @@ static NTSTATUS ntlm_chat( void *args ) write( ctx->pipe_out, "\n", 1 ); if ((status = read_line( ctx, &offset )) != SEC_E_OK) return status; - *params->retlen = strlen( ctx->com_buf ); + com_buf = ctx->com_buf; + *params->retlen = strlen( com_buf->buffer ); if (*params->retlen > params->buflen) return SEC_E_BUFFER_TOO_SMALL; if (*params->retlen < 2) return SEC_E_ILLEGAL_MESSAGE; - if (!strncmp( ctx->com_buf, "ERR", 3 )) return SEC_E_INVALID_TOKEN; + if (!strncmp( com_buf->buffer, "ERR", 3 )) return SEC_E_INVALID_TOKEN; - memcpy( params->buf, ctx->com_buf, *params->retlen + 1 ); + memcpy( params->buf, com_buf->buffer, *params->retlen + 1 ); - if (!offset) ctx->com_buf_offset = 0; + if (!offset) com_buf->offset = 0; else { - memmove( ctx->com_buf, ctx->com_buf + ctx->com_buf_offset, offset ); - ctx->com_buf_offset = offset; + memmove( com_buf->buffer, com_buf->buffer + com_buf->offset, offset ); + com_buf->offset = offset; } return SEC_E_OK; @@ -115,6 +130,7 @@ static NTSTATUS ntlm_cleanup( void *args ) { struct cleanup_params *params = args; struct ntlm_ctx *ctx = params->ctx; + struct com_buf *com_buf = ctx->com_buf; if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return STATUS_INVALID_HANDLE; ctx->mode = MODE_INVALID; @@ -131,7 +147,8 @@ static NTSTATUS ntlm_cleanup( void *args ) } while (ret < 0 && errno == EINTR); } - free( ctx->com_buf ); + if (com_buf) free( com_buf->buffer ); + free( com_buf ); return STATUS_SUCCESS; } diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 54693c7970e..efd640aaa4a 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -57,6 +57,8 @@ struct arc4_info #define FLAG_NEGOTIATE_NTLM2 0x00080000 #define FLAG_NEGOTIATE_KEY_EXCHANGE 0x40000000 +struct com_buf; + struct ntlm_ctx { enum mode mode; @@ -64,11 +66,9 @@ struct ntlm_ctx unsigned int attrs; int pipe_in; int pipe_out; - char *com_buf; - unsigned int com_buf_size; - unsigned int com_buf_offset; char session_key[16]; unsigned int flags; + struct com_buf *com_buf; struct { struct

1 0

Alexandre Julliard : bcrypt: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: fcc827d141f32954545b349f06b01a3909b95ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc827d141f32954545b349f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:38:45 2021 +0100 bcrypt: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/gnutls.c | 536 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 523 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc827d141f32954545b…

1 0

Alistair Leslie-Hughes : include: Add SQLGetDiagFieldW prototype.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e9da85341e255ed43c17b9bb57294063c4aedbf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9da85341e255ed43c17b9bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:59 2021 +1100 include: Add SQLGetDiagFieldW prototype. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqlucode.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sqlucode.h b/include/sqlucode.h index 7e1fb677cce..f1eaace87c1 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -62,6 +62,10 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER StringLength); +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT type, SQLHANDLE handle, + SQLSMALLINT record, SQLSMALLINT field, SQLPOINTER info, + SQLSMALLINT info_len, SQLSMALLINT *ret_len); + #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : msdasql: Fix initial query value.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5cadb646952653501e0c525ccbff9b7fb38f01a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cadb646952653501e0c525c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:58 2021 +1100 msdasql: Fix initial query value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 25dfd801250..6e9c4b680e9 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1062,6 +1062,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; + command->query = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session);

1 0

Alistair Leslie-Hughes : msdasql: Fixup GetCommandText wrt dialect.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 61d1152c7c4d9a1264d28e742d68e0df4ccf3d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d1152c7c4d9a1264d28e74… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:57 2021 +1100 msdasql: Fixup GetCommandText wrt dialect. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e52e8cd18d8..25dfd801250 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -834,8 +834,11 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + { + *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; + } *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); wcscpy(*commandstr, command->query);

1 0

Rémi Bernon : winexinput.sys: Use +xinput channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5802a27dfe4dba141f1532a4bf02c6af8c984e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5802a27dfe4dba141f1532a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:11 2021 +0100 winexinput.sys: Use +xinput channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index abc61e8754f..339db17817c 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -37,7 +37,7 @@ #include "wine/asm.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winexinput); +WINE_DEFAULT_DEBUG_CHANNEL(xinput); #ifdef __ASM_USE_FASTCALL_WRAPPER extern void *WINAPI wrap_fastcall_func1(void *func, const void *a);

1 0

Rémi Bernon : hid: Use +hid debug channel instead of +hidp.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: b25a4d0787408648397ebab36fa3afcd563f0617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b25a4d0787408648397ebab3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:10 2021 +0100 hid: Use +hid debug channel instead of +hidp. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 90dc3211e45..ed2fa3906bd 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -34,7 +34,7 @@ #include "wine/hid.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(hidp); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static NTSTATUS get_value_caps_range( struct hid_preparsed_data *preparsed, HIDP_REPORT_TYPE report_type, ULONG report_len, const struct hid_value_caps **caps, const struct hid_value_caps **caps_end )

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
96
Older →

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 2021