June 2018 - Wine-Commits - list.winehq.org

Michael Stefaniuc : jscript/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 05253c75ccae0a60fec706b1c26251427e4adf06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05253c75ccae0a60fec706b1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:44 2018 +0200 jscript/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 887b264..77cd74e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1316,7 +1316,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_TESTARGTYPES: { VARIANT args[8], v; - DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; + DISPPARAMS dp = {args, NULL, ARRAY_SIZE(args), 0}; HRESULT hres; CHECK_EXPECT(global_testargtypes_i);

1 0

Hans Leidekker : webservices: Call WSACleanup when the dll is unloaded.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 10897a1f2618bb8760a155e2ed91ecd6ed34809d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10897a1f2618bb8760a155e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 6 14:10:07 2018 +0200 webservices: Call WSACleanup when the dll is unloaded. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a178e27..357a1c6 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); +HINSTANCE webservices_instance; + static BOOL winsock_loaded; static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) @@ -48,6 +50,26 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +/****************************************************************** + * DllMain (webservices.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + webservices_instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (winsock_loaded) WSACleanup(); + break; + } + return TRUE; +} + static const struct prop_desc listener_props[] = { { sizeof(ULONG), FALSE }, /* WS_LISTENER_PROPERTY_LISTEN_BACKLOG */

1 0

Józef Kucia : winevulkan: Remove vk.xml from repository.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 3db825aeef7c5ab2156a79448646da494b256765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3db825aeef7c5ab2156a7944… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 6 11:11:52 2018 +0200 winevulkan: Remove vk.xml from repository. The make_vulkan script downloads vk.xml. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 +- dlls/winevulkan/vk.xml | 6514 ------------------------------------------- 2 files changed, 11 insertions(+), 6515 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3db825aeef7c5ab2156a…

1 0

Józef Kucia : winevulkan: Add copyright headers to files generated from vk.xml.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: a333c2ef07d3b4d8f4e6fab8224408949f6ae877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a333c2ef07d3b4d8f4e6fab8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 6 12:15:33 2018 +0200 winevulkan: Add copyright headers to files generated from vk.xml. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 26 +++++++++++++++++++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 37 ++++++++++++++++++++++++++++++++++++- dlls/winevulkan/winevulkan.spec | 34 ++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 37 ++++++++++++++++++++++++++++++++++++- include/wine/vulkan_driver.h | 37 ++++++++++++++++++++++++++++++++++++- 7 files changed, 231 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a333c2ef07d3b4d8f4e6…

1 0

