November 2020 - Wine-devel - list.winehq.org

[PATCH v2] winebuild: Find main/wmain in static libraries.
by Kevin Puetz 20 Nov '20

20 Nov '20

Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This one had fuzz in spec32.c from d5c089f5fa71e2ae568b2f1bcb9158223c552040 Still applied correctly, but marvin apparently doesn't like fuzz. Oops. --- wine.exe.so files set __wine_spec_exe_entry as the entry point. Therefore the linker is not initially looking for main and will pass over objects in lib.a archives that might provide it. When it gets to libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but the resulting rescan will find the winecrt0 definition in terms of WinMain, before rescanning earlier libraries. So only a direct .o file (which is never passed over) can override the winecrt0 definition, and libraries like -lgtest_main do not work. --- tools/winebuild/build.h | 2 ++ tools/winebuild/main.c | 22 ++++++++++++++++++++-- tools/winebuild/spec32.c | 12 ++++++++++++ tools/winegcc/winegcc.c | 4 ++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03715af9563..a4b9bc97e3e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -299,6 +300,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dda..68137b0f4c2 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ba2edfb588f..a12e7d38aac 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} static unsigned int hash_filename( const char *name ) { @@ -610,6 +617,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -688,6 +696,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9268a5dfd1d..cef0832455c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1245,8 +1245,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1258,6 +1256,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

1 0

[PATCH resend] winebuild: Find main/wmain in static libraries.
by Kevin Puetz 20 Nov '20

20 Nov '20

Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. --- wine.exe.so files set __wine_spec_exe_entry as the entry point. Therefore the linker is not initially looking for main and will pass over objects in lib.a archives that might provide it. When it gets to libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but the resulting rescan will find the winecrt0 definition in terms of WinMain, before rescanning earlier libraries. So only a direct .o file (which is never passed over) can override the winecrt0 definition, and libraries like -lgtest_main do not work. Index: wine/tools/winebuild/build.h =================================================================== --- wine.orig/tools/winebuild/build.h +++ wine/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -297,6 +298,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); Index: wine/tools/winebuild/main.c =================================================================== --- wine.orig/tools/winebuild/main.c +++ wine/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_poi { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, c else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); Index: wine/tools/winebuild/spec32.c =================================================================== --- wine.orig/tools/winebuild/spec32.c +++ wine/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) @@ -602,6 +609,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -680,6 +688,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); Index: wine/tools/winegcc/winegcc.c =================================================================== --- wine.orig/tools/winegcc/winegcc.c +++ wine/tools/winegcc/winegcc.c @@ -1228,8 +1228,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1241,6 +1239,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

2 1

winegcc: Implement -Wl,--out-implib
by Kevin Puetz 20 Nov '20

20 Nov '20

