May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Don't load a custom action DLL in the main process.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: e355cb62775f7fd39a03458c62334a603dcb0c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e355cb62775f7fd39a03458c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:36:51 2018 -0500 msi: Don't load a custom action DLL in the main process. This has no effect anymore, and won't work if the architecture doesn't match. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 16 ++++++---------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 2 -- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e0781fc..ca0362b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -235,7 +235,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) return ret; } -static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL dll ) +static MSIBINARY *create_temp_binary(MSIPACKAGE *package, LPCWSTR source) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -272,11 +272,6 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL CloseHandle( file ); if (r != ERROR_SUCCESS) goto error; - /* keep a reference to prevent the dll from being unloaded */ - if (dll && !(binary->module = LoadLibraryW( tmpfile ))) - { - ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); - } binary->source = strdupW( source ); binary->tmpfile = tmpfile; list_add_tail( &package->binaries, &binary->entry ); @@ -292,7 +287,7 @@ error: return NULL; } -static MSIBINARY *get_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL dll ) +static MSIBINARY *get_temp_binary(MSIPACKAGE *package, LPCWSTR source) { MSIBINARY *binary; @@ -302,7 +297,7 @@ static MSIBINARY *get_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL dll return binary; } - return create_temp_binary( package, source, dll ); + return create_temp_binary(package, source); } static void file_running_action(MSIPACKAGE* package, HANDLE Handle, @@ -692,7 +687,7 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const msi_custom_action_info *info; MSIBINARY *binary; - if (!(binary = get_temp_binary( package, source, TRUE ))) + if (!(binary = get_temp_binary(package, source))) return ERROR_FUNCTION_FAILED; TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); @@ -776,7 +771,8 @@ static UINT HANDLE_CustomType2( MSIPACKAGE *package, const WCHAR *source, const HANDLE handle; WCHAR *arg; - if (!(binary = get_temp_binary( package, source, FALSE ))) return ERROR_FUNCTION_FAILED; + if (!(binary = get_temp_binary(package, source))) + return ERROR_FUNCTION_FAILED; deformat_string( package, target, &arg ); TRACE("exe %s arg %s\n", debugstr_w(binary->tmpfile), debugstr_w(arg)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index aede960..46cbb43 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -206,7 +206,6 @@ typedef struct tagMSIBINARY struct list entry; WCHAR *source; WCHAR *tmpfile; - HMODULE module; } MSIBINARY; typedef struct _column_info diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a2fa785..3de3113 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -290,8 +290,6 @@ static void free_package_structures( MSIPACKAGE *package ) MSIBINARY *binary = LIST_ENTRY( item, MSIBINARY, entry ); list_remove( &binary->entry ); - if (binary->module) - FreeLibrary( binary->module ); if (!DeleteFileW( binary->tmpfile )) ERR("failed to delete %s (%u)\n", debugstr_w(binary->tmpfile), GetLastError()); msi_free( binary->source );

1 0

Alexandre Julliard : user32/tests: Avoid calling a potentially missing function.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: fbe81f8a9e90d28d7aefebd7639122eaf5bf0d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe81f8a9e90d28d7aefebd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 13:18:29 2018 +0200 user32/tests: Avoid calling a potentially missing function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a4247f2..815cb79 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3196,13 +3196,14 @@ static void test_dpi_mapping(void) BOOL ret, todo; RECT rect, orig, client, expect; ULONG_PTR i, j; - DPI_AWARENESS_CONTEXT context = pGetThreadDpiAwarenessContext(); + DPI_AWARENESS_CONTEXT context; if (!pLogicalToPhysicalPointForPerMonitorDPI) { win_skip( "LogicalToPhysicalPointForPerMonitorDPI not supported\n" ); return; } + context = pGetThreadDpiAwarenessContext(); for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) { pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i );

1 0

Piotr Caban : msvcr120: Add Concurrency::details::platform:: GetCurrentThreadId export.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: dbce559df683b7831861c747f1f4d28614eedbe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbce559df683b7831861c747… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 1 18:47:19 2018 +0200 msvcr120: Add Concurrency::details::platform::GetCurrentThreadId export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 03bc617..6c09bb6 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1083,7 +1083,7 @@ @ stub -arch=win64 ??_Ftime_base(a)std@@QEAAXXZ @ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z -@ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ +@ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ @ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9e0c395..00f622b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -420,7 +420,7 @@ @ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ cdecl -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ() CurrentScheduler_Get @ cdecl -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ() CurrentScheduler_Get -@ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ +@ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ @ cdecl ?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ() CurrentScheduler_GetNumberOfVirtualProcessors @ stub ?GetOSVersion(a)Concurrency@@YA?AW4OSVersion(a)IResourceManager@1(a)XZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a732118..af1b129 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -416,7 +416,7 @@ @ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ cdecl -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ() msvcr120.?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ cdecl -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ() msvcr120.?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ -@ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ +@ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() msvcr120.?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ @ cdecl ?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ() msvcr120.?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ @ stub ?GetOSVersion(a)Concurrency@@YA?AW4OSVersion(a)IResourceManager@1(a)XZ

