November 2021 - Wine-commits

Alexandre Julliard : widl: Get rid of PowerPC support.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: c70ed78a364908b8cf54c85fcf0eb0824b3fae9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70ed78a364908b8cf54c85f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 21:32:51 2021 +0100 widl: Get rid of PowerPC support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 17 +---------------- tools/widl/widl.h | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1e473eb9cb7..4e60358fbba 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -96,10 +96,6 @@ static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSIO enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__powerpc64__) -enum target_cpu target_cpu = CPU_POWERPC64; -#elif defined(__powerpc__) -enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; #elif defined(__aarch64__) @@ -227,9 +223,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "powerpc64", CPU_POWERPC64 }, - { "powerpc64le", CPU_POWERPC64 }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -855,15 +848,7 @@ int main(int argc,char *argv[]) break; case CPU_ARM64: if (pointer_size == 4) target_cpu = CPU_ARM; - pointer_size = 8; - break; - case CPU_POWERPC64: - if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); - pointer_size = 8; - break; - default: - if (pointer_size == 8) error( "Cannot build 64-bit code for this CPU\n" ); - pointer_size = 4; + else pointer_size = 8; break; } diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 38ffc477115..84e9206d390 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -77,7 +77,7 @@ extern int char_number; enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 + CPU_x86, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; extern enum target_cpu target_cpu;

1 0

Alexandre Julliard : tools: Move target CPU and platform handling to the common tools.h header.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: d969d02e21eb9f128d21a9209f62ac6dfbae236f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d969d02e21eb9f128d21a920… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 21:02:12 2021 +0100 tools: Move target CPU and platform handling to the common tools.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 228 ++++++++++++++++++++++++++++++++++++++++++++ tools/widl/widl.c | 121 ++---------------------- tools/widl/widl.h | 7 -- tools/winebuild/build.h | 30 ++---- tools/winebuild/import.c | 34 +++---- tools/winebuild/main.c | 109 ++------------------- tools/winebuild/parser.c | 6 +- tools/winebuild/res32.c | 4 +- tools/winebuild/spec32.c | 30 +++--- tools/winebuild/utils.c | 105 ++++++--------------- tools/winegcc/utils.c | 10 +- tools/winegcc/utils.h | 18 +--- tools/winegcc/winegcc.c | 240 ++++++++++------------------------------------- 13 files changed, 377 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d969d02e21eb9f128d21…

1 0