This allows a CMake toolchain (or other caller) to treat winegcc like MinGW, specifying that it produce a separate file for imports, e.g. set(CMAKE_IMPORT_LIBRARY_PREFIX lib) set(CMAKE_IMPORT_LIBRARY_SUFFIX .a) string(APPEND CMAKE_C_CREATE_SHARED_LIBRARY " -Wl,--out-implib,<TARGET_IMPLIB>") Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- makedep.c isn't changed to use use this because the few cases in which wine currently uses #pragma implib (and thus winebuild --implib) involve putting some (but not all) of the object files into the libfoo.a as well. The motive is to fix our CMake toolchain for wineg++ to support using target_link_libraries to link other SHARED_LIBRARY targets in the project. This broke when wine-5.7 removed __wine_spec_init from winecrt0; the issue is that CMake links to with an absolute path to the .so (i.e. foo.dll.so). So we had been (unnnoticed until it quit working) getting an ELF DT_NEEDED instead of a PE import. This "worked" before, since __wine_spec_init would still register the builtin dll loaded in such a fashion. Now the dependency's own dllimports (from kernel32, etc) don't get loaded anymore. And I'm pretty sure it only worked before by happy accident. CMake supports windows-style DLL/implib separation, but it really wants the link rule to produce both artifacts (as MSVC/MinGW do) and the implib needs to be a file that can be passed to linking as an absolute path. And (for least surprise) it seems like that filename should work with -lfoo too, even though CMake will always pass a full path. libfoo.def doesn't, because winegcc sees libfoo.def as the spec_file (i.e. --export). The only way I could find to pass a libfoo.def file and have it be imports (besides having winegcc find it via -lfoo) was to conceal it in -Wb,libfoo.def, which feels rather hacky. Just forwarding the mingw-style -Wl,--out-implib to winebuild --implib seemed easy and MinGW-like (which winegcc often seems to aim for). add_undef_import is subtle, but it's already there (for #pragma implib) so I didn't see any a reason to prefer a libfoo.def over a libfoo.a, when the latter already works as a filename and as -lfoo. If I've overlooked some reason it's preferable to use .def files, perhaps there could be a distinct extension (.impdef, .a.def, or .lib ala MSVC?) which get_file_type treats as file_dll and guess_lib_type (also?) searches. Then --out-implib could check the extension and use winebuild --def vs winebuild --implib accordingly (like how winegcc already reacts to the extension of -o to decide between generate_app_loader, --fake, etc). Signed-off-by in the sense that I think this is correct and adequate, but I'm happy to take feedback if there's other use-cases an upstream submission should try to address... Index: wine/tools/winegcc/winegcc.c =================================================================== --- wine.orig/tools/winegcc/winegcc.c +++ wine/tools/winegcc/winegcc.c @@ -231,6 +231,7 @@ struct options const char* entry_point; const char* prelink; const char* debug_file; + const char* out_implib; strarray* prefix; strarray* lib_dirs; strarray* args; @@ -1085,7 +1086,7 @@ static void add_library( struct options static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *tool; + strarray *spec_args, *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1454,6 +1455,26 @@ static void build(struct options* opts) strarray_free(tool); } + if(opts->out_implib) + { + if (!spec_file) + error("--out-implib requires a .spec or .def file\n"); + + implib_args = get_winebuild_args( opts ); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( implib_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_LD ))) strarray_add( implib_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + strarray_add(implib_args, "--implib"); + strarray_add(implib_args, "-o"); + strarray_add(implib_args, opts->out_implib); + strarray_add(implib_args, "--export"); + strarray_add(implib_args, spec_file); + strarray_addall(implib_args, opts->winebuild_args); + + spawn(opts->prefix, implib_args, 0); + strarray_free (implib_args); + } + /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1966,6 +1987,11 @@ int main(int argc, char **argv) strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); continue; } + if (!strcmp(Wl->base[j], "--out-implib")) + { + opts.out_implib = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); } Index: wine/tools/winegcc/winegcc.man.in =================================================================== --- wine.orig/tools/winegcc/winegcc.man.in +++ wine/tools/winegcc/winegcc.man.in @@ -72,6 +72,9 @@ Do not add the winecrt0 library when lin .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.IP "\fB-b,--target \fItarget\fR" +.IP "\fB-Wl,--out-implib,\fIlib.a\fR" +This option should be used while linking a dll, and is implemented for compatibility with MinGW-gcc. A \fIlib.spec\fR or \fIlib.def\fR must also be provided. Despite the name, it is actually forwarded to \fBwinebuild --implib -o \fIlib.a\fR rather than to the linker. .SH ENVIRONMENT .TP .B WINEBUILD

1 0

[PATCH] mmdveapi: Support older version of the AudioClientProperties structure
by Andrew Eikum 20 Nov '20

20 Nov '20

Warframe when using a win10 prefix uses an xaudio2_9redist.dll which uses the older AudioClientProperties structure (missing the Options member). Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 12 +++++++++++- dlls/winealsa.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineandroid.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineoss.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winepulse.drv/mmdevdrv.c | 22 +++++++++++++++------- include/audioclient.idl | 8 ++++++++ 7 files changed, 94 insertions(+), 36 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index a0aa1b18936..495c1c6f496 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -276,6 +276,7 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, NULL); ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + /* invalid cbSize */ client_props.cbSize = 0; client_props.bIsOffload = FALSE; client_props.eCategory = AudioCategory_BackgroundCapableMedia; @@ -284,7 +285,8 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); - client_props.cbSize = sizeof(client_props); + /* offload consistency */ + client_props.cbSize = sizeof(client_props) - sizeof(client_props.Options); client_props.bIsOffload = TRUE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); @@ -293,10 +295,18 @@ static void test_audioclient(void) else ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + /* disable offload */ client_props.bIsOffload = FALSE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + /* Options field added in Win 8.1 */ + client_props.cbSize = sizeof(client_props); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK || + broken(hr == E_INVALIDARG) /* <= win8 */, + "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); } else diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0c255a66f7d..318350471db 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,21 +2676,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 7d543ec4f61..d9b7cde2c80 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,21 +1635,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 846e0ae3b1e..b002189e199 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,21 +2243,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd0784eb323..db2c6b23914 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,21 +1800,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cef8a2d4d5b..417067f0bf8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,21 +2248,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/include/audioclient.idl b/include/audioclient.idl index 132e78a602b..cd13be5d575 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -126,6 +126,14 @@ typedef struct _AudioClientProperties AUDCLNT_STREAMOPTIONS Options; } AudioClientProperties; +typedef struct _Win8AudioClientProperties +{ + UINT32 cbSize; + BOOL bIsOffload; + AUDIO_STREAM_CATEGORY eCategory; + /* Options field added in Win 8.1 */ +} Win8AudioClientProperties; + [ local, pointer_default(unique), -- 2.29.2

