November 2021 - Wine-commits

Martin Storsjö : winedump: Print the whole multibyte unwind opcode for arm.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 825e8d8105efcd18a1a2083cdded3f5b1cef5435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=825e8d8105efcd18a1a2083c… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:44 2021 +0200 winedump: Print the whole multibyte unwind opcode for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 04e01755171..4629c3082f9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -764,6 +764,18 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } +static const BYTE armnt_code_lengths[256] = +{ +/* 00 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 20 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 60 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* 80 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +/* a0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +/* c0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +/* e0 */ 1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,3,4,1,1,1,1,1 +}; + static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { const struct unwind_info_armnt *info; @@ -990,6 +1002,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) for (b = 0; b < words * sizeof(*codes); b++) { BYTE code = bytes[b]; + BYTE len = armnt_code_lengths[code]; if (info->e && b == count) { @@ -1007,7 +1020,10 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) } } - printf( " Unwind Code %x\t", code ); + printf( " Unwind Code"); + for (i = 0; i < len; i++) + printf( " %02x", bytes[b+i] ); + printf( "\t" ); if (code == 0x00) printf( "\n" );

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 : 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 : 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 : ntdll: Create a remote thread in DbgUiIssueRemoteBreakin().
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromFile{A,W}.
by Alexandre Julliard 09 Nov '21

09 Nov '21

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

Ziqing Hui : d3dx10: Implement D3DX10CreateTextureFromResource{A,W}.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 94f8a077bb301f47ef0cd919f160b1877d7d0ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f8a077bb301f47ef0cd919… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 4 19:28:48 2021 +0800 d3dx10: Implement D3DX10CreateTextureFromResource{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 | 46 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 50128260b3e..55a4d057fdf 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2076,8 +2076,6 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromResource tests */ - todo_wine - { hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, NULL); @@ -2086,7 +2084,6 @@ static void test_create_texture(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -2095,7 +2092,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromResourceW(device, resource_module, test_resource_name, 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) @@ -2107,7 +2104,7 @@ static void test_create_texture(void) hr = D3DX10CreateTextureFromResourceA(device, resource_module, get_str_a(test_resource_name), 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 62baed0ca23..3488c80ab29 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -626,17 +626,55 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + HRSRC res_info; + void *buffer; + DWORD size; + HRESULT hr; + + TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_a(resource), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!resource || !texture) + return D3DX10_ERR_INVALID_DATA; + + if (!(res_info = FindResourceA(module, resource, (const char *)RT_RCDATA))) + { + /* Try loading the resource as bitmap data */ + if (!(res_info = FindResourceA(module, resource, (const char *)RT_BITMAP))) + return D3DX10_ERR_INVALID_DATA; + } + + if (FAILED(hr = load_resource(module, res_info, &buffer, &size))) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); } HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { - FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + HRSRC res_info; + void *buffer; + DWORD size; + HRESULT hr; + + TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_w(resource), load_info, pump, texture, hresult); - return E_NOTIMPL; + + if (!resource || !texture) + return D3DX10_ERR_INVALID_DATA; + + if (!(res_info = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) + { + /* Try loading the resource as bitmap data */ + if (!(res_info = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP))) + return D3DX10_ERR_INVALID_DATA; + } + + if (FAILED(hr = load_resource(module, res_info, &buffer, &size))) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); } HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size,

1 0

Stefan Dösinger : d3d8/tests: Port the filling convention test to d3d8.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 3ebafc805f7294cdd8e2b37a44592f8fc6401377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebafc805f7294cdd8e2b37a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:38:58 2021 +0300 d3d8/tests: Port the filling convention test to d3d8. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebafc805f7294cdd8e2…

1 0

Zebediah Figura : wined3d: Reference vertex buffer objects only after calling context_update_stream_info().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 613e16387785e5cf632c0ba385428b8392ea05f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=613e16387785e5cf632c0ba3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 16:34:40 2021 -0600 wined3d: Reference vertex buffer objects only after calling context_update_stream_info(). It may load buffers into a different location. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d2dd9e0bd09..09c871efcd4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3963,12 +3963,23 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, device_invalidate_state(device, STATE_STREAMSRC); else wined3d_buffer_load(&buffer_gl->b, context, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } /* Loading the buffers above may have invalidated the stream info. */ if (wined3d_context_is_graphics_state_dirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); + map = context->stream_info.use_map; + while (map) + { + const struct wined3d_stream_info_element *e; + struct wined3d_buffer_gl *buffer_gl; + + e = &context->stream_info.elements[wined3d_bit_scan(&map)]; + buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + if (indexed && state->index_buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(state->index_buffer);

1 0

Zebediah Figura : wined3d: Make the "buffer_object" field of struct wined3d_buffer a wined3d_bo pointer.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: d630aa20bf44055189db61d8c54709abb394c80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d630aa20bf44055189db61d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 16:34:41 2021 -0600 wined3d: Make the "buffer_object" field of struct wined3d_buffer a wined3d_bo pointer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 24 ++++++++++++------------ dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/cs.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 9 +++++++-- 6 files changed, 29 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d630aa20bf44055189db…

1 0