Alexandre Julliard : winegcc: Support an explicit --fake-module option.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 9ac2eecbbaad305a5b167abffae9fdf4bcc55c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac2eecbbaad305a5b167abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 18 19:47:40 2021 +0100 winegcc: Support an explicit --fake-module option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f82323d2094..e8457e46643 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -179,6 +179,7 @@ struct options int force_pointer_size; int large_address_aware; int wine_builtin; + int fake_module; int unwind_tables; int strip; int pic; @@ -1002,7 +1003,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, struct strarray spec_args = get_winebuild_args( opts ); struct strarray tool; const char *spec_o_name, *output_name; - int fake_module = strendswith(output_file, ".fake"); /* get the filename from the path */ output_name = get_basename( output_file ); @@ -1020,7 +1020,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); - if (fake_module) + if (opts->fake_module) { strarray_add(&spec_args, "--fake-module"); strarray_add(&spec_args, "-o"); @@ -1101,7 +1101,6 @@ static void build(struct options* opts) const char *output_name, *spec_file, *lang; int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; - int fake_module = 0; int is_pe = is_pe_target( opts ); unsigned int j; @@ -1128,7 +1127,7 @@ static void build(struct options* opts) if (opts->shared || is_pe || strendswith(output_file, ".so")) generate_app_loader = 0; - if (strendswith(output_file, ".fake")) fake_module = 1; + if (strendswith(output_file, ".fake")) opts->fake_module = 1; /* normalize the filename a bit: strip .so, ensure it has proper ext */ if (!strchr(get_basename( output_file ), '.')) @@ -1250,7 +1249,7 @@ static void build(struct options* opts) if (spec_file || !opts->unix_lib) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); - if (fake_module) return; /* nothing else to do */ + if (opts->fake_module) return; /* nothing else to do */ /* link everything together now */ link_args = get_link_args( opts, output_name ); @@ -1880,9 +1879,13 @@ int main(int argc, char **argv) } else if (strncmp("-Wb,", opts.args.str[i], 4) == 0) { - strarray_addall( &opts.winebuild_args, - strarray_fromstring( opts.args.str[i] + 4, ",") ); - /* don't pass it to the compiler, it generates errors */ + unsigned int j; + struct strarray Wb = strarray_fromstring(opts.args.str[i] + 4, ","); + for (j = 0; j < Wb.count; j++) + { + if (!strcmp(Wb.str[j], "--fake-module")) opts.fake_module = 1; + else strarray_add( &opts.winebuild_args, Wb.str[j] ); + } raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1958,7 +1961,7 @@ int main(int argc, char **argv) if (!opts.wine_objdir && is_pe_target( &opts )) opts.use_msvcrt = 1; - if (opts.files.count == 0) forward(&opts); + if (opts.files.count == 0 && !opts.fake_module) forward(&opts); else if (linking) build(&opts); else compile(&opts, lang);

1 0

Alexandre Julliard : makefiles: Split the module generation into several helper functions.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 6944dc51891637b39c02ec22fa35988c41e584da URL: https://source.winehq.org/git/wine.git/?a=commit;h=6944dc51891637b39c02ec22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 18 19:21:12 2021 +0100 makefiles: Split the module generation into several helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 147 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 52 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1455d90d897..e757efdb121 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3219,12 +3219,9 @@ static void output_module( struct makefile *make ) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d%s/%s", pe_dir, make->module )); - output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + output( "%s%s:", module_path, dll_ext ); } else { @@ -3258,56 +3255,55 @@ static void output_module( struct makefile *make ) output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); - if (make->unixlib) + if (spec_file) + output_man_pages( make ); + else if (*dll_ext && !make->is_win16 && strendswith( make->module, ".exe" )) { - struct strarray unix_libs = empty_strarray; - struct strarray unix_deps = empty_strarray; - - if (!make->native_unix_lib) - { - struct strarray unix_imports = empty_strarray; + char *binary = replace_extension( make->module, ".exe", "" ); + add_install_rule( make, binary, "wineapploader", strmake( "t$(bindir)/%s", binary )); + } +} - strarray_add( &unix_imports, "ntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - strarray_add( &unix_imports, "winecrt0" ); - if (spec_file) strarray_add( &unix_deps, spec_file ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); - } +/******************************************************************* + * output_fake_module + */ +static void output_fake_module( struct makefile *make ) +{ + char *spec_file = NULL; - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, make->unixlib ); - add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); - output( "%s:", obj_dir_path( make, make->unixlib )); - output_filenames_obj_dir( make, make->unixobj_files ); - output_filenames( unix_deps ); + strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); + add_install_rule( make, make->module, strmake( "%s.fake", make->module ), + strmake( "d%s/%s", pe_dir, make->module )); - if (make->native_unix_lib) - { - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); - } - else - { - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 0 ); - output_filename( "-munix" ); - output_filename( "-shared" ); - if (spec_file) output_filename( spec_file ); - } - output_filenames_obj_dir( make, make->unixobj_files ); - output_filenames( unix_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); + output( "%s.fake:", obj_dir_path( make, make->module )); + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, make->res_files ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output_winegcc_command( make, make->is_cross ); + output_filename( "-Wb,--fake-module" ); + if (spec_file) + { + output_filename( "-shared" ); + output_filename( spec_file ); } + output_filenames( make->extradllflags ); + output_filenames_obj_dir( make, make->res_files ); + output( "\n" ); +} - if (spec_file && make->importlib) - { - char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); + +/******************************************************************* + * output_import_lib + */ +static void output_import_lib( struct makefile *make ) +{ + char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); if (!*dll_ext && needs_delay_lib( make )) @@ -3357,14 +3353,55 @@ static void output_module( struct makefile *make ) if (needs_implib_symlink( make )) strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); } +/******************************************************************* + * output_unix_lib + */ +static void output_unix_lib( struct makefile *make ) +{ + struct strarray unix_libs = empty_strarray; + struct strarray unix_deps = empty_strarray; + char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - if (spec_file) - output_man_pages( make ); - else if (*dll_ext && !make->is_win16 && strendswith( make->module, ".exe" )) + if (!make->native_unix_lib) { - char *binary = replace_extension( make->module, ".exe", "" ); - add_install_rule( make, binary, "wineapploader", strmake( "t$(bindir)/%s", binary )); + struct strarray unix_imports = empty_strarray; + + strarray_add( &unix_imports, "ntdll" ); + strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); + strarray_add( &unix_imports, "winecrt0" ); + if (spec_file) strarray_add( &unix_deps, spec_file ); + + strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); } + + strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + + strarray_add( &make->all_targets, make->unixlib ); + add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); + output( "%s:", obj_dir_path( make, make->unixlib )); + output_filenames_obj_dir( make, make->unixobj_files ); + output_filenames( unix_deps ); + + if (make->native_unix_lib) + { + output( "\n" ); + output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); + output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); + } + else + { + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output_winegcc_command( make, 0 ); + output_filename( "-munix" ); + output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); + } + output_filenames_obj_dir( make, make->unixobj_files ); + output_filenames( unix_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); } @@ -3724,7 +3761,13 @@ static void output_sources( struct makefile *make ) } if (make->staticlib) output_static_lib( make ); - else if (make->module) output_module( make ); + else if (make->module) + { + output_module( make ); + if (*dll_ext && !make->is_cross) output_fake_module( make ); + if (make->unixlib) output_unix_lib( make ); + if (make->importlib) output_import_lib( make ); + } else if (make->testdll) output_test_module( make ); else if (make->sharedlib) output_shared_lib( make ); else if (make->programs.count) output_programs( make );

1 0

Henri Verbeet : ntdll: Only add a module dependency if import_dll() returned a modref.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: deff68bb728a58965fc69bd8a7d3759d6073b6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=deff68bb728a58965fc69bd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 18:52:20 2021 +0100 ntdll: Only add a module dependency if import_dll() returned a modref. In particular, if import_dll() skips an unused import, it will return TRUE, but set *pwm to NULL. This fixes a regression in 3DMark03 version 3.4.0, introduced by commit 0dd37b02f99f5090dd855343fcd8a99496047f3e. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a754579bf54 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1282,7 +1282,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) imp = NULL; status = STATUS_DLL_NOT_FOUND; } - else if (!is_import_dll_system( &wm->ldr, &imports[i] )) + else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] )) { add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); }