Dmitry Timoshkov : schedsvc: Read triggers when loading a job file.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: a3566fd6e189f803477839a7444f8418f59fd99c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3566fd6e189f803477839a7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 6 14:34:24 2018 +0800 schedsvc: Read triggers when loading a job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 61 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 9497c90..8f6cf03 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -64,6 +64,8 @@ struct job_t AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; + USHORT trigger_count; + TASK_TRIGGER *trigger; }; struct running_job_t @@ -143,7 +145,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT triggers_count, i; + USHORT i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -202,11 +204,10 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("no space for triggers count\n"); return FALSE; } - triggers_count = *(const USHORT *)(data + fixed->trigger_offset); - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("trigger_count %u\n", info->trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); TRACE("triggers_size %u\n", triggers_size); - trigger = (const TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); data += fixed->name_size_offset + unicode_strings_size; size -= fixed->name_size_offset + unicode_strings_size; @@ -249,42 +250,51 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) /* Trigger Data */ TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER))); + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); - triggers_count = *(const USHORT *)data; - TRACE("triggers_count %u\n", triggers_count); + info->trigger_count = *(const USHORT *)data; + TRACE("trigger_count %u\n", info->trigger_count); trigger = (const TASK_TRIGGER *)(data + sizeof(USHORT)); - if (triggers_count * sizeof(TASK_TRIGGER) > triggers_size) + if (info->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) { TRACE("no space for triggers data\n"); return FALSE; } - for (i = 0; i < triggers_count; i++) + info->trigger = heap_alloc(info->trigger_count * sizeof(info->trigger[0])); + if (!info->trigger) + { + TRACE("not enough memory for trigger data\n"); + return FALSE; + } + + for (i = 0; i < info->trigger_count; i++) { TRACE("%u: cbTriggerSize = %#x\n", i, trigger[i].cbTriggerSize); if (trigger[i].cbTriggerSize != sizeof(TASK_TRIGGER)) TRACE("invalid cbTriggerSize\n"); TRACE("Reserved1 = %#x\n", trigger[i].Reserved1); - TRACE("wBeginYear = %u\n", trigger->wBeginYear); - TRACE("wBeginMonth = %u\n", trigger->wBeginMonth); - TRACE("wBeginDay = %u\n", trigger->wBeginDay); - TRACE("wEndYear = %u\n", trigger->wEndYear); - TRACE("wEndMonth = %u\n", trigger->wEndMonth); - TRACE("wEndDay = %u\n", trigger->wEndDay); - TRACE("wStartHour = %u\n", trigger->wStartHour); - TRACE("wStartMinute = %u\n", trigger->wStartMinute); - TRACE("MinutesDuration = %u\n", trigger->MinutesDuration); - TRACE("MinutesInterval = %u\n", trigger->MinutesInterval); - TRACE("rgFlags = %u\n", trigger->rgFlags); - TRACE("TriggerType = %u\n", trigger->TriggerType); - TRACE("Reserved2 = %u\n", trigger->Reserved2); - TRACE("wRandomMinutesInterval = %u\n", trigger->wRandomMinutesInterval); + TRACE("wBeginYear = %u\n", trigger[i].wBeginYear); + TRACE("wBeginMonth = %u\n", trigger[i].wBeginMonth); + TRACE("wBeginDay = %u\n", trigger[i].wBeginDay); + TRACE("wEndYear = %u\n", trigger[i].wEndYear); + TRACE("wEndMonth = %u\n", trigger[i].wEndMonth); + TRACE("wEndDay = %u\n", trigger[i].wEndDay); + TRACE("wStartHour = %u\n", trigger[i].wStartHour); + TRACE("wStartMinute = %u\n", trigger[i].wStartMinute); + TRACE("MinutesDuration = %u\n", trigger[i].MinutesDuration); + TRACE("MinutesInterval = %u\n", trigger[i].MinutesInterval); + TRACE("rgFlags = %u\n", trigger[i].rgFlags); + TRACE("TriggerType = %u\n", trigger[i].TriggerType); + TRACE("Reserved2 = %u\n", trigger[i].Reserved2); + TRACE("wRandomMinutesInterval = %u\n", trigger[i].wRandomMinutesInterval); + + info->trigger[i] = trigger[i]; } - size -= sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); - data += sizeof(USHORT) + triggers_count * sizeof(TASK_TRIGGER); + size -= sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER); if (size < 2 * sizeof(USHORT) + 64) { @@ -353,6 +363,7 @@ static void free_job(struct job_t *job) heap_free(job->name); heap_free(job->params); heap_free(job->curdir); + heap_free(job->trigger); heap_free(job); }

1 0

