wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Alexandre Julliard : makefiles: Add a helper to split large file remove commands.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: fcc0e7621575caed5844b80074a7884805ae0cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc0e7621575caed5844b800… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 21:18:38 2018 +0100 makefiles: Add a helper to split large file remove commands. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8cd3559..779d60a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -498,6 +498,31 @@ static void output_filenames( struct strarray array ) /******************************************************************* + * output_rm_filenames + */ +static void output_rm_filenames( struct strarray array ) +{ + static const unsigned int max_cmdline = 30000; /* to be on the safe side */ + unsigned int i, len; + + if (!array.count) return; + output( "\trm -f" ); + for (i = len = 0; i < array.count; i++) + { + if (len > max_cmdline) + { + output( "\n" ); + output( "\trm -f" ); + len = 0; + } + output_filename( array.str[i] ); + len += strlen( array.str[i] ) + 1; + } + output( "\n" ); +} + + +/******************************************************************* * get_extension */ static char *get_extension( char *filename ) @@ -3323,9 +3348,7 @@ static void output_subdirs( struct makefile *make ) output_filenames( makefile_deps ); output( ":\n" ); output( "distclean::\n"); - output( "\trm -f" ); - output_filenames( distclean_files ); - output( "\n" ); + output_rm_filenames( distclean_files ); strarray_add( &make->phony_targets, "distclean" ); if (build_deps.count)

1 0