1 0

Brendan Shanks : winemac.drv: Remove workarounds for Mac OS X 10.6 and earlier.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 32fb017d4a22be38ca271bf387e466e958601355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32fb017d4a22be38ca271bf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Nov 18 13:05:04 2021 -0800 winemac.drv: Remove workarounds for Mac OS X 10.6 and earlier. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 15 +++++------ dlls/winemac.drv/cocoa_window.m | 59 ++++++++++++----------------------------- dlls/winemac.drv/opengl.c | 20 -------------- 3 files changed, 23 insertions(+), 71 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c4c745ff732..1bb752d20b7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -299,15 +299,12 @@ static NSString* WineLocalizedString(unsigned int stringID) [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ZOOM) action:@selector(performZoom:) keyEquivalent:@""]; - if ([NSWindow instancesRespondToSelector:@selector(toggleFullScreen:)]) - { - item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) - action:@selector(toggleFullScreen:) - keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | - NSEventModifierFlagOption | - NSEventModifierFlagControl]; - } + item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) + action:@selector(toggleFullScreen:) + keyEquivalent:@"f"]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) action:@selector(arrangeInFront:) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 812b46bee2c..d0672b7fb06 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -36,20 +36,6 @@ #import "cocoa_opengl.h" -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 -enum { - NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, - NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, - NSWindowFullScreenButton = 7, - NSWindowStyleMaskFullScreen = 1 << 14, -}; - -(a)interface NSWindow (WineFullScreenExtensions) - - (void) toggleFullScreen:(id)sender; -(a)end -#endif - - #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */ enum { @@ -1091,11 +1077,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) - [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; - } + if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) + [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; if ([self preventResizing]) { @@ -1115,24 +1098,21 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - NSUInteger style = [self styleMask]; + NSUInteger style = [self styleMask]; - if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && - !(self.parentWindow || self.latentParentWindow)) - { - behavior |= NSWindowCollectionBehaviorFullScreenPrimary; - behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; - } - else - { - behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; - behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSWindowStyleMaskFullScreen) - [super toggleFullScreen:nil]; - } + if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && + !(self.parentWindow || self.latentParentWindow)) + { + behavior |= NSWindowCollectionBehaviorFullScreenPrimary; + behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; + } + else + { + behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; + behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; + if (style & NSWindowStyleMaskFullScreen) + [super toggleFullScreen:nil]; } if (behavior != [self collectionBehavior]) @@ -2480,12 +2460,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi for (i = 0; i < sizeof(buttons) / sizeof(buttons[0]); i++) { - NSButton* button; - - if (buttons[i] == NSWindowFullScreenButton && ![self respondsToSelector:@selector(toggleFullScreen:)]) - continue; - - button = [self standardWindowButton:buttons[i]]; + NSButton* button = [self standardWindowButton:buttons[i]]; if ([button hitTest:[button.superview convertPoint:event.locationInWindow fromView:nil]]) { hitButton = YES; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 9f02e93d376..33132de7415 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1248,7 +1248,6 @@ static BOOL init_gl_info(void) kCGLPFADisplayMask, displayMask, 0 }; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 CGLPixelFormatAttribute core_attribs[] = { kCGLPFADisplayMask, displayMask, @@ -1256,7 +1255,6 @@ static BOOL init_gl_info(void) kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core, 0 }; -#endif CGLPixelFormatObj pix; GLint virtualScreens; CGLError err; @@ -1308,7 +1306,6 @@ static BOOL init_gl_info(void) CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLChoosePixelFormat(core_attribs, &pix, &virtualScreens); if (err != kCGLNoError || !pix) { @@ -1340,7 +1337,6 @@ static BOOL init_gl_info(void) sscanf(str, "%u.%u", &gl_info.max_major, &gl_info.max_minor); CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#endif return TRUE; } @@ -1397,14 +1393,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns CGLError err; BOOL core = major >= 3; -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - if (core) - { - WARN("OS X version >= 10.7 is required to be able to create core contexts\n"); - return FALSE; - } -#endif - pf = get_pixel_format(context->format, TRUE /* non-displayable */); if (!pf) { @@ -1480,7 +1468,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns if (pf->backing_store) attribs[n++] = kCGLPFABackingStore; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (core) { attribs[n++] = kCGLPFAOpenGLProfile; @@ -1493,7 +1480,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns attribs[n++] = (int)kCGLOGLPVersion_3_2_Core; #endif } -#endif attribs[n] = 0; @@ -1856,12 +1842,8 @@ static CGLPixelFormatObj create_pixel_format_for_renderer(CGLRendererInfoObj ren if (core) { -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 attrs[3] = kCGLPFAOpenGLProfile; attrs[4] = (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core; -#else - return NULL; -#endif } if (!get_renderer_property(renderer_info, renderer, kCGLRPRendererID, &renderer_id)) @@ -2157,12 +2139,10 @@ static BOOL query_renderer_integer(CGLRendererInfoObj renderer_info, GLint rende } case WGL_RENDERER_VIDEO_MEMORY_WINE: -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLDescribeRenderer(renderer_info, renderer, kCGLRPVideoMemoryMegabytes, (GLint*)value); if (err != kCGLNoError && err != kCGLBadProperty) WARN("CGLDescribeRenderer(kCGLRPVideoMemoryMegabytes) failed: %d %s\n", err, CGLErrorString(err)); if (err != kCGLNoError) -#endif { if (get_renderer_property(renderer_info, renderer, kCGLRPVideoMemory, (GLint*)value)) *value /= 1024 * 1024;

