wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Jactry Zeng : ntdll: Try harder to fallback to neutral locales.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 1967d7cd4de8cae388231235a4da25cd97041f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/1967d7cd4de8cae388231235a4da25… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:21 2023 +0100 ntdll: Try harder to fallback to neutral locales. --- dlls/ntdll/unix/env.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 1110acfd0fd..4fd3254b2d2 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -799,6 +799,7 @@ static void init_locale(void) struct locale_nls_header *header; const NLS_LOCALE_HEADER *locale_table; const NLS_LOCALE_DATA *locale; + char *p; setlocale( LC_ALL, "" ); if (!unix_to_win_locale( setlocale( LC_CTYPE, NULL ), system_locale )) system_locale[0] = 0; @@ -863,10 +864,21 @@ static void init_locale(void) if ((header = read_nls_file( "locale.nls" ))) { locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); - if ((locale = get_win_locale( locale_table, system_locale )) && locale->idefaultlanguage != LOCALE_CUSTOM_UNSPECIFIED) + while (!(locale = get_win_locale( locale_table, system_locale ))) + { + if (!(p = strrchr( system_locale, '-' ))) break; + *p = 0; + } + if (locale && locale->idefaultlanguage != LOCALE_CUSTOM_UNSPECIFIED) system_lcid = locale->idefaultlanguage; - if ((locale = get_win_locale( locale_table, user_locale ))) - user_lcid = locale->idefaultlanguage; + + while (!(locale = get_win_locale( locale_table, user_locale ))) + { + if (!(p = strrchr( user_locale, '-' ))) break; + *p = 0; + } + if (locale) user_lcid = locale->idefaultlanguage; + free( header ); } if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT );

1 0

Jactry Zeng : ntdll: Initialize locale from Mac language identifiers with script name.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 730bdf6c5c0d35eabd2563cc65e3e4208e5a306f URL: https://gitlab.winehq.org/wine/wine/-/commit/730bdf6c5c0d35eabd2563cc65e3e4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:15 2023 +0100 ntdll: Initialize locale from Mac language identifiers with script name. --- dlls/ntdll/unix/env.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6b249917cfe..1110acfd0fd 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -833,6 +833,7 @@ static void init_locale(void) { CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); + CFStringRef script = CFDictionaryGetValue( components, kCFLocaleScriptCode ); CFLocaleRef mac_user_locale = NULL; CFStringRef locale_string; @@ -841,7 +842,11 @@ static void init_locale(void) mac_user_locale = CFLocaleCopyCurrent(); country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode ); } - if (country) + if (country && script) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@-%@"), lang, script, country ); + else if (script) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, script ); + else if (country) locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); else locale_string = CFStringCreateCopy( NULL, lang );

1 0

Jactry Zeng : ntdll: Use different variable names for Mac locales.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: c2f4619db9f0f018ea7a2ac1eba343763423dc4f URL: https://gitlab.winehq.org/wine/wine/-/commit/c2f4619db9f0f018ea7a2ac1eba343… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Nov 28 09:33:08 2023 +0100 ntdll: Use different variable names for Mac locales. --- dlls/ntdll/unix/env.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5a58911c759..6b249917cfe 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -807,9 +807,9 @@ static void init_locale(void) #ifdef __APPLE__ if (!system_locale[0]) { - CFLocaleRef locale = CFLocaleCopyCurrent(); - CFStringRef lang = CFLocaleGetValue( locale, kCFLocaleLanguageCode ); - CFStringRef country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + CFLocaleRef mac_sys_locale = CFLocaleCopyCurrent(); + CFStringRef lang = CFLocaleGetValue( mac_sys_locale, kCFLocaleLanguageCode ); + CFStringRef country = CFLocaleGetValue( mac_sys_locale, kCFLocaleCountryCode ); CFStringRef locale_string; if (country) @@ -818,7 +818,7 @@ static void init_locale(void) locale_string = CFStringCreateCopy(NULL, lang); CFStringGetCString(locale_string, system_locale, sizeof(system_locale), kCFStringEncodingUTF8); - CFRelease(locale); + CFRelease(mac_sys_locale); CFRelease(locale_string); } if (!user_locale[0]) @@ -833,13 +833,13 @@ static void init_locale(void) { CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); - CFLocaleRef locale = NULL; + CFLocaleRef mac_user_locale = NULL; CFStringRef locale_string; if (!country) { - locale = CFLocaleCopyCurrent(); - country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + mac_user_locale = CFLocaleCopyCurrent(); + country = CFLocaleGetValue( mac_user_locale, kCFLocaleCountryCode ); } if (country) locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); @@ -847,7 +847,7 @@ static void init_locale(void) locale_string = CFStringCreateCopy( NULL, lang ); CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); CFRelease( locale_string ); - if (locale) CFRelease( locale ); + if (mac_user_locale) CFRelease( mac_user_locale ); CFRelease( components ); } }