Alexandre Julliard : makefiles: Generate rules for installing l_intl.nls and wine.desktop.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 1a49f2e044b525c40a27af63d653a9631af0c80f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a49f2e044b525c40a27af63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 20:57:15 2018 +0100 makefiles: Generate rules for installing l_intl.nls and wine.desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++------------ configure.ac | 15 ++------------- loader/Makefile.in | 14 ++++++-------- tools/make_makefiles | 2 +- tools/makedep.c | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/configure b/configure index ff10f67..74935d8 100755 --- a/configure +++ b/configure @@ -19463,20 +19463,11 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else - WINELOADER_INSTALL="wine.inf" - - wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall" + WINELOADER_INSTALL="wine.inf l_intl.nls" + case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/configure.ac b/configure.ac index d06476e..41a020b 100644 --- a/configure.ac +++ b/configure.ac @@ -3957,21 +3957,10 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else - AC_SUBST(WINELOADER_INSTALL,"wine.inf") - WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall]) + AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/loader/Makefile.in b/loader/Makefile.in index 4fb91ff..b1eafd1 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,15 +1,13 @@ -C_SRCS = \ +SOURCES = \ + l_intl.nls \ main.c \ - preloader.c - -MANPAGES = \ + preloader.c \ wine.de.UTF-8.man.in \ + wine.desktop \ wine.fr.UTF-8.man.in \ - wine.man.in \ - wine.pl.UTF-8.man.in - -IN_SRCS = \ wine.inf.in \ + wine.man.in \ + wine.pl.UTF-8.man.in \ wine_info.plist.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/tools/make_makefiles b/tools/make_makefiles index 0cf2344..df41356 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -435,7 +435,7 @@ sub assign_sources_to_makefiles(@) { next unless defined ${$make}{"TESTDLL"}; } - else + elsif ($dir ne "loader") # loader dir contains misc files { next; } diff --git a/tools/makedep.c b/tools/makedep.c index 0083661..8cd3559 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2636,6 +2636,26 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, /******************************************************************* + * output_source_nls + */ +static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/wine/%s", source->name )); +} + + +/******************************************************************* + * output_source_desktop + */ +static void output_source_desktop( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/applications/%s", source->name )); +} + + +/******************************************************************* * output_source_po */ static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj ) @@ -2843,6 +2863,8 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "nls", output_source_nls }, + { "desktop", output_source_desktop }, { "po", output_source_po }, { "in", output_source_in }, { "x", output_source_x },

1 0

Francois Gouget : testbot: Add the $MaxRunningVMs limit.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: tools Branch: master Commit: 6a9898fcced3306d465b0e0458b36b04682bb7dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a9898fcced3306d465b0e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 20 18:30:47 2018 +0100 testbot: Add the $MaxRunningVMs limit. This allows preparing up to $MaxActiveVMs idle VMs while putting a lower limit on the number of simultaneously running tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++++++ testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7e278ba..2e62c66 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -736,6 +736,12 @@ sub main() # Validate and adjust the configuration options $MaxActiveVMs ||= 1; + $MaxRunningVMs ||= $MaxActiveVMs; + if ($MaxRunningVMs > $MaxActiveVMs) + { + $MaxRunningVMs = $MaxActiveVMs; + LogMsg "Capping MaxRunningVMs to MaxActiveVMs ($MaxRunningVMs)\n"; + } $MaxRevertingVMs ||= $MaxActiveVMs; if ($MaxRevertingVMs > $MaxActiveVMs) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 76bc4eb..02c9dac 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -27,7 +27,8 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs - $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxVMsWhenIdle + $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs + $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout @@ -42,7 +43,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout @@ -69,6 +70,7 @@ $BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; +$MaxRunningVMs = 1; $MaxVMsWhenIdle = undef; # How long to wait for each of the 3 connection attempts to the VM's TestAgent diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 9a0f8bc..b71073a 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -473,6 +473,7 @@ sub _GetSchedHost($$) MaxRevertingVMs => $MaxRevertingVMs, MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, MaxActiveVMs => $MaxActiveVMs, + MaxRunningVMs => $MaxRunningVMs, MaxVMsWhenIdle => $MaxVMsWhenIdle, }; } @@ -905,7 +906,11 @@ sub _ScheduleTasks($) delete $Sched->{lambvms}->{$VMKey}; my $Host = _GetSchedHost($Sched, $VM); - if ($Host->{active} - $Host->{idle} < $Host->{MaxActiveVMs} and + # Dirty VMs are VMs that were running and have still not been + # powered off. Sleeping VMs may be VMs that are booting. + # So in both cases they may still be using CPU and I/O resources so + # count them against the running VM limit. + if ($Host->{sleeping} + $Host->{running} + $Host->{dirty} < $Host->{MaxRunningVMs} and ($Host->{reverting} == 0 or $Host->{reverting} <= $Host->{MaxRevertsWhileRunningVMs})) {

1 0

Rosanne DiMesio : Disable staging checkbox for new test reports
by Jeremy Newman 19 Feb '18

19 Feb '18

Module: appdb Branch: master Commit: 6150f43320843dd39da749437a7d73a9374a609e URL: https://source.winehq.org/git/appdb.git/?a=commit;h=6150f43320843dd39da7494… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Feb 19 11:35:36 2018 -0600 Disable staging checkbox for new test reports Prevents users from submitting new test reports for nonexistant staging versions. Current data is retained and the checkbox is still active for existing reports in case they need to be edited by an admin or maintainer. This change can be easily reverted if the branch is officially revived by WineHQ. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1083cfb..cec7fec 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,11 +921,14 @@ class testData{ echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; + if($this->sState != 'accepted') + echo '<input type="checkbox" name="iStaging" value="1" disabled>'; else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging <i>(discontinued; last official release was 2.21)</i>'; echo '</label>'; echo '</td></tr>',"\n";

1 0

Sebastian Lackner : user.exe16: Don't open code CONTAINING_RECORD.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 538263d0efe725124df88ce1cce124bc3ad7e2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=538263d0efe725124df88ce1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 19 20:56:02 2018 +0300 user.exe16: Don't open code CONTAINING_RECORD. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f7d4109..27b9279 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -87,10 +87,7 @@ static BOOL CALLBACK gray_string_callback( HDC hdc, LPARAM param, INT len ) /* callback for 16-bit gray string proc with string pointer */ static BOOL CALLBACK gray_string_callback_ptr( HDC hdc, LPARAM param, INT len ) { - const struct gray_string_info *info; - char *str = (char *)param; - - info = (struct gray_string_info *)(str - offsetof( struct gray_string_info, str )); + const struct gray_string_info *info = CONTAINING_RECORD( (void *)param, struct gray_string_info, str ); return gray_string_callback( hdc, (LPARAM)info, len ); }

1 0

Alexandre Julliard : kernel32: Hardcode the windows and system directories.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 59a7777f8494d909b9366015157d8be4ef1edb46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a7777f8494d909b9366015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:45:58 2018 +0100 kernel32: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/process.c | 50 ++++++------------------------------------ 2 files changed, 9 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 1af11f5..6f60413 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -55,8 +55,8 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; -extern const WCHAR *DIR_Windows DECLSPEC_HIDDEN; -extern const WCHAR *DIR_System DECLSPEC_HIDDEN; +extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; +extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; extern const WCHAR *DIR_SysWow64 DECLSPEC_HIDDEN; extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bbadae0..0a3fd70 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -64,7 +64,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(process); -WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ @@ -90,8 +89,9 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -const WCHAR *DIR_Windows = NULL; -const WCHAR *DIR_System = NULL; +const WCHAR DIR_Windows[] = {'C',':','\\','w','i','n','d','o','w','s',0}; +const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','t','e','m','3','2',0}; const WCHAR *DIR_SysWow64 = NULL; /* Process flags */ @@ -954,41 +954,12 @@ done: /*********************************************************************** * init_windows_dirs * - * Initialize the windows and system directories from the environment. + * Create the windows and system directories if necessary. */ static void init_windows_dirs(void) { - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; - static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; - static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; - static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; - static const WCHAR default_syswow64W[] = {'\\','s','y','s','w','o','w','6','4',0}; - - DWORD len; - WCHAR *buffer; - - if ((len = GetEnvironmentVariableW( windirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( windirW, buffer, len ); - DIR_Windows = buffer; - } - else DIR_Windows = default_windirW; - - if ((len = GetEnvironmentVariableW( winsysdirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( winsysdirW, buffer, len ); - DIR_System = buffer; - } - else - { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_sysdirW) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_sysdirW, sizeof(default_sysdirW) ); - DIR_System = buffer; - } + static const WCHAR default_syswow64W[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','w','o','w','6','4',0}; if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", @@ -999,18 +970,11 @@ static void init_windows_dirs(void) if (is_win64 || is_wow64) /* SysWow64 is always defined on 64-bit */ { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); - DIR_SysWow64 = buffer; + DIR_SysWow64 = default_syswow64W; if (!CreateDirectoryW( DIR_SysWow64, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_SysWow64), GetLastError() ); } - - TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); - TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); }