Zebediah Figura : msi: Store the current script in the package.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 756bbb5bb756d1fcbeea41e10a6fdf2149fa1323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=756bbb5bb756d1fcbeea41e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 6 00:59:22 2018 -0500 msi: Store the current script in the package. 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/action.c | 25 +++++++++++++++---------- dlls/msi/custom.c | 4 ++-- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 5 +++-- dlls/msi/package.c | 1 + 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ddd676d..7c71800 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -510,7 +510,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action); msi_dialog_check_messages( NULL ); @@ -604,7 +604,7 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script) +static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action) { UINT arc; INT uirc; @@ -613,7 +613,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT if (uirc == IDCANCEL) return ERROR_INSTALL_USEREXIT; ui_actioninfo(package, action, TRUE, 0); - arc = ACTION_CustomAction( package, action, script ); + arc = ACTION_CustomAction(package, action); uirc = !arc; if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package)) @@ -1546,11 +1546,13 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) TRACE("executing script %u\n", script); + package->script = script; + if (script == SCRIPT_ROLLBACK) { for (i = package->script_actions_count[script]; i > 0; i--) { - rc = ACTION_PerformAction(package, package->script_actions[script][i-1], script); + rc = ACTION_PerformAction(package, package->script_actions[script][i-1]); if (rc != ERROR_SUCCESS) { ERR("Execution of script %i halted; action %s returned %u\n", @@ -1563,7 +1565,7 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) { for (i = 0; i < package->script_actions_count[script]; i++) { - rc = ACTION_PerformAction(package, package->script_actions[script][i], script); + rc = ACTION_PerformAction(package, package->script_actions[script][i]); if (rc != ERROR_SUCCESS) { ERR("Execution of script %i halted; action %s returned %u\n", @@ -1572,6 +1574,9 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) } } } + + package->script = SCRIPT_NONE; + msi_free_action_script(package, script); return rc; } @@ -5672,7 +5677,7 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) msiobj_release(&uirow->hdr); } else - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action); /* Send all set properties. */ if (!MSI_OpenQuery(package->db, &view, prop_query)) @@ -7919,7 +7924,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) return rc; } -UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) +UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) { UINT rc; @@ -7929,7 +7934,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) rc = ACTION_HandleStandardAction(package, action); if (rc == ERROR_FUNCTION_NOT_CALLED) - rc = ACTION_HandleCustomAction(package, action, script); + rc = ACTION_HandleCustomAction(package, action); if (rc == ERROR_FUNCTION_NOT_CALLED) WARN("unhandled msi action %s\n", debugstr_w(action)); @@ -7982,7 +7987,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) return ERROR_FUNCTION_FAILED; } - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action); msiobj_release(&row->hdr); } @@ -8071,7 +8076,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_set_property( package->db, szRollbackDisabled, szOne, -1 ); } - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action); /* process the ending type action */ if (rc == ERROR_SUCCESS) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 07916ac..8deebe5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1208,7 +1208,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT return ERROR_SUCCESS; } -UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) +UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -1248,7 +1248,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!action_type_matches_script( type, script )) + if (!action_type_matches_script(type, package->script)) { rc = defer_custom_action( package, action, type ); goto end; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 61c6ab0..1e78aa9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4363,7 +4363,7 @@ static UINT event_spawn_wait_dialog( msi_dialog *dialog, const WCHAR *argument ) static UINT event_do_action( msi_dialog *dialog, const WCHAR *argument ) { - ACTION_PerformAction( dialog->package, argument, SCRIPT_NONE ); + ACTION_PerformAction(dialog->package, argument); return ERROR_SUCCESS; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e043c04..0e224c9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -83,7 +83,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) return remote_DoAction(remote, szAction); } - ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE ); + ret = ACTION_PerformAction(package, szAction); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2ec94a1..2ae4db2 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3742,7 +3742,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); + rc = ACTION_PerformAction(package, szFirstRun); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3768,7 +3768,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); + rc = ACTION_PerformAction(package, szFirstRun); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3849,7 +3849,7 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); - r = ACTION_PerformAction( package, szCostInitialize, SCRIPT_NONE ); + r = ACTION_PerformAction(package, szCostInitialize); if (r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 707144f..8acace3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -414,6 +414,7 @@ typedef struct tagMSIPACKAGE struct list mimes; struct list appids; + enum script script; LPWSTR *script_actions[SCRIPT_MAX]; int script_actions_count[SCRIPT_MAX]; LPWSTR *unique_actions; @@ -975,9 +976,9 @@ extern WCHAR *gszLogFile DECLSPEC_HIDDEN; extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; /* action related functions */ -extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; +extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN; extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; -extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN; +extern UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN; /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2801efa..840e4a7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1119,6 +1119,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) msi_load_admin_properties( package ); package->log_file = INVALID_HANDLE_VALUE; + package->script = SCRIPT_NONE; } return package; }

1 0