1 0

Zebediah Figura : services: Fall back to the current architecture if GetBinaryType fails.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 085c577a25e76161d0660f92eac194263c2375c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085c577a25e76161d0660f92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:59:54 2018 -0500 services: Fall back to the current architecture if GetBinaryType fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index eba98d6..1973d27 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -723,7 +723,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, return ERROR_SUCCESS; } -static DWORD get_winedevice_binary_path(WCHAR **path, BOOL *is_wow64) +static DWORD get_winedevice_binary_path(struct service_entry *service_entry, WCHAR **path, BOOL *is_wow64) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',0}; WCHAR system_dir[MAX_PATH]; @@ -734,7 +734,7 @@ static DWORD get_winedevice_binary_path(WCHAR **path, BOOL *is_wow64) else if (GetBinaryTypeW(*path, &type)) *is_wow64 = (type == SCS_32BIT_BINARY); else - return GetLastError(); + *is_wow64 = service_entry->is_wow64; GetSystemDirectoryW(system_dir, MAX_PATH); HeapFree(GetProcessHeap(), 0, *path); @@ -857,7 +857,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p struct service_entry *winedevice_entry; WCHAR *group; - if ((err = get_winedevice_binary_path(&path, &is_wow64))) + if ((err = get_winedevice_binary_path(service_entry, &path, &is_wow64))) { service_unlock(service_entry); HeapFree(GetProcessHeap(), 0, path);

1 0

Francois Gouget : testbot: Remove unneeded WineTestBot::Config imports.
by Alexandre Julliard 01 May '18

01 May '18

Module: tools Branch: master Commit: e357126ab41ad6e4b7998c420ce008b1876823b5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e357126ab41ad6e4b7998c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 30 23:46:15 2018 +0200 testbot: Remove unneeded WineTestBot::Config imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Branches.pm | 2 -- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - testbot/lib/WineTestBot/PendingPatchSets.pm | 1 - testbot/lib/WineTestBot/Records.pm | 2 -- testbot/lib/WineTestBot/WineTestBotObjects.pm | 2 -- testbot/web/GetFile.pl | 1 - testbot/web/admin/BranchesList.pl | 1 - testbot/web/admin/Log.pl | 1 - testbot/web/admin/SendLog.pl | 3 +-- 9 files changed, 1 insertion(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 96cf26e..f202c22 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -29,8 +29,6 @@ WineTestBot::Branch - Describes a Wine branch use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Config; - sub InitializeNew($$) { diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index af30fbb..380d4b8 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -59,7 +59,6 @@ our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 7a54499..c0dc56f 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -160,7 +160,6 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Utils; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index a3302af..00364f2 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -41,8 +41,6 @@ only limited by the amount of data dumped into the Records table. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Config; - sub InitializeNew($$) { diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index d559a76..de748ff 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -29,7 +29,6 @@ use ObjectModel::Item; our @ISA = qw(ObjectModel::Item); use ObjectModel::BackEnd; -use WineTestBot::Config; sub GetBackEnd($) @@ -51,7 +50,6 @@ use ObjectModel::Collection; our @ISA = qw(ObjectModel::Collection); use ObjectModel::BackEnd; -use WineTestBot::Config; sub GetBackEnd($) { diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 7e6c615..a178cca 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -22,7 +22,6 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use Fcntl; # For O_XXX -use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 7a496cd..a325818 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -24,7 +24,6 @@ package BranchesListPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); -use WineTestBot::Config; use WineTestBot::Branches; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d6e526..934bf25 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -25,7 +25,6 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::Log; diff --git a/testbot/web/admin/SendLog.pl b/testbot/web/admin/SendLog.pl index 7044c33..3581c5c 100644 --- a/testbot/web/admin/SendLog.pl +++ b/testbot/web/admin/SendLog.pl @@ -20,12 +20,11 @@ use strict; use HTTP::Date; - use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; use URI::Escape; -use WineTestBot::Config; + use WineTestBot::CGI::Sessions; use WineTestBot::Log;

1 0

Francois Gouget : testbot/web: Add a WineTestBot::Users import.
by Alexandre Julliard 01 May '18

01 May '18

Module: tools Branch: master Commit: 4183255c15a3b6f4d1cf20b8eb384c63332b0267 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4183255c15a3b6f4d1cf20b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 30 23:46:29 2018 +0200 testbot/web: Add a WineTestBot::Users import. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 72bd307..3e5a481 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,7 +25,10 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; + use WineTestBot::Branches; +use WineTestBot::Users; + sub SortKeys($$) @@ -70,7 +73,7 @@ sub GetDisplayValue($$$) if ($PropertyDescriptor->GetName() eq "User" && defined($Item->Patch) && - $Item->User->GetKey() eq WineTestBot::Users->GetBatchUser()->GetKey() && + $Item->User->GetKey() eq GetBatchUser()->GetKey() && defined($Item->Patch->FromName)) { return $Item->Patch->FromName;

1 0