1 0

Alexandre Julliard : ntdll: Hardcode the windows and system directories.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 12276796c95007fc12eb38a41ca25b4daee7e1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12276796c95007fc12eb38a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:38:29 2018 +0100 ntdll: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 ----- dlls/ntdll/directory.c | 10 ++-------- dlls/ntdll/loader.c | 46 +++++++--------------------------------------- dlls/ntdll/loadorder.c | 6 ++---- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/rtlstr.c | 1 + dlls/ntdll/thread.c | 2 ++ 8 files changed, 16 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 62dc815..bbadae0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -958,8 +958,6 @@ done: */ static void init_windows_dirs(void) { - extern void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; @@ -1013,9 +1011,6 @@ static void init_windows_dirs(void) TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); - - /* set the directories in ntdll too */ - __wine_init_windows_dir( DIR_Windows, DIR_System ); } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3b76f9b..4655a634 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -205,8 +205,6 @@ static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ static const BOOL is_case_sensitive = FALSE; -UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ - static struct file_identity windir; static RTL_CRITICAL_SECTION dir_section; @@ -2378,14 +2376,10 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #endif /*********************************************************************** - * DIR_init_windows_dir + * init_directories */ -void DIR_init_windows_dir( const WCHAR *win, const WCHAR *sys ) +void init_directories(void) { - /* FIXME: should probably store paths as NT file names */ - - RtlCreateUnicodeString( &system_dir, sys ); - #ifndef _WIN64 if (is_wow64) init_redirects(); #endif diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 77a16b3..3fcbbf7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -63,6 +63,10 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +/* system directory with trailing backslash */ +const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\',0}; + static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1521,12 +1525,10 @@ static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) } if ((fullname = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.MaximumLength + (len + 1) * sizeof(WCHAR) ))) + (strlenW(system_dir) + len + 1) * sizeof(WCHAR) ))) { - memcpy( fullname, system_dir.Buffer, system_dir.Length ); - p = fullname + system_dir.Length / sizeof(WCHAR); - if (p > fullname && p[-1] != '\\') *p++ = '\\'; - ascii_to_unicode( p, filename, len + 1 ); + strcpyW( fullname, system_dir ); + ascii_to_unicode( fullname + strlenW(fullname), filename, len + 1 ); } return fullname; } @@ -3284,40 +3286,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/****************************************************************** - * __wine_init_windows_dir (NTDLL.@) - * - * Windows and system dir initialization once kernel32 has been loaded. - */ -void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) -{ - PLIST_ENTRY mark, entry; - LPWSTR buffer, p; - - strcpyW( user_shared_data->NtSystemRoot, windir ); - DIR_init_windows_dir( windir, sysdir ); - - /* prepend the system dir to the name of the already created modules */ - mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); - - assert( mod->Flags & LDR_WINE_INTERNAL ); - - buffer = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.Length + mod->FullDllName.Length + 2*sizeof(WCHAR) ); - if (!buffer) continue; - strcpyW( buffer, system_dir.Buffer ); - p = buffer + strlenW( buffer ); - if (p > buffer && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, mod->FullDllName.Buffer ); - RtlInitUnicodeString( &mod->FullDllName, buffer ); - RtlInitUnicodeString( &mod->BaseDllName, p ); - } -} - - /*********************************************************************** * __wine_process_init */ diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 157d2cb..c6c0245 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -434,7 +434,6 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; WCHAR *module, *basename; - UNICODE_STRING path_str; int len; if (!init_done) init_load_order(); @@ -445,10 +444,9 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) /* Strip path information if the module resides in the system directory */ - RtlInitUnicodeString( &path_str, path ); - if (RtlPrefixUnicodeString( &system_dir, &path_str, TRUE )) + if (!strncmpiW( system_dir, path, strlenW( system_dir ))) { - const WCHAR *p = path + system_dir.Length / sizeof(WCHAR); + const WCHAR *p = path + strlenW( system_dir ); while (*p == '\\' || *p == '/') p++; if (!strchrW( p, '\\' ) && !strchrW( p, '/' )) path = p; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 29d4f58..0f70feb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1496,4 +1496,3 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) -@ cdecl __wine_init_windows_dir(wstr wstr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8a64338..3fbccba 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -113,7 +113,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY FARPROC origfun, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; -extern UNICODE_STRING system_dir DECLSPEC_HIDDEN; +extern const WCHAR system_dir[] DECLSPEC_HIDDEN; typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; @@ -155,7 +155,7 @@ extern int get_file_info( const char *path, struct stat *st, ULONG *attr ) DECLS extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr, FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN; extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN; -extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) DECLSPEC_HIDDEN; +extern void init_directories(void) DECLSPEC_HIDDEN; extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_unmount_device( HANDLE handle ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_get_unix_cwd( char **cwd ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 3013658..190bc01 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -61,6 +61,7 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable oem_table = oem; unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; + init_directories(); } int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c999d4b..9ec94d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); #endif struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; @@ -298,6 +299,7 @@ HANDLE thread_init(void) exit(1); } user_shared_data = addr; + memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); /* allocate and initialize the PEB */

