November 2021 - Wine-Commits

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromFile{A,W}.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 81bc256685b02f76449b7ae0d382b15b09d6dde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bc256685b02f76449b7ae0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 4 19:28:47 2021 +0800 d3dx10: Implement D3DX10CreateTextureFromFile{A,W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++----- dlls/d3dx10_43/texture.c | 42 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 13f70f34f96..50128260b3e 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2034,8 +2034,6 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromFile tests */ - todo_wine - { hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); @@ -2044,7 +2042,6 @@ static void test_create_texture(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -2052,7 +2049,7 @@ static void test_create_texture(void) create_file(test_filename, test_image[i].data, test_image[i].size, path); hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, NULL); - todo_wine + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) @@ -2063,7 +2060,7 @@ static void test_create_texture(void) } hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, NULL); - todo_wine + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); if (hr == S_OK) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 0568bc2316c..62baed0ca23 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -576,17 +576,51 @@ end: HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + WCHAR *buffer; + int str_len; + HRESULT hr; + + TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_a(src_file), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!src_file || !texture) + return E_FAIL; + + if (!(str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(buffer = heap_alloc(str_len * sizeof(*buffer)))) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, src_file, -1, buffer, str_len); + hr = D3DX10CreateTextureFromFileW(device, buffer, load_info, pump, texture, hresult); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; + + TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_w(src_file), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!src_file || !texture) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource,

1 0

Alexandre Julliard : ntdll: Create a remote thread in DbgUiIssueRemoteBreakin().
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 8dc6987ba5c3fdaa5baea8b00a860f62a3716c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc6987ba5c3fdaa5baea8b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 12:33:30 2021 +0100 ntdll: Create a remote thread in DbgUiIssueRemoteBreakin(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 9 ++++++++- dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unix/server.c | 28 ---------------------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +-- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/thread.c | 1 - server/trace.c | 6 ------ 9 files changed, 12 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 160b1f549c9..82b8daa47af 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -552,5 +552,12 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) */ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) { - return unix_funcs->DbgUiIssueRemoteBreakin( process ); + HANDLE handle; + NTSTATUS status; + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, + DbgUiRemoteBreakin, NULL, 0, 0, 0, 0, NULL ); + if (!status) NtClose( handle ); + return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ea7f18602da..99226d472da 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -110,7 +110,6 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif -void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -1082,7 +1081,6 @@ static void load_ntdll_functions( HMODULE module ) if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) - GET_FUNC( DbgUiRemoteBreakin ); GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); @@ -2144,7 +2142,6 @@ static struct unix_funcs unix_funcs = #ifdef __aarch64__ NtCurrentTeb, #endif - DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, RtlWakeAddressAll, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 46d403df326..399b1cceb16 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -574,17 +574,6 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (!self) NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); break; } - case APC_BREAK_PROCESS: - { - HANDLE handle; - - result->type = APC_BREAK_PROCESS; - result->break_process.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, - NtCurrentProcess(), pDbgUiRemoteBreakin, NULL, - 0, 0, 0, 0, NULL ); - if (!result->break_process.status) NtClose( handle ); - break; - } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; @@ -1639,23 +1628,6 @@ void server_init_thread( void *entry_point, BOOL *suspend ) } -/*********************************************************************** - * DbgUiIssueRemoteBreakin - */ -NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) -{ - apc_call_t call; - apc_result_t result; - NTSTATUS status; - - memset( &call, 0, sizeof(call) ); - call.type = APC_BREAK_PROCESS; - status = server_queue_process_apc( process, &call, &result ); - if (status) return status; - return result.break_process.status; -} - - /****************************************************************************** * NtDuplicateObject */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6b8835bcba0..641de0c465f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,7 +92,6 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ -extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d56259deff2..62030d91cdb 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 127 +#define NTDLL_UNIXLIB_VERSION 128 struct unix_funcs { @@ -36,7 +36,6 @@ struct unix_funcs #endif /* other Win32 API functions */ - NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); NTSTATUS (WINAPI *RtlWaitOnAddress)( const void *addr, const void *cmp, SIZE_T size, const LARGE_INTEGER *timeout ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c561b48714d..5a66e9aff8f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -470,8 +470,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, - APC_DUP_HANDLE, - APC_BREAK_PROCESS + APC_DUP_HANDLE }; typedef struct @@ -6263,7 +6262,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 735 +#define SERVER_PROTOCOL_VERSION 736 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6a25db0326f..ad6d2bb58d0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -486,8 +486,7 @@ enum apc_type APC_MAP_VIEW, APC_UNMAP_VIEW, APC_CREATE_THREAD, - APC_DUP_HANDLE, - APC_BREAK_PROCESS + APC_DUP_HANDLE }; typedef struct diff --git a/server/thread.c b/server/thread.c index b85df68af92..55eb8513af8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1734,7 +1734,6 @@ DECL_HANDLER(queue_apc) } break; case APC_CREATE_THREAD: - case APC_BREAK_PROCESS: process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD ); break; case APC_DUP_HANDLE: diff --git a/server/trace.c b/server/trace.c index 6e78f8281f0..903e323273b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -237,9 +237,6 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) call->dup_handle.src_handle, call->dup_handle.dst_process, call->dup_handle.access, call->dup_handle.attributes, call->dup_handle.options ); break; - case APC_BREAK_PROCESS: - fprintf( stderr, "APC_BREAK_PROCESS" ); - break; default: fprintf( stderr, "type=%u", call->type ); break; @@ -324,9 +321,6 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) fprintf( stderr, "APC_DUP_HANDLE,status=%s,handle=%04x", get_status_name( result->dup_handle.status ), result->dup_handle.handle ); break; - case APC_BREAK_PROCESS: - fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) ); - break; default: fprintf( stderr, "type=%u", result->type ); break;