1 0

Zebediah Figura : ntdll: Implement thread-ID alerts using Mach semaphores on Mac.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 842ecb45f433d458220eaefa6bedb3e3ed635deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=842ecb45f433d458220eaefa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:53 2021 -0600 ntdll: Implement thread-ID alerts using Mach semaphores on Mac. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 59fe6bea8f5..cdc63c8a6ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2341,10 +2341,14 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { +#ifdef __APPLE__ + semaphore_t sem; +#else HANDLE event; #ifdef __linux__ int futex; #endif +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2379,6 +2383,17 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __APPLE__ + if (!entry->sem) + { + semaphore_t sem; + + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + return NULL; + if (InterlockedCompareExchange( (int *)&entry->sem, sem, NULL )) + semaphore_destroy( mach_task_self(), sem ); + } +#else #ifdef __linux__ if (use_futexes()) return entry; @@ -2393,6 +2408,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) NtClose( event ); } +#endif return entry; } @@ -2409,6 +2425,10 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __APPLE__ + semaphore_signal( entry->sem ); + return STATUS_SUCCESS; +#else #ifdef __linux__ if (use_futexes()) { @@ -2420,10 +2440,11 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #endif return NtSetEvent( entry->event, NULL ); +#endif } -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2446,6 +2467,57 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif +#ifdef __APPLE__ + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + semaphore_t sem; + ULONGLONG end; + kern_return_t ret; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + sem = entry->sem; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + for (;;) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + mach_timespec_t timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = semaphore_timedwait( sem, timespec ); + } + else + ret = semaphore_wait( sem ); + + switch (ret) + { + case KERN_SUCCESS: return STATUS_ALERTED; + case KERN_ABORTED: continue; + case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; + default: return STATUS_INVALID_HANDLE; + } + } +} + +#else + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2498,6 +2570,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return status; } +#endif #ifdef __linux__

1 0

Zebediah Figura : ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 6bdb914a25ab31399e68943dc30a6d77a879f8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdb914a25ab31399e68943d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:54 2021 -0600 ntdll: Reimplement Win32 futexes on top of thread-ID alerts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 3 - dlls/ntdll/unix/sync.c | 162 ------------------------------------------- dlls/ntdll/unixlib.h | 6 +- 4 files changed, 173 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bdb914a25ab31399e68…

1 0

Zebediah Figura : ntdll: Reimplement the critical section fast path on top of Win32 futexes.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: c577ce2671ba8b003dbbdb329ada56368a370778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c577ce2671ba8b003dbbdb32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:55 2021 -0600 ntdll: Reimplement the critical section fast path on top of Win32 futexes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 35 ++++++++----- dlls/ntdll/unix/loader.c | 3 -- dlls/ntdll/unix/sync.c | 109 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 4 -- dlls/ntdll/unixlib.h | 5 +- 5 files changed, 24 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 78c68ddbe38..34b804b1463 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -172,19 +172,26 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { - NTSTATUS ret; + LARGE_INTEGER time = {.QuadPart = timeout * (LONGLONG)-10000000}; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); - LARGE_INTEGER time; - - time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NtWaitForSingleObject( sem, FALSE, &time ); + return NtWaitForSingleObject( sem, FALSE, &time ); + } + else + { + int *lock = (int *)&crit->LockSemaphore; + while (!InterlockedCompareExchange( lock, 0, 1 )) + { + static const int zero; + /* this may wait longer than specified in case of multiple wake-ups */ + if (RtlWaitOnAddress( lock, &zero, sizeof(int), &time ) == STATUS_TIMEOUT) + return STATUS_TIMEOUT; + } + return STATUS_WAIT_0; } - return ret; } /****************************************************************************** @@ -274,8 +281,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } - if (unix_funcs->fast_RtlDeleteCriticalSection( crit ) == STATUS_NOT_IMPLEMENTED) - NtClose( crit->LockSemaphore ); } else NtClose( crit->LockSemaphore ); crit->LockSemaphore = 0; @@ -351,12 +356,18 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); } + else + { + int *lock = (int *)&crit->LockSemaphore; + InterlockedExchange( lock, 1 ); + RtlWakeAddressSingle( lock ); + ret = STATUS_SUCCESS; + } if (ret) RtlRaiseStatus( ret ); return ret; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 05ae264297a..1dbcc0d7a7b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2145,9 +2145,6 @@ static struct unix_funcs unix_funcs = NtCurrentTeb, #endif RtlGetSystemTimePrecise, - fast_RtlpWaitForCriticalSection, - fast_RtlpUnWaitCriticalSection, - fast_RtlDeleteCriticalSection, fast_RtlTryAcquireSRWLockExclusive, fast_RtlAcquireSRWLockExclusive, fast_RtlTryAcquireSRWLockShared, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 47a0a03b45f..12df0c90d73 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2550,115 +2550,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif -#ifdef __linux__ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - int val; - struct timespec timespec; - - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - while ((val = InterlockedCompareExchange( (int *)&crit->LockSemaphore, 0, 1 )) != 1) - { - /* note: this may wait longer than specified in case of signals or */ - /* multiple wake-ups, but that shouldn't be a problem */ - if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - } - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - *(int *)&crit->LockSemaphore = 1; - futex_wake( (int *)&crit->LockSemaphore, 1 ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; -} - -#elif defined(__APPLE__) - -static inline semaphore_t get_mach_semaphore( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t ret = *(int *)&crit->LockSemaphore; - if (!ret) - { - semaphore_t sem; - if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return 0; - if (!(ret = InterlockedCompareExchange( (int *)&crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - semaphore_destroy( mach_task_self(), sem ); /* somebody beat us to it */ - } - return ret; -} - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - mach_timespec_t timespec; - semaphore_t sem = get_mach_semaphore( crit ); - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - for (;;) - { - switch( semaphore_timedwait( sem, timespec )) - { - case KERN_SUCCESS: - return STATUS_WAIT_0; - case KERN_ABORTED: - continue; /* got a signal, restart */ - case KERN_OPERATION_TIMED_OUT: - return STATUS_TIMEOUT; - default: - return STATUS_INVALID_HANDLE; - } - } -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t sem = get_mach_semaphore( crit ); - semaphore_signal( sem ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_destroy( mach_task_self(), *(int *)&crit->LockSemaphore ); - return STATUS_SUCCESS; -} - -#else /* __APPLE__ */ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -#endif - - #ifdef __linux__ /* Futex-based SRW lock implementation: diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 641de0c465f..d44a9e128ff 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,10 +100,6 @@ extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PT extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; - -extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ded05c40e17..535f76a647e 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 129 +#define NTDLL_UNIXLIB_VERSION 130 struct unix_funcs { @@ -39,9 +39,6 @@ struct unix_funcs LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); /* fast locks */ - NTSTATUS (CDECL *fast_RtlpWaitForCriticalSection)( RTL_CRITICAL_SECTION *crit, int timeout ); - NTSTATUS (CDECL *fast_RtlpUnWaitCriticalSection)( RTL_CRITICAL_SECTION *crit ); - NTSTATUS (CDECL *fast_RtlDeleteCriticalSection)( RTL_CRITICAL_SECTION *crit ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockShared)( RTL_SRWLOCK *lock );