1 0

Kirill Erofeev : msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: e0f7fbfa5911af062fe0a55ed0778d6dd0896eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0f7fbfa5911af062fe0a55e… Author: Kirill Erofeev <erofeev.info(a)gmail.com> Date: Mon Feb 19 15:33:41 2018 +0100 msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s. Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/dir.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index aa273ea..a29d32b 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdio.h> #include <fcntl.h> +#include <direct.h> #include <sys/stat.h> #include <io.h> #include <mbctype.h> @@ -34,6 +35,8 @@ static int (__cdecl *p_makepath_s)(char *, size_t, const char *, const char *, const char *, const char *); static int (__cdecl *p_wmakepath_s)(wchar_t *, size_t, const wchar_t *,const wchar_t *, const wchar_t *, const wchar_t *); +static int (__cdecl *p_searchenv_s)(const char*, const char*, char*, size_t); +static int (__cdecl *p_wsearchenv_s)(const wchar_t*, const wchar_t*, wchar_t*, size_t); static void init(void) { @@ -41,6 +44,8 @@ static void init(void) p_makepath_s = (void *)GetProcAddress(hmod, "_makepath_s"); p_wmakepath_s = (void *)GetProcAddress(hmod, "_wmakepath_s"); + p_searchenv_s = (void *)GetProcAddress(hmod, "_searchenv_s"); + p_wsearchenv_s = (void *)GetProcAddress(hmod, "_wsearchenv_s"); } typedef struct @@ -416,6 +421,195 @@ static void test_splitpath(void) _setmbcp(prev_cp); } +static void test_searchenv(void) +{ + const char *dirs[] = { + "\\search_env_test", + "\\search_env_test\\dir1", + "\\search_env_test\\dir2", + "\\search_env_test\\dir3longer" + }; + + const char *files[] = { + "\\search_env_test\\dir1\\1.dat", + "\\search_env_test\\dir1\\2.dat", + "\\search_env_test\\dir2\\1.dat", + "\\search_env_test\\dir2\\3.dat", + "\\search_env_test\\dir3longer\\3.dat" + }; + + const WCHAR env_w[] = {'T','E','S','T','_','P','A','T','H',0}; + const WCHAR dat1_w[] = {'1','.','d','a','t',0}; + const WCHAR dat3_w[] = {'3','.','d','a','t',0}; + + char env1[4*MAX_PATH], env2[4*MAX_PATH], tmppath[MAX_PATH], path[2*MAX_PATH]; + char result[MAX_PATH], exp[2*MAX_PATH]; + WCHAR result_w[MAX_PATH]; + int i, path_len; + FILE *tmp_file; + + if (getenv("TEST_PATH")) { + skip("TEST_PATH environment variable already set\n"); + return; + } + + path_len = GetTempPathA(MAX_PATH, tmppath); + ok(path_len, "GetTempPath failed\n"); + memcpy(path, tmppath, path_len); + + for(i=0; i<sizeof(dirs)/sizeof(*dirs); i++) { + strcpy(path+path_len, dirs[i]); + ok(!mkdir(path), "mkdir failed (dir = %s)\n", path); + } + + for(i=0; i<sizeof(files)/sizeof(*files); i++) { + strcpy(path+path_len, files[i]); + tmp_file = fopen(path, "wb"); + ok(tmp_file != NULL, "fopen failed (file = %s)\n", path); + fclose(tmp_file); + } + + strcpy(env1, "TEST_PATH="); + strcpy(env2, "TEST_PATH=;"); + for(i=1; i<sizeof(dirs)/sizeof(*dirs); i++) { + strcat(env1, tmppath); + strcat(env1, dirs[i]); + strcat(env1, ";"); + + strcat(env2, tmppath); + strcat(env2, dirs[i]); + strcat(env2, ";;"); + } + + if (!p_searchenv_s || !p_wsearchenv_s) + win_skip("searchenv_s or wsearchenv_s function is not available\n"); + + putenv(env1); + memset(result, 'x', sizeof(result)); + _searchenv("fail", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("fail", "TEST_PATH", result, MAX_PATH); + ok(i == ENOENT, "searchenv_s returned %d\n", i); + ok(!result[0], "got %s, expected ''\n", result); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("1.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat1_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat1_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[3]); + _searchenv("3.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("3.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat3_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat3_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + putenv(env2); + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("1.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat1_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat1_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[3]); + _searchenv("3.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("3.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat3_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat3_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + putenv("TEST_PATH="); + + for(i=sizeof(files)/sizeof(*files)-1; i>=0; i--) { + strcpy(path+path_len, files[i]); + ok(!remove(path), "remove failed (file = %s)\n", path); + } + + for(i=sizeof(dirs)/sizeof(*dirs)-1; i>=0; i--) { + strcpy(path+path_len, dirs[i]); + ok(!rmdir(path), "rmdir failed (dir = %s)\n", path); + } +} + START_TEST(dir) { init(); @@ -424,4 +618,5 @@ START_TEST(dir) test_makepath(); test_makepath_s(); test_splitpath(); + test_searchenv(); }

1 0

Kirill Erofeev : msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 83470d449defe1f691bf8b91e5b1ffd3ca8f90cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=83470d449defe1f691bf8b91… Author: Kirill Erofeev <erofeev.info(a)gmail.com> Date: Mon Feb 19 15:32:29 2018 +0100 msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s. Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 214 ++++++++++++++++++++++++++---------------------------- 1 file changed, 104 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83470d449defe1f691bf…

1 0

Alex Henrie : mmdevapi/tests: Relax capture test that sometimes fails on Windows 8.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 5fcfff6e641af9a1733ff9253ceddc04a3dee692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcfff6e641af9a1733ff925… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 02:31:30 2018 -0700 mmdevapi/tests: Relax capture test that sometimes fails on Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 27a5cdc..0fa9f0c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -413,9 +413,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", - hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames); - if(hr == S_OK){ + if(SUCCEEDED(hr)){ /* Some w7 machines signal DATA_DISCONTINUITY here following the * previous AUDCLNT_S_BUFFER_EMPTY, others not. What logic? */ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
81
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 February 2018