1 0

Alexandre Julliard : winspool.drv: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

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

Alistair Leslie-Hughes : msdasql: Fixup GetCommandText wrt dialect.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

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 : hidparse.sys: Use +hid debug channel.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: e9dc0cf83a318c75b22129a4a0cda3dc754d9d4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dc0cf83a318c75b22129a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:09 2021 +0100 hidparse.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index d455049d9b1..c07389044fd 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -35,7 +35,7 @@ #include "wine/list.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(hidp); +WINE_DEFAULT_DEBUG_CHANNEL(hid); /* Flags that are defined in the document "Device Class Definition for Human Interface Devices" */ @@ -122,7 +122,7 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) { unsigned int i, end; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "usage %02x:%02x input %u-(%u)-%u, report len %u output %u-(%u)-%u, report len %u " "feature %u-(%u)-%u, report len %u collections %u\n", data->usage_page, data->usage, @@ -498,7 +498,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng BYTE *ptr, *end; int i; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "descriptor %p, length %u:\n", descriptor, length ); for (i = 0; i < length;)

1 0

Rémi Bernon : winebus.sys: Use +hid debug channel.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 5b735572c16f9a322af4611f6bd63088785fb7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b735572c16f9a322af4611f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:08 2021 +0100 winebus.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/hid.c | 2 +- dlls/winebus.sys/main.c | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index eef882b52e8..735fd8c54cc 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -97,7 +97,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_IOHIDMANAGERCREATE static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c01648ce67e..49afcbaf67c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -55,7 +55,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef SONAME_LIBSDL2 diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1591f00eedf..dad5344a54c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -92,7 +92,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_UDEV diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index a0f07f66392..893bf1cd7f6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -39,7 +39,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static BOOL hid_report_descriptor_append(struct hid_report_descriptor *desc, const BYTE *buffer, SIZE_T size) { diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0e7889386dc..c9a18313853 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -40,7 +40,7 @@ #include "unixlib.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static DRIVER_OBJECT *driver_obj; @@ -411,7 +411,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report length %u:\n", report->length); for (i = 0; i < report->length;) @@ -1038,7 +1038,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); irp->IoStatus.Information = packet->reportBufferLen; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1068,7 +1068,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1087,7 +1087,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; unix_device_get_feature_report(device, packet, &irp->IoStatus); - if (!irp->IoStatus.Status && TRACE_ON(plugplay)) + if (!irp->IoStatus.Status && TRACE_ON(hid)) { TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1104,7 +1104,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;)

1 0

Nikolay Sivov : mf/session: Expose rate control interfaces.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: d1662e4beb4c1b757423c71107f7ec115ade19f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1662e4beb4c1b757423c711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:06:00 2021 +0300 mf/session: Expose rate control interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 19 +++++++++++++++---- dlls/mf/tests/mf.c | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index fe87b3e6584..c8ec1b5c33f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1637,23 +1637,34 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + *out = NULL; + if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *out = &session->IMFMediaSession_iface; - IMFMediaSession_AddRef(iface); - return S_OK; } else if (IsEqualIID(riid, &IID_IMFGetService)) { *out = &session->IMFGetService_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *out = &session->IMFRateSupport_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *out = &session->IMFRateControl_iface; + } + + if (*out) + { IMFMediaSession_AddRef(iface); return S_OK; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 623781a6ba2..eb681a8b9a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1181,8 +1181,8 @@ static void test_media_session(void) ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); check_interface(session, &IID_IMFGetService, TRUE); - todo_wine check_interface(session, &IID_IMFRateSupport, TRUE); - todo_wine check_interface(session, &IID_IMFRateControl, TRUE); + check_interface(session, &IID_IMFRateSupport, TRUE); + check_interface(session, &IID_IMFRateControl, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); check_interface(session, &IID_IMFLocalMFTRegistration, FALSE);

1 0

Zebediah Figura : winegstreamer: Implement INSSBuffer::GetMaxLength().
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 25adac6ede88d835110be20de0164d28c2187977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25adac6ede88d835110be20d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:30 2021 -0600 winegstreamer: Implement INSSBuffer::GetMaxLength(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2de0610165d..2c0f89e29a9 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -237,8 +237,12 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) { - FIXME("iface %p, size %p, stub!\n", iface, size); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("buffer %p, size %p.\n", buffer, size); + + *size = buffer->size; + return S_OK; } static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 685dd92e27e..0347195ba10 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -591,7 +591,7 @@ static void test_reader_attributes(IWMProfile *profile) static void test_sync_reader_streaming(void) { - DWORD size, flags, output_number, expect_output_number; + DWORD size, capacity, flags, output_number, expect_output_number; const WCHAR *filename = load_resource(L"test.wmv"); WORD stream_numbers[2], stream_number; IWMStreamConfig *config, *config2; @@ -682,6 +682,10 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -747,6 +751,10 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); } @@ -1193,9 +1201,9 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { struct callback *callback = impl_from_IWMReaderCallback(iface); + DWORD size, capacity; BYTE *data, *data2; HRESULT hr; - DWORD size; if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", @@ -1210,6 +1218,10 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample;

1 0

Alexandre Julliard : msv1_0: Define the communication structure only on the Unix side.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

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 Nov. 9, 2021

Nov. 9, 2021

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