1 0

Zebediah Figura : ntdll: Get rid of the direct futex path for condition variables.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 87164ee3332c95f0cd9a1f3e4598056689cdfadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=87164ee3332c95f0cd9a1f3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:56 2021 -0600 ntdll: Get rid of the direct futex path for condition variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 24 +++++--------- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/sync.c | 71 ------------------------------------------ dlls/ntdll/unix/unix_private.h | 3 -- dlls/ntdll/unixlib.h | 5 +-- 5 files changed, 9 insertions(+), 96 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 34b804b1463..4ceadebf0e7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -792,11 +792,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (unix_funcs->fast_RtlWakeConditionVariable( variable, 1 ) == STATUS_NOT_IMPLEMENTED) - { - InterlockedIncrement( (int *)&variable->Ptr ); - RtlWakeAddressSingle( variable ); - } + InterlockedIncrement( (int *)&variable->Ptr ); + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -806,11 +803,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (unix_funcs->fast_RtlWakeConditionVariable( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) - { - InterlockedIncrement( (int *)&variable->Ptr ); - RtlWakeAddressAll( variable ); - } + InterlockedIncrement( (int *)&variable->Ptr ); + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -831,12 +825,11 @@ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) { - const void *value = variable->Ptr; + int value = *(int *)&variable->Ptr; NTSTATUS status; RtlLeaveCriticalSection( crit ); - if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); RtlEnterCriticalSection( crit ); return status; } @@ -863,7 +856,7 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) { - const void *value = variable->Ptr; + int value = *(int *)&variable->Ptr; NTSTATUS status; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) @@ -871,8 +864,7 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, else RtlReleaseSRWLockExclusive( lock ); - if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( variable, &value, sizeof(value), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1dbcc0d7a7b..32aa7267423 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2151,8 +2151,6 @@ static struct unix_funcs unix_funcs = fast_RtlAcquireSRWLockShared, fast_RtlReleaseSRWLockExclusive, fast_RtlReleaseSRWLockShared, - fast_RtlWakeConditionVariable, - fast_wait_cv, load_so_dll, init_builtin_dll, init_unix_lib, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 12df0c90d73..7a2466f5fa3 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -162,23 +162,6 @@ static int *get_futex(void **ptr) return NULL; } -static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) -{ - LARGE_INTEGER now; - timeout_t diff; - - if (timeout->QuadPart > 0) - { - NtQuerySystemTime( &now ); - diff = timeout->QuadPart - now.QuadPart; - } - else - diff = -timeout->QuadPart; - - timespec->tv_sec = diff / TICKSPERSEC; - timespec->tv_nsec = (diff % TICKSPERSEC) * 100; -} - #endif @@ -2802,50 +2785,6 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_SUCCESS; } -NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) -{ - const char *value_ptr; - int aligned_value, *futex; - struct timespec timespec; - int ret; - - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - - if (!(futex = get_futex( &variable->Ptr ))) - return STATUS_NOT_IMPLEMENTED; - - value_ptr = (const char *)&value; - value_ptr += ((ULONG_PTR)futex) - ((ULONG_PTR)&variable->Ptr); - aligned_value = *(int *)value_ptr; - - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) - { - timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( futex, aligned_value, &timespec ); - } - else - ret = futex_wait( futex, aligned_value, NULL ); - - if (ret == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) -{ - int *futex; - - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - if (!(futex = get_futex( &variable->Ptr ))) - return STATUS_NOT_IMPLEMENTED; - - InterlockedIncrement( futex ); - futex_wake( futex, count ); - return STATUS_SUCCESS; -} - #else NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) @@ -2878,14 +2817,4 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_NOT_IMPLEMENTED; } -NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d44a9e128ff..61f37d4b22f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -106,10 +106,7 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS extern NTSTATUS CDECL fast_RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) DECLSPEC_HIDDEN; extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, - const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 535f76a647e..a271bb05da9 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 130 +#define NTDLL_UNIXLIB_VERSION 131 struct unix_funcs { @@ -45,9 +45,6 @@ struct unix_funcs NTSTATUS (CDECL *fast_RtlAcquireSRWLockShared)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockShared)( RTL_SRWLOCK *lock ); - NTSTATUS (CDECL *fast_RtlWakeConditionVariable)( RTL_CONDITION_VARIABLE *variable, int count ); - NTSTATUS (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value, - const LARGE_INTEGER *timeout ); /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module );

1 0