1 0

Alexandre Julliard : winegstreamer: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 29a2a7effda928ff209b942337212aac99f7a23a URL: https://gitlab.winehq.org/wine/wine/-/commit/29a2a7effda928ff209b942337212a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:56:17 2023 +0100 winegstreamer: Remove DECLSPEC_HIDDEN usage. --- dlls/winegstreamer/unix_private.h | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 5162c8d5863..f3c24311ac7 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -28,50 +28,50 @@ /* unixlib.c */ -GST_DEBUG_CATEGORY_EXTERN(wine) DECLSPEC_HIDDEN; +GST_DEBUG_CATEGORY_EXTERN(wine); #define GST_CAT_DEFAULT wine -extern NTSTATUS wg_init_gstreamer(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_init_gstreamer(void *args); -extern GstStreamType stream_type_from_caps(GstCaps *caps) DECLSPEC_HIDDEN; -extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; -GstElement *factory_create_element(GstElementFactory *factory) DECLSPEC_HIDDEN; +extern GstStreamType stream_type_from_caps(GstCaps *caps); +extern GstElement *create_element(const char *name, const char *plugin_set); +GstElement *factory_create_element(GstElementFactory *factory); extern GList *find_element_factories(GstElementFactoryListType type, GstRank min_rank, - GstCaps *element_sink_caps, GstCaps *element_src_caps) DECLSPEC_HIDDEN; + GstCaps *element_sink_caps, GstCaps *element_src_caps); extern GstElement *find_element(GstElementFactoryListType type, - GstCaps *element_sink_caps, GstCaps *element_src_caps) DECLSPEC_HIDDEN; -extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) DECLSPEC_HIDDEN; -extern bool link_src_to_sink(GstPad *src_pad, GstPad *sink_pad) DECLSPEC_HIDDEN; -extern bool link_src_to_element(GstPad *src_pad, GstElement *element) DECLSPEC_HIDDEN; -extern bool link_element_to_sink(GstElement *element, GstPad *sink_pad) DECLSPEC_HIDDEN; -extern bool push_event(GstPad *pad, GstEvent *event) DECLSPEC_HIDDEN; + GstCaps *element_sink_caps, GstCaps *element_src_caps); +extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last); +extern bool link_src_to_sink(GstPad *src_pad, GstPad *sink_pad); +extern bool link_src_to_element(GstPad *src_pad, GstElement *element); +extern bool link_element_to_sink(GstElement *element, GstPad *sink_pad); +extern bool push_event(GstPad *pad, GstEvent *event); /* wg_format.c */ -extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) DECLSPEC_HIDDEN; -extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) DECLSPEC_HIDDEN; -extern GstCaps *wg_format_to_caps(const struct wg_format *format) DECLSPEC_HIDDEN; +extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps); +extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b); +extern GstCaps *wg_format_to_caps(const struct wg_format *format); /* wg_transform.c */ -extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_set_output_format(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_push_data(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_read_data(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_get_status(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_drain(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_transform_flush(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_create(void *args); +extern NTSTATUS wg_transform_destroy(void *args); +extern NTSTATUS wg_transform_set_output_format(void *args); +extern NTSTATUS wg_transform_push_data(void *args); +extern NTSTATUS wg_transform_read_data(void *args); +extern NTSTATUS wg_transform_get_status(void *args); +extern NTSTATUS wg_transform_drain(void *args); +extern NTSTATUS wg_transform_flush(void *args); /* wg_muxer.c */ -extern NTSTATUS wg_muxer_create(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_destroy(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_add_stream(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_start(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_push_sample(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_read_data(void *args) DECLSPEC_HIDDEN; -extern NTSTATUS wg_muxer_finalize(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_muxer_create(void *args); +extern NTSTATUS wg_muxer_destroy(void *args); +extern NTSTATUS wg_muxer_add_stream(void *args); +extern NTSTATUS wg_muxer_start(void *args); +extern NTSTATUS wg_muxer_push_sample(void *args); +extern NTSTATUS wg_muxer_read_data(void *args); +extern NTSTATUS wg_muxer_finalize(void *args); /* wg_allocator.c */ @@ -82,10 +82,10 @@ static inline BYTE *wg_sample_data(struct wg_sample *sample) /* wg_allocator_release_sample can be used to release any sample that was requested. */ typedef struct wg_sample *(*wg_allocator_request_sample_cb)(gsize size, void *context); -extern GstAllocator *wg_allocator_create(void) DECLSPEC_HIDDEN; -extern void wg_allocator_destroy(GstAllocator *allocator) DECLSPEC_HIDDEN; -extern void wg_allocator_provide_sample(GstAllocator *allocator, struct wg_sample *sample) DECLSPEC_HIDDEN; +extern GstAllocator *wg_allocator_create(void); +extern void wg_allocator_destroy(GstAllocator *allocator); +extern void wg_allocator_provide_sample(GstAllocator *allocator, struct wg_sample *sample); extern void wg_allocator_release_sample(GstAllocator *allocator, struct wg_sample *sample, - bool discard_data) DECLSPEC_HIDDEN; + bool discard_data); #endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */

1 0

Alexandre Julliard : wined3d: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 8f5aa334dac0118905c45b84ab95661887a689fa URL: https://gitlab.winehq.org/wine/wine/-/commit/8f5aa334dac0118905c45b84ab9566… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:54:12 2023 +0100 wined3d: Remove DECLSPEC_HIDDEN usage. --- dlls/wined3d/wined3d_private.h | 600 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_vk.h | 158 +++++------ 2 files changed, 379 insertions(+), 379 deletions(-)

1 0

Alexandre Julliard : opencl: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 9b2353c3b3d6d40ed0f4986ee8f1db99a20ee1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b2353c3b3d6d40ed0f4986ee8f1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:53:07 2023 +0100 opencl: Remove DECLSPEC_HIDDEN usage. --- dlls/opencl/opencl_private.h | 2 +- dlls/opencl/unix_private.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opencl/opencl_private.h b/dlls/opencl/opencl_private.h index 28968296221..aabfe70cea3 100644 --- a/dlls/opencl/opencl_private.h +++ b/dlls/opencl/opencl_private.h @@ -31,7 +31,7 @@ #include "wine/unixlib.h" #include "wine/debug.h" -BOOL extension_is_supported( const char *name, size_t len ) DECLSPEC_HIDDEN; +BOOL extension_is_supported( const char *name, size_t len ); #define OPENCL_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/opencl/unix_private.h b/dlls/opencl/unix_private.h index 4344c69f0b0..49ac2102dfc 100644 --- a/dlls/opencl/unix_private.h +++ b/dlls/opencl/unix_private.h @@ -44,13 +44,13 @@ #include "unixlib.h" -NTSTATUS wrap_clBuildProgram( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCreateContext( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCreateContextFromType( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clEnqueueNativeKernel( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clSetEventCallback( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clSetMemObjectDestructorCallback( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clCompileProgram( void *args ) DECLSPEC_HIDDEN; -NTSTATUS wrap_clLinkProgram( void *args ) DECLSPEC_HIDDEN; +NTSTATUS wrap_clBuildProgram( void *args ); +NTSTATUS wrap_clCreateContext( void *args ); +NTSTATUS wrap_clCreateContextFromType( void *args ); +NTSTATUS wrap_clEnqueueNativeKernel( void *args ); +NTSTATUS wrap_clSetEventCallback( void *args ); +NTSTATUS wrap_clSetMemObjectDestructorCallback( void *args ); +NTSTATUS wrap_clCompileProgram( void *args ); +NTSTATUS wrap_clLinkProgram( void *args ); #endif

1 0

Alexandre Julliard : mscoree: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 9a14c4a65b0cb19675e30c719500f1aefdf3c4a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a14c4a65b0cb19675e30c719500f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:52:56 2023 +0100 mscoree: Remove DECLSPEC_HIDDEN usage. --- dlls/mscoree/mscoree_private.h | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-)