Zebediah Figura : msi: Resolve source when executing InstallFiles.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 536a86f21ff0f8432309225b61695138be95cb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=536a86f21ff0f8432309225b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 6 00:59:21 2018 -0500 msi: Resolve source when executing InstallFiles. 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/files.c | 2 ++ dlls/msi/tests/install.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index adffcaf..f6cf3e7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -357,6 +357,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) UINT rc = ERROR_SUCCESS; MSIFILE *file; + msi_set_sourcedir_props(package, FALSE); + schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index af37d93..3eb6c80 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1328,6 +1328,7 @@ static const CHAR sr_install_exec_seq_dat[] = "sourcedir_unset\tSourceDir\t700\n" "ResolveSource\tRESOLVE_SOURCE\t800\n" "ProcessComponents\tPROCESS_COMPONENTS\t800\n" + "InstallFiles\tINSTALL_FILES\t800\n" "sourcedir_set\tNOT SourceDir\t900\n" "InstallFinalize\t\t1000\n"; @@ -6166,6 +6167,10 @@ static void test_source_resolution(void) r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); ok(r == ERROR_SUCCESS, "got %u\n", r); + r = MsiInstallProductA(msifile, "INSTALL_FILES=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + delete_pf_files(); delete_test_files(); DeleteFileA(msifile); }

1 0

Michael Stefaniuc : msvfw32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 44bd013ef33e91ec3423b42cbf79d29abf5c714e URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bd013ef33e91ec3423b42c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 6 00:38:36 2018 +0200 msvfw32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/drawdib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 0a59d82..92e60df 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -138,7 +138,7 @@ static void test_DrawDib_sizeimage(void) hdd = DrawDibOpen(); ok(hdd != NULL, "DrawDibOpen failed\n"); - for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { + for (i = 0; i < ARRAY_SIZE(test_data); i++) { char *hash; memset(dst_bits, 0xff, dst_dib_size); init_bmi(&src_info, test_data[i].width, test_data[i].height, test_data[i].size);

1 0

Michael Stefaniuc : credui/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 33e590638cfaec492dba951a0ca6329770538062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e590638cfaec492dba951a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 6 00:38:26 2018 +0200 credui/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/tests/credui.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 01d657d..13fbd41 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -58,20 +58,20 @@ static void test_CredUIPromptForCredentials(void) username[0] = '\0'; password[0] = '\0'; ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI); ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS); ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); @@ -86,8 +86,8 @@ static void test_CredUIPromptForCredentials(void) 'C','R','E','D','U','I','_','F','L','A','G','S','_','E','X','P','E','C','T','_','C','O','N','F','I','R','M','A','T','I','O','N',0}; ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, - sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -97,10 +97,9 @@ static void test_CredUIPromptForCredentials(void) } credui_info.pszCaptionText = wszCaption1; - ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, - ERROR_ACCESS_DENIED, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, ERROR_ACCESS_DENIED, + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -111,8 +110,8 @@ static void test_CredUIPromptForCredentials(void) credui_info.pszCaptionText = wszCaption2; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) @@ -125,8 +124,8 @@ static void test_CredUIPromptForCredentials(void) save = TRUE; credui_info.pszCaptionText = wszCaption3; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(save, "save flag should have been untouched\n"); @@ -134,8 +133,8 @@ static void test_CredUIPromptForCredentials(void) save = FALSE; credui_info.pszCaptionText = wszCaption4; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, - username, sizeof(username)/sizeof(username[0]), - password, sizeof(password)/sizeof(password[0]), + username, ARRAY_SIZE(username), + password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(!save, "save flag should have been untouched\n");

1 0

Michael Stefaniuc : netapi32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 6, 2018

June 6, 2018

Module: wine Branch: master Commit: 55ef1f4d926d4916e94ce71ba7de5eae85df0b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ef1f4d926d4916e94ce71b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 6 00:38:37 2018 +0200 netapi32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 8 ++++---- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f095d77..a284b65 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -74,7 +74,7 @@ static BOOL init_access_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { @@ -84,7 +84,7 @@ static BOOL init_access_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(computer_name); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return TRUE; } @@ -521,7 +521,7 @@ static void test_DavGetHTTPFromUNCPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( size == 12, "got %u\n", size ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { buf[0] = 0; size = tests[i].size; @@ -685,7 +685,7 @@ static void test_DavGetUNCFromHTTPPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( size == 25, "got %u\n", size ); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { buf[0] = 0; size = tests[i].size; diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 418a1ad..ba4a7f9 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -50,7 +50,7 @@ static BOOL init_wksta_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(user_name[0]); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); @@ -59,7 +59,7 @@ static BOOL init_wksta_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name)/sizeof(computer_name[0]); + dwSize = ARRAY_SIZE(computer_name); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return TRUE; }

1 0