February 2018 - Wine-Commits

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

Feb. 20, 2018

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

Zebediah Figura : kernel32/tests: Handle notifications on the parent dir more gracefully.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 50ca65d17270f3d9b308c7603e30351aa9ce2fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=50ca65d17270f3d9b308c760… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 19 16:10:18 2018 -0600 kernel32/tests: Handle notifications on the parent dir more gracefully. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 4accad0..f4abad4 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -383,6 +383,7 @@ static void test_readdirectorychanges(void) static const WCHAR szHoo[] = { '\\','h','o','o',0 }; static const WCHAR szGa[] = { '\\','h','o','o','\\','g','a',0 }; PFILE_NOTIFY_INFORMATION pfni; + BOOL got_subdir_change = FALSE; if (!pReadDirectoryChangesW) { @@ -550,26 +551,40 @@ static void test_readdirectorychanges(void) r = CreateDirectoryW( subsubdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( ov.hEvent, 1000 ); - ok( r == WAIT_OBJECT_0, "should be ready\n" ); + while (1) + { + r = WaitForSingleObject( ov.hEvent, 1000 ); + ok(r == WAIT_OBJECT_0, "should be ready\n" ); + if (r == WAIT_TIMEOUT) break; - ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, - "ov.InternalHigh wrong %lx\n", ov.InternalHigh); + ok((NTSTATUS) ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION) buffer; - if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ - { - ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); - ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); - ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); - pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + while (1) + { + /* We might get one or more modified events on the parent dir */ + if (pfni->Action == FILE_ACTION_MODIFIED) + { + ok(pfni->FileNameLength == 3 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 3 * sizeof(WCHAR)), "name wrong\n"); + } + else + { + ok(pfni->Action == FILE_ACTION_ADDED, "action wrong\n"); + ok(pfni->FileNameLength == 6 * sizeof(WCHAR), "len wrong\n" ); + ok(!memcmp(pfni->FileName, &szGa[1], 6 * sizeof(WCHAR)), "name wrong\n"); + got_subdir_change = TRUE; + } + if (!pfni->NextEntryOffset) break; + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } + + if (got_subdir_change) break; + + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); } - ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); - ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); - ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" ); - ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); + ok(got_subdir_change, "didn't get subdir change\n"); r = RemoveDirectoryW( subsubdir ); ok( r == TRUE, "failed to remove directory\n");

1 0

Francois Gouget : testbot: Add the $MaxRunningVMs limit.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

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 Feb. 19, 2018

Feb. 19, 2018

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 Feb. 19, 2018

Feb. 19, 2018

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 Feb. 19, 2018

Feb. 19, 2018

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 Feb. 19, 2018

Feb. 19, 2018

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

Huw Davies : riched20: Return the underline pen as the return value.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 08c15246ca3de32f5f375d261c51b70e98b02665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c15246ca3de32f5f375d26… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:01 2018 +0000 riched20: Return the underline pen as the return value. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b4b6697..d3b908a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } -static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { - *pen = NULL; /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) { @@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - *pen = CreatePen( PS_SOLID, 1, color ); - break; + return CreatePen( PS_SOLID, 1, color ); case CFU_UNDERLINEDOTTED: - *pen = CreatePen( PS_DOT, 1, color ); - break; + return CreatePen( PS_DOT, 1, color ); default: FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); /* fall through */ @@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) break; } } - return; + return NULL; } static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) { HPEN pen; - get_underline_pen( run->style, color, &pen ); + pen = get_underline_pen( run->style, color ); if (pen) { HPEN old_pen = SelectObject( c->hDC, pen );

1 0

Huw Davies : winedbg: Fix the operand order of some XMM instructions.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: e5b9057ba00f7e6ad35361f954557eee55d8f64b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b9057ba00f7e6ad35361f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:05 2018 +0000 winedbg: Fix the operand order of some XMM instructions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 30 +++++++++++++++--------------- programs/winedbg/db_disasm64.c | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index c745617..b8a2152 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -301,23 +301,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = { diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 3db0b5e..b1556ad 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -351,23 +351,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = {

1 0

Nikolay Sivov : user32: Don' t convert message arguments when calling dialog procedure.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 9640990e43e351ff2702713cde9fae7203a8ed9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9640990e43e351ff2702713c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:37:06 2018 +0300 user32: Don't convert message arguments when calling dialog procedure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 108 +++++++++++++++++++++++++++++++++++++-------- dlls/user32/winproc.c | 54 +++++++++++++++++------ 2 files changed, 130 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9640990e43e351ff2702…

1 0