2 1

[PATCH 3/5] server: Support FileFsDeviceInformation queries on console handles.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 20 ++++++++++++++++++++ server/console.c | 27 +++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-)

2 1

[PATCH 2/5] kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 -- dlls/kernelbase/file.c | 6 ------ 2 files changed, 8 deletions(-)

2 1

[PATCH 1/5] server: Properly handle NtQueryInformationFile on console handles.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 28 ++++++++++++++++++++++++++++ server/console.c | 10 ++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-)

2 1

[PATCH 5/5] server: Remove no longer needed hack for inheriting console from stdin.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 30 ------------------------------ server/process.c | 12 +++--------- server/process.h | 2 -- 3 files changed, 3 insertions(+), 41 deletions(-)

1 0

[PATCH v2] wineboot: Fill ActiveProcessorAffinity field in USD.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - define ActiveProcessorAffinity as ULONGLONG in USD; - use ULONGLONG instead of ULONG_PTR. dlls/ntdll/tests/virtual.c | 7 +++++++ include/ddk/wdm.h | 2 +- programs/wineboot/wineboot.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..f2c8343e1a6 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -579,6 +579,13 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + if (user_shared_data->ActiveProcessorCount) + ok(user_shared_data->ActiveProcessorAffinity + == (user_shared_data->ActiveProcessorCount >= 8 * sizeof(ULONGLONG) + ? ~(ULONGLONG)0 : ((ULONGLONG)1 << user_shared_data->ActiveProcessorCount) - 1) + || broken(!user_shared_data->ActiveProcessorAffinity) /* before Win7 */, + "Got unexpected ActiveProcessorAffinity %s.\n", + wine_dbgstr_longlong(user_shared_data->ActiveProcessorAffinity)); ok(user_shared_data->ActiveGroupCount == 1 || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6885de1cf89..aa2551be035 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1320,7 +1320,7 @@ typedef struct _KUSER_SHARED_DATA { USHORT UserModeGlobalLogger[16]; /* 0x380 */ ULONG ImageFileExecutionOptions; /* 0x3a0 */ ULONG LangGenerationCount; /* 0x3a4 */ - ULONG ActiveProcessorAffinity; /* 0x3a8 */ + ULONGLONG ActiveProcessorAffinity; /* 0x3a8 */ volatile ULONGLONG InterruptTimeBias; /* 0x3b0 */ volatile ULONGLONG QpcBias; /* 0x3b8 */ ULONG ActiveProcessorCount; /* 0x3c0 */ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..5bf839ec520 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -332,6 +332,8 @@ static void create_user_shared_data(void) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveProcessorAffinity = data->ActiveProcessorCount >= 8 * sizeof(ULONGLONG) + ? ~(ULONGLONG)0 : ((ULONGLONG)1 << data->ActiveProcessorCount) - 1; data->ActiveGroupCount = 1; initialize_xstate_features( data ); -- 2.28.0

1 1

[PATCH] wineboot: Fill ActiveProcessorAffinity field in USD.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 6 ++++++ programs/wineboot/wineboot.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..df5d601927a 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -579,6 +579,12 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + if (user_shared_data->ActiveProcessorCount) + ok(user_shared_data->ActiveProcessorAffinity == (user_shared_data->ActiveProcessorCount >= 64 + ? ~(ULONG_PTR)0 : ((ULONG_PTR)1 << user_shared_data->ActiveProcessorCount) - 1) + || broken(!user_shared_data->ActiveProcessorAffinity) /* before Win7 */, + "Got unexpected ActiveProcessorAffinity %s.\n", + wine_dbgstr_longlong(user_shared_data->ActiveProcessorAffinity)); ok(user_shared_data->ActiveGroupCount == 1 || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..b3a28444a06 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -332,6 +332,8 @@ static void create_user_shared_data(void) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveProcessorAffinity = data->ActiveProcessorCount >= 64 + ? ~(ULONG_PTR)0 : ((ULONG_PTR)1 << data->ActiveProcessorCount) - 1; data->ActiveGroupCount = 1; initialize_xstate_features( data ); -- 2.28.0

2 5