1 0

Alexandre Julliard : dwrite: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: b70154a549b8c68dfce7255f3e81fffdcdb43b78 URL: https://gitlab.winehq.org/wine/wine/-/commit/b70154a549b8c68dfce7255f3e81ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 21:52:37 2023 +0100 dwrite: Remove DECLSPEC_HIDDEN usage. --- dlls/dwrite/analyzer.c | 6 +- dlls/dwrite/bidi.c | 4 +- dlls/dwrite/dwrite_private.h | 240 +++++++++++++++++++++---------------------- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/shapers/arabic.c | 2 +- 5 files changed, 127 insertions(+), 127 deletions(-)

1 0

Marc-Aurel Zent : server: Add cross-platform get_path_from_fd function.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: 7b1fe26bb0371b017600e24c201c6d047de5b451 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b1fe26bb0371b017600e24c201c6d… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Thu Oct 5 14:03:54 2023 +0200 server: Add cross-platform get_path_from_fd function. --- server/change.c | 101 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/server/change.c b/server/change.c index 7a806abc017..00d286ede7a 100644 --- a/server/change.c +++ b/server/change.c @@ -721,6 +721,25 @@ static unsigned int filter_from_inode( struct inode *inode, int is_parent ) return filter; } +static char *get_path_from_fd( int fd, int sz ) +{ +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + char *ret = malloc( PATH_MAX + sz ); + + if (!ret) return NULL; + if (!fcntl( fd, F_GETPATH, ret )) return ret; + free( ret ); + return NULL; +#elif defined(linux) + char *ret = malloc( 32 + sz ); + + if (ret) sprintf( ret, "/proc/self/fd/%u", fd ); + return ret; +#else + return NULL; +#endif +} + static char *inode_get_path( struct inode *inode, int sz ) { struct list *head; @@ -734,9 +753,8 @@ static char *inode_get_path( struct inode *inode, int sz ) if (head) { int unix_fd = get_unix_fd( LIST_ENTRY( head, struct dir, in_entry )->fd ); - path = malloc ( 32 + sz ); - if (path) - sprintf( path, "/proc/self/fd/%u/", unix_fd ); + if (!(path = get_path_from_fd( unix_fd, sz + 1 ))) return NULL; + strcat( path, "/" ); return path; } @@ -747,7 +765,7 @@ static char *inode_get_path( struct inode *inode, int sz ) path = inode_get_path( inode->parent, sz + len + 1 ); if (!path) return NULL; - + strcat( path, inode->name ); strcat( path, "/" ); @@ -964,7 +982,7 @@ static int inotify_adjust_changes( struct dir *dir ) unsigned int filter; struct inode *inode; struct stat st; - char path[32]; + char *path; int wd, unix_fd; if (!inotify_fd) @@ -990,8 +1008,9 @@ static int inotify_adjust_changes( struct dir *dir ) filter = filter_from_inode( inode, 0 ); - sprintf( path, "/proc/self/fd/%u", unix_fd ); + if (!(path = get_path_from_fd( unix_fd, 0 ))) return 0; wd = inotify_add_dir( path, filter ); + free( path ); if (wd == -1) return 0; inode_set_wd( inode, wd ); @@ -1037,30 +1056,29 @@ static char *get_basename( const char *link ) return name; } -static int dir_add_to_existing_notify( struct dir *dir ) +static void dir_add_to_existing_notify( struct dir *dir ) { struct inode *inode, *parent; unsigned int filter = 0; struct stat st, st_new; - char link[35], *name; - int wd, unix_fd; + char *link, *name; + int res, wd, unix_fd; if (!inotify_fd) - return 0; + return; unix_fd = get_unix_fd( dir->fd ); /* check if it's in the list of inodes we want to watch */ - if (-1 == fstat( unix_fd, &st_new )) - return 0; - inode = find_inode( st_new.st_dev, st_new.st_ino ); - if (inode) - return 0; + if (fstat( unix_fd, &st_new )) return; + if ((inode = find_inode( st_new.st_dev, st_new.st_ino ))) return; /* lookup the parent */ - sprintf( link, "/proc/self/fd/%u/..", unix_fd ); - if (-1 == stat( link, &st )) - return 0; + if (!(link = get_path_from_fd( unix_fd, 3 ))) return; + strcat( link, "/.." ); + res = stat( link, &st ); + free( link ); + if (res == -1) return; /* * If there's no parent, stop. We could keep going adding @@ -1068,34 +1086,28 @@ static int dir_add_to_existing_notify( struct dir *dir ) * find a recursively watched ancestor. * Assume it's too expensive to search up the tree for now. */ - parent = find_inode( st.st_dev, st.st_ino ); - if (!parent) - return 0; + if (!(parent = find_inode( st.st_dev, st.st_ino ))) return; + if (parent->wd == -1) return; - if (parent->wd == -1) - return 0; - - filter = filter_from_inode( parent, 1 ); - if (!filter) - return 0; - - sprintf( link, "/proc/self/fd/%u", unix_fd ); - name = get_basename( link ); - if (!name) - return 0; + if (!(filter = filter_from_inode( parent, 1 ))) return; + if (!(link = get_path_from_fd( unix_fd, 0 ))) return; + if (!(name = get_basename( link ))) + { + free( link ); + return; + } inode = inode_add( parent, st_new.st_dev, st_new.st_ino, name ); - free( name ); - if (!inode) - return 0; - - /* Couldn't find this inode at the start of the function, must be new */ - assert( inode->wd == -1 ); - - wd = inotify_add_dir( link, filter ); - if (wd != -1) - inode_set_wd( inode, wd ); + if (inode) + { + /* Couldn't find this inode at the start of the function, must be new */ + assert( inode->wd == -1 ); - return 1; + wd = inotify_add_dir( link, filter ); + if (wd != -1) + inode_set_wd( inode, wd ); + } + free( name ); + free( link ); } #else @@ -1115,9 +1127,8 @@ static void free_inode( struct inode *inode ) assert( 0 ); } -static int dir_add_to_existing_notify( struct dir *dir ) +static void dir_add_to_existing_notify( struct dir *dir ) { - return 0; } #endif /* HAVE_SYS_INOTIFY_H */

1 0

Rémi Bernon : wineboot: Compute and write the TSC frequency to registry ~Mhz.
by Alexandre Julliard 28 Nov '23

28 Nov '23

Module: wine Branch: master Commit: f2371a8b47cebdc497ec1c4e3d292c0de16df8cd URL: https://gitlab.winehq.org/wine/wine/-/commit/f2371a8b47cebdc497ec1c4e3d292c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 16 08:13:34 2023 +0100 wineboot: Compute and write the TSC frequency to registry ~Mhz. In HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor Some games such as Horizon Zero Dawn use this registry value to correlate values from rtdsc to real time. Returning the nominal/maximum cpu frequency here causes the game to run in slow motion as it may not match the tsc frequency of the processor. Based on patches from Arkadiusz Hiler and Joshua Ashton. --- programs/wineboot/wineboot.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 728c41fffa9..58fa6939a9a 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -240,12 +240,120 @@ static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) TRACE("XSAVE feature 2 %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); } +static BOOL is_tsc_trusted_by_the_kernel(void) +{ + char buf[4] = {0}; + DWORD num_read; + HANDLE handle; + BOOL ret = TRUE; + + /* Darwin for x86-64 uses the TSC internally for timekeeping, so it can always + * be trusted. + * For BSDs there seems to be no unified interface to query TSC quality. + * If there is a sysfs entry with clocksource information, use it to check though. */ + handle = CreateFileW( L"\\??\\unix\\sys\\bus\\clocksource\\devices\\clocksource0\\current_clocksource", + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return TRUE; + + if (ReadFile( handle, buf, sizeof(buf) - 1, &num_read, NULL ) && strcmp( "tsc", buf )) + ret = FALSE; + + CloseHandle( handle ); + return ret; +} + +static UINT64 read_tsc_frequency(void) +{ + UINT64 freq = 0; + LONGLONG time0, time1, tsc0, tsc1, tsc2, tsc3, freq0, freq1, error; + BOOL has_rdtscp = FALSE; + unsigned int aux; + UINT retries = 50; + int regs[4]; + + if (!is_tsc_trusted_by_the_kernel()) + { + WARN( "Failed to compute TSC frequency, not trusted by the kernel.\n" ); + return 0; + } + + __cpuid(regs, 1); + if (!(regs[3] & (1 << 4))) + { + WARN( "Failed to compute TSC frequency, RDTSC instruction not supported.\n" ); + return 0; + } + + __cpuid( regs, 0x80000000 ); + if (regs[0] < 0x80000007) + { + WARN( "Failed to compute TSC frequency, unable to check invariant TSC.\n" ); + return 0; + } + + /* check for invariant tsc bit */ + __cpuid( regs, 0x80000007 ); + if (!(regs[3] & (1 << 8))) + { + WARN( "Failed to compute TSC frequency, no invariant TSC.\n" ); + return 0; + } + + /* check for rdtscp support bit */ + __cpuid( regs, 0x80000001 ); + if ((regs[3] & (1 << 27))) has_rdtscp = TRUE; + + do + { + if (has_rdtscp) + { + tsc0 = __rdtscp( &aux ); + time0 = RtlGetSystemTimePrecise(); + tsc1 = __rdtscp( &aux ); + Sleep( 1 ); + tsc2 = __rdtscp( &aux ); + time1 = RtlGetSystemTimePrecise(); + tsc3 = __rdtscp( &aux ); + } + else + { + tsc0 = __rdtsc(); __cpuid( regs, 0 ); + time0 = RtlGetSystemTimePrecise(); + tsc1 = __rdtsc(); __cpuid( regs, 0 ); + Sleep( 1 ); + tsc2 = __rdtsc(); __cpuid( regs, 0 ); + time1 = RtlGetSystemTimePrecise(); + tsc3 = __rdtsc(); __cpuid( regs, 0 ); + } + + freq0 = (tsc2 - tsc0) * 10000000 / (time1 - time0); + freq1 = (tsc3 - tsc1) * 10000000 / (time1 - time0); + error = llabs( (freq1 - freq0) * 1000000 / min( freq1, freq0 ) ); + } + while (error > 500 && --retries); + + if (!retries) WARN( "TSC frequency calibration failed, unstable TSC?\n" ); + else + { + freq = (freq0 + freq1) / 2; + TRACE( "TSC frequency calibration complete, found %I64u Hz\n", freq ); + } + + return freq; +} + #else static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) { } +static UINT64 read_tsc_frequency(void) +{ + FIXME( "TSC frequency calibration not implemented\n" ); + return 0; +} + #endif static void create_user_shared_data(void) @@ -666,6 +774,7 @@ static void create_hardware_registry_keys(void) SYSTEM_CPU_INFORMATION sci; PROCESSOR_POWER_INFORMATION* power_info; ULONG sizeof_power_info = sizeof(PROCESSOR_POWER_INFORMATION) * NtCurrentTeb()->Peb->NumberOfProcessors; + UINT64 tsc_frequency = read_tsc_frequency(); ULONG name_buffer[16]; WCHAR id[60], vendorid[13]; @@ -736,13 +845,16 @@ static void create_hardware_registry_keys(void) if (!RegCreateKeyExW( cpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { + DWORD tsc_freq_mhz = (DWORD)(tsc_frequency / 1000000ull); /* Hz -> Mhz */ + if (!tsc_freq_mhz) tsc_freq_mhz = power_info[i].MaxMhz; + RegSetValueExW( hkey, L"FeatureSet", 0, REG_DWORD, (BYTE *)&sci.ProcessorFeatureBits, sizeof(DWORD) ); set_reg_value( hkey, L"Identifier", id ); /* TODO: report ARM properly */ RegSetValueExA( hkey, "ProcessorNameString", 0, REG_SZ, (const BYTE *)name_buffer, strlen( (char *)name_buffer ) + 1 ); set_reg_value( hkey, L"VendorIdentifier", vendorid ); - RegSetValueExW( hkey, L"~MHz", 0, REG_DWORD, (BYTE *)&power_info[i].MaxMhz, sizeof(DWORD) ); + RegSetValueExW( hkey, L"~MHz", 0, REG_DWORD, (BYTE *)&tsc_freq_mhz, sizeof(DWORD) ); RegCloseKey( hkey ); } if (sci.ProcessorArchitecture != PROCESSOR_ARCHITECTURE_ARM &&

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2023