- Wine-Commits - list.winehq.org

Alexandre Julliard : mscoree: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

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

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

Nov. 28, 2023

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

Louis Lenders : shell32: Add stub for SHCreateItemWithParent.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 44cbc8ef8462a4556c110b350b2d8e78d21181a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/44cbc8ef8462a4556c110b350b2d8e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Nov 26 22:12:42 2023 +0100 shell32: Add stub for SHCreateItemWithParent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55851 --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 2c969869722..60bd63ab7a8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -349,6 +349,7 @@ @ stdcall SHCreateItemFromParsingName(wstr ptr ptr ptr) @ stdcall SHCreateItemInKnownFolder(ptr long wstr ptr ptr) @ stdcall SHCreateItemFromRelativeName(ptr wstr ptr ptr ptr) +@ stdcall SHCreateItemWithParent(ptr ptr ptr ptr ptr) @ stub SHCreateProcessAsUserW @ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) @ stdcall SHCreateShellItem(ptr ptr ptr ptr) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 6f8f52469fc..d8720734e22 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -769,6 +769,14 @@ HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void return ret; } +HRESULT WINAPI SHCreateItemWithParent(PCIDLIST_ABSOLUTE pidl_parent, IShellFolder *psf, + PCUITEMID_CHILD pidl, REFIID riid, void **ppv) +{ + FIXME("(%p, %p, %p, %s, %p)\n", pidl_parent, psf, pidl, debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} + HRESULT WINAPI SHCreateItemInKnownFolder(REFKNOWNFOLDERID rfid, DWORD flags, PCWSTR filename, REFIID riid, void **ppv) {

1 0

Alexandre Julliard : winegstreamer: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

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 : dwrite: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

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

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

Nov. 28, 2023

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

Alexandre Julliard : wined3d: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

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

Eric Pouech : uninstall: No longer use console/file output APIs.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 8e00767fb441c90240129b40798aecb1941514d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e00767fb441c90240129b40798aec… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 28 18:49:41 2023 +0100 uninstall: No longer use console/file output APIs. Regular GUI apps don't. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/uninstaller/main.c | 101 ++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 59 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 52e8a0debe9..8a22cc7288c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -21,6 +21,7 @@ * */ +#include <locale.h> #include <string.h> #include <windows.h> #include <commctrl.h> @@ -44,70 +45,48 @@ static uninst_entry *entries = NULL; static unsigned int numentries = 0; static int oldsel = -1; static WCHAR *sFilter; +static BOOL silent; static int FetchUninstallInformation(void); static void UninstallProgram(void); static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; -static void output_writeconsole(const WCHAR *str, DWORD len) -{ - DWORD written, lenA; - char *strA; - - if (WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &written, NULL)) - return; - - /* WriteConsole fails if its output is redirected to a file. - * If this occurs, we should use an OEM codepage and call WriteFile. - */ - lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); - strA = malloc(lenA); - if (strA) - { - WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &written, FALSE); - free(strA); - } -} -static void output_formatstring(const WCHAR *fmt, va_list va_args) +static void WINAPIV output_message(BOOL with_usage, unsigned int id, ...) { - WCHAR *str; - DWORD len; + WCHAR fmt[2048]; + LCID current_lcid; - len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, - fmt, 0, 0, (LPWSTR)&str, 0, &va_args); - if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - { - WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); - return; - } - output_writeconsole(str, len); - LocalFree(str); -} - -static void WINAPIV output_message(unsigned int id, ...) -{ - WCHAR fmt[1024]; - va_list va_args; + current_lcid = GetThreadLocale(); + if (silent) /* force en-US not to have localized strings */ + SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) + if (LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt)) && + (!with_usage || LoadStringW(GetModuleHandleW(NULL), STRING_USAGE, fmt + wcslen(fmt), ARRAY_SIZE(fmt) - wcslen(fmt)))) { - WINE_FIXME("LoadString failed with %ld\n", GetLastError()); - return; + va_list va_args; + WCHAR *str; + DWORD len; + + va_start(va_args, id); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (LPWSTR)&str, 0, &va_args); + if (len > 0 || GetLastError() == ERROR_NO_WORK_DONE) + { + if (silent) + MESSAGE("%ls", str); + else + MessageBoxW(NULL, str, MAKEINTRESOURCEW(IDS_APPNAME), MB_OK | MB_ICONSTOP); + LocalFree(str); + } + else + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + va_end(va_args); } - va_start(va_args, id); - output_formatstring(fmt, va_args); - va_end(va_args); -} - -static void WINAPIV output_array(const WCHAR *fmt, ...) -{ - va_list va_args; + else + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); - va_start(va_args, fmt); - output_formatstring(fmt, va_args); - va_end(va_args); + SetThreadLocale(current_lcid); } /** @@ -119,8 +98,9 @@ static void ListUninstallPrograms(void) FetchUninstallInformation(); + setlocale(LC_ALL, "en-US"); for (i=0; i < numentries; i++) - output_array(L"%1|||%2\n", entries[i].key, entries[i].descr); + MESSAGE("%ls|||%ls\n", entries[i].key, entries[i].descr); } @@ -142,7 +122,7 @@ static void RemoveSpecificProgram(WCHAR *nameW) if (i < numentries) UninstallProgram(); else - output_message(STRING_NO_APP_MATCH, nameW); + output_message(FALSE, STRING_NO_APP_MATCH, nameW); } @@ -185,10 +165,13 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if( !lstrcmpW( token, L"--help" ) ) { - output_message(STRING_HEADER); - output_message(STRING_USAGE); + output_message(TRUE, STRING_HEADER); return 0; } + else if( !lstrcmpW( token, L"--silent" ) ) + { + silent = TRUE; + } else if( !lstrcmpW( token, L"--list" ) ) { ListUninstallPrograms(); @@ -198,16 +181,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { if( i >= argc ) { - output_message(STRING_PARAMETER_REQUIRED); + output_message(FALSE, STRING_PARAMETER_REQUIRED); return 1; } RemoveSpecificProgram( argv[i++] ); return 0; } - else + else { - output_message(STRING_INVALID_OPTION, token); + output_message(FALSE, STRING_INVALID_OPTION, token); return 1; } }

1 0

Eric Pouech : ntdll: Return NULL in RtlFindExportedRoutine for forwarded entries.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: 6a4dca0e5ba2c3ad17fd8ac78f0eabd2b0f09726 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4dca0e5ba2c3ad17fd8ac78f0eab… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 28 18:51:10 2023 +0100 ntdll: Return NULL in RtlFindExportedRoutine for forwarded entries. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/ntdll/loader.c | 8 +++++++- dlls/ntdll/tests/rtl.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index df8324e0b6b..a3de8791498 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1066,6 +1066,7 @@ void * WINAPI RtlFindExportedRoutineByName( HMODULE module, const char *name ) const DWORD *functions; DWORD exp_size; int ordinal; + void *proc; exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); if (!exports || exp_size < sizeof(*exports)) return NULL; @@ -1074,7 +1075,12 @@ void * WINAPI RtlFindExportedRoutineByName( HMODULE module, const char *name ) if (ordinal >= exports->NumberOfFunctions) return NULL; functions = get_rva( module, exports->AddressOfFunctions ); if (!functions[ordinal]) return NULL; - return get_rva( module, functions[ordinal] ); + proc = get_rva( module, functions[ordinal] ); + /* if the address falls into the export dir, it's a forward */ + if (((const char *)proc >= (const char *)exports) && + ((const char *)proc < (const char *)exports + exp_size)) + return NULL; + return proc; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 88f62b0b588..442ad729540 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -95,6 +95,7 @@ static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExW)(PCWSTR, struct in6_addr *, static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); +static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); @@ -137,6 +138,7 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); + pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); @@ -3651,6 +3653,21 @@ static void test_RtlValidSecurityDescriptor(void) free(sd); } +static void test_RtlFindExportedRoutineByName(void) +{ + void *proc; + + if (!pRtlFindExportedRoutineByName) + { + win_skip( "RtlFindExportedRoutineByName is not present\n" ); + return; + } + proc = pRtlFindExportedRoutineByName( GetModuleHandleW( L"kernelbase" ), "CtrlRoutine" ); + ok( proc != NULL, "Expected non NULL address\n" ); + proc = pRtlFindExportedRoutineByName( GetModuleHandleW( L"kernel32" ), "CtrlRoutine" ); + ok( proc == NULL, "Shouldn't find forwarded function\n" ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3697,4 +3714,5 @@ START_TEST(rtl) test_RtlFirstFreeAce(); test_RtlInitializeSid(); test_RtlValidSecurityDescriptor(); + test_RtlFindExportedRoutineByName(); }

1 0

Eric Pouech : msiexec: No longer use console/file output APIs.
by Alexandre Julliard Nov. 28, 2023

Nov. 28, 2023

Module: wine Branch: master Commit: e048f71ecbb103ae7c1876092cb8244b24a73cb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e048f71ecbb103ae7c1876092cb824… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 28 09:19:16 2023 +0100 msiexec: No longer use console/file output APIs. Regular GUI apps don't. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/msiexec/msiexec.c | 55 ++++++++++++++++++++++++------------- programs/msiexec/msiexec_internal.h | 27 ++++++++++++++++++ programs/msiexec/service.c | 14 +++++----- 3 files changed, 70 insertions(+), 26 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 4770dfe4a02..68b7c938097 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -26,9 +26,9 @@ #include <msi.h> #include <winsvc.h> #include <objbase.h> -#include <stdio.h> #include "wine/debug.h" +#include "msiexec_internal.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -39,6 +39,7 @@ typedef HRESULT (WINAPI *DLLREGISTERSERVER)(void); typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void); DWORD DoService(void); +static BOOL silent; struct string_list { @@ -46,6 +47,21 @@ struct string_list WCHAR str[1]; }; +void report_error(const char* msg, ...) +{ + char buffer[2048]; + va_list va_args; + + va_start(va_args, msg); + vsnprintf(buffer, sizeof(buffer), msg, va_args); + va_end(va_args); + + if (silent) + MESSAGE("%s", buffer); + else + MsiMessageBoxA(NULL, buffer, "MsiExec", 0, GetUserDefaultLangID(), 0); +} + static void ShowUsage(int ExitCode) { WCHAR msiexec_version[40]; @@ -269,14 +285,14 @@ static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) *DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName)); + report_error("Unable to load dll %s\n", wine_dbgstr_w(DllName)); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, ProcName); if(!proc) { - fprintf(stderr, "Dll %s does not implement function %s\n", - wine_dbgstr_w(DllName), ProcName); + report_error("Dll %s does not implement function %s\n", + wine_dbgstr_w(DllName), ProcName); FreeLibrary(*DllHandle); ExitProcess(1); } @@ -295,10 +311,10 @@ static DWORD DoDllRegisterServer(LPCWSTR DllName) hr = pfDllRegisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName)); + report_error("Failed to register dll %s\n", wine_dbgstr_w(DllName)); return 1; } - printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); + MESSAGE("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -315,10 +331,10 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) hr = pfDllUnregisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); + report_error("Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); return 1; } - printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); + MESSAGE("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -332,7 +348,7 @@ static DWORD DoRegServer(void) if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CREATE_SERVICE))) { - fprintf(stderr, "Failed to open the service control manager.\n"); + report_error("Failed to open the service control manager.\n"); return 1; } len = GetSystemDirectoryW(path, MAX_PATH); @@ -345,7 +361,7 @@ static DWORD DoRegServer(void) } else if (GetLastError() != ERROR_SERVICE_EXISTS) { - fprintf(stderr, "Failed to create MSI service\n"); + report_error("Failed to create MSI service\n"); ret = 1; } CloseServiceHandle(scm); @@ -359,21 +375,21 @@ static DWORD DoUnregServer(void) if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CONNECT))) { - fprintf(stderr, "Failed to open service control manager\n"); + report_error("Failed to open service control manager\n"); return 1; } if ((service = OpenServiceW(scm, L"MSIServer", DELETE))) { if (!DeleteService(service)) { - fprintf(stderr, "Failed to delete MSI service\n"); + report_error("Failed to delete MSI service\n"); ret = 1; } CloseServiceHandle(service); } else if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) { - fprintf(stderr, "Failed to open MSI service\n"); + report_error("Failed to open MSI service\n"); ret = 1; } CloseServiceHandle(scm); @@ -765,7 +781,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine RepairMode |= REINSTALLMODE_PACKAGE; break; default: - fprintf(stderr, "Unknown option \"%c\" in Repair mode\n", argvW[i][j]); + report_error("Unknown option \"%c\" in Repair mode\n", argvW[i][j]); break; } } @@ -815,7 +831,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; break; default: - fprintf(stderr, "Unknown option \"%c\" in Advertise mode\n", argvW[i][j]); + report_error("Unknown option \"%c\" in Advertise mode\n", argvW[i][j]); break; } } @@ -947,8 +963,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine LogFileName = argvW[i]; if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", - wine_dbgstr_w(LogFileName), LogMode, LogAttributes); + report_error("Logging in %s (0x%08lx, %lu) failed\n", + wine_dbgstr_w(LogFileName), LogMode, LogAttributes); ExitProcess(1); } } @@ -966,6 +982,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n") || msi_strequal(argvW[i] + 2, "uiet")) { + silent = TRUE; InstallUILevel = INSTALLUILEVEL_NONE; } else if(msi_strequal(argvW[i]+2, "r")) @@ -1002,8 +1019,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else { - fprintf(stderr, "Unknown option \"%s\" for UI level\n", - wine_dbgstr_w(argvW[i]+2)); + report_error("Unknown option \"%s\" for UI level\n", + wine_dbgstr_w(argvW[i]+2)); } } else if(msi_option_equal(argvW[i], "passive")) diff --git a/programs/msiexec/msiexec_internal.h b/programs/msiexec/msiexec_internal.h new file mode 100644 index 00000000000..258ee5a106c --- /dev/null +++ b/programs/msiexec/msiexec_internal.h @@ -0,0 +1,27 @@ +/* + * msiexec.exe internal definitions + * + * Copyright 2023 Eric Pouech for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <corecrt.h> + +#ifdef __WINE_CRT_PRINTF_ATTR +extern void report_error(const char* msg, ...) __WINE_CRT_PRINTF_ATTR(1, 2); +#else +extern void report_error(const char* msg, ...); +#endif diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 573b3782473..ee81da1bfcd 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -20,11 +20,11 @@ #define WIN32_LEAN_AND_MEAN -#include <stdio.h> #include <windows.h> #include <winsvc.h> #include "wine/debug.h" +#include "msiexec_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msiexec); @@ -73,7 +73,7 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, if (!SetServiceStatus(hstatus, &status)) { - fprintf(stderr, "Failed to set service status\n"); + report_error("Failed to set service status\n"); KillService(); return FALSE; } @@ -93,7 +93,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) KillService(); break; default: - fprintf(stderr, "Unhandled service control code: %ld\n", code); + report_error("Unhandled service control code: %ld\n", code); UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; } @@ -113,7 +113,7 @@ static BOOL StartServiceThread(void) thread = CreateThread(0, 0, ServiceExecutionThread, 0, 0, &id); if (!thread) { - fprintf(stderr, "Failed to create thread\n"); + report_error("Failed to create thread\n"); return FALSE; } @@ -125,7 +125,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) hstatus = RegisterServiceCtrlHandlerA("MSIServer", ServiceCtrlHandler); if (!hstatus) { - fprintf(stderr, "Failed to register service ctrl handler\n"); + report_error("Failed to register service ctrl handler\n"); return; } @@ -134,7 +134,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) kill_event = CreateEventW(0, TRUE, FALSE, 0); if (!kill_event) { - fprintf(stderr, "Failed to create event\n"); + report_error("Failed to create event\n"); KillService(); UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; @@ -166,7 +166,7 @@ DWORD DoService(void) if (!StartServiceCtrlDispatcherA(service)) { - fprintf(stderr, "Failed to start MSIServer service\n"); + report_error("Failed to start MSIServer service\n"); return 1; }

1 0