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

Michael Müller : feclient: Add stub dll.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 7f0b93c7f17af709fe5fbe17e8407ffc65dbba13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0b93c7f17af709fe5fbe17… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 10 16:35:14 2018 +0200 feclient: Add stub dll. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/configure b/configure index ed45350..a38763c 100755 --- a/configure +++ b/configure @@ -1285,6 +1285,7 @@ enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep +enable_feclient enable_fltlib enable_fltmgr_sys enable_fntcache @@ -18694,6 +18695,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_wi wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests +wine_fn_config_makefile dlls/feclient enable_feclient wine_fn_config_makefile dlls/fltlib enable_fltlib wine_fn_config_makefile dlls/fltmgr.sys enable_fltmgr_sys wine_fn_config_makefile dlls/fntcache enable_fntcache diff --git a/configure.ac b/configure.ac index f306078..5d60559 100644 --- a/configure.ac +++ b/configure.ac @@ -3291,6 +3291,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000..d3eeefb --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000..3534610 --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,50 @@ +@ stub EfsUtilGetCurrentKey +@ stub EdpAllowFileAccessForProcess +@ stub EdpConsumerCredentialCreate +@ stub EdpConsumerCredentialQuery +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplStartCredServiceIfDplEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpIsConsumerDataProtectionEnforced +@ stub EdpIsConsumerDataProtectionSupported +@ stub EdpPurgeAppLearningEvents +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EdpUnprotectFile +@ stub EdpWriteLogSiteLearningEvents +@ stub EfsClientCloseFileRaw +@ stub EfsClientCopyFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeKeyInfo +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientGetKeyInfo +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsReprotectFile +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey +@ stub OefsCheckSupport diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000..91aed70 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Dmitry Timoshkov : schedsvc: Read more task fields from the job file.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: a66c6a09685f3d6c51fe2a3c010309d7c34e55eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66c6a09685f3d6c51fe2a3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:50 2018 +0800 schedsvc: Read more task fields from the job file. Print a FIXME() when the service detects a client action. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index cb9bc1f..542dfc3 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -60,6 +60,8 @@ struct job_t struct list entry; WCHAR *name; AT_ENUM info; + FIXDLEN_DATA data; + USHORT instance_count; }; static LONG current_jobid = 1; @@ -109,13 +111,12 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) return data_size; } -/* FIXME: read more data, currently only Command is handled */ -static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) +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 instance_count, triggers_count, i; + USHORT triggers_count, i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -128,6 +129,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) } fixed = (const FIXDLEN_DATA *)data; + info->data = *fixed; TRACE("product_version %04x\n", fixed->product_version); TRACE("file_version %04x\n", fixed->file_version); @@ -156,11 +158,11 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return FALSE; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + info->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); else { TRACE("invalid name_size_offset\n"); @@ -269,7 +271,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -static BOOL load_job(const WCHAR *name, AT_ENUM *info) +static BOOL load_job(const WCHAR *name, struct job_t *info) { HANDLE file, mapping; DWORD size, try; @@ -332,12 +334,17 @@ void add_job(const WCHAR *name) job = heap_alloc_zero(sizeof(*job)); if (!job) return; - if (!load_job(name, &job->info)) + if (!load_job(name, job)) { free_job(job); return; } + if (job->data.flags & 0x08000000) + FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + else if (job->data.flags & 0x04000000) + FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++;

1 0

Qian Hong : server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 9ec4b572f8ce388fbc19eae70573f8c6d1c984bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec4b572f8ce388fbc19eae7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 11 04:42:48 2018 +0000 server: Map EXDEV to STATUS_NOT_SAME_DEVICE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif

1 0

Dmitry Timoshkov : schedsvc: Pass full task file name to remove_job()/ add_job().
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 0932d858aae649bfa4fc36e7207a84cad18b017d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0932d858aae649bfa4fc36e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:26 2018 +0800 schedsvc: Pass full task file name to remove_job()/add_job(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 848e4fc..f021d63 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -118,8 +118,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); lstrcatW(path, info.data.FileName); - remove_job(info.data.FileName); - add_job(info.data.FileName); + remove_job(path); + add_job(path); break; default:

1 0

Dmitry Timoshkov : mstask: Don' t touch instance count field of the job file in the client.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: bfb7a0aa1fbf856a479e22311e0855380674edf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb7a0aa1fbf856a479e2231… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:28 2018 +0800 mstask: Don't touch instance count field of the job file in the client. It should be managed on the server side. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 986faa1..5ec7064 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1260,9 +1260,8 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta goto failed; } - /* Instance Count */ - word = 0; - if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + /* Instance Count: don't touch it in the client */ + if (SetFilePointer(hfile, sizeof(word), NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { hr = HRESULT_FROM_WIN32(GetLastError()); goto failed;

1 0

Dmitry Timoshkov : mstask: Return SCHED_S_TASK_RUNNING from ITask:: GetStatus() if there are running task instances.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: a652d51e06d2b11870686296b5c3dcadf9f3acac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a652d51e06d2b11870686296… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:36 2018 +0800 mstask: Return SCHED_S_TASK_RUNNING from ITask::GetStatus() if there are running task instances. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 47ed4cb..aa50620 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -307,7 +307,7 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) TRACE("(%p, %p)\n", iface, status); - *status = This->status; + *status = This->instance_count ? SCHED_S_TASK_RUNNING : This->status; return S_OK; }

1 0

Dmitry Timoshkov : mstask: Write more correct flags and status to the job file.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 6a9e12709714d8ef68f3adb7a840a8091f86a319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9e12709714d8ef68f3adb7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:39 2018 +0800 mstask: Write more correct flags and status to the job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index aa50620..a5dd603 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1252,8 +1252,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; fixed.exit_code = 0; - fixed.status = SCHED_S_TASK_HAS_NOT_RUN; - fixed.flags = 0; + if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) + This->status = SCHED_S_TASK_HAS_NOT_RUN; + fixed.status = This->status; + fixed.flags = This->flags; memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0);

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetFlags().
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 8cfdaa45bb4f16a122dea40920a05bf29308843e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfdaa45bb4f16a122dea409… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:34 2018 +0800 mstask: Implement ITask::GetFlags(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c99d51f..47ed4cb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -489,8 +489,10 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, flags); - *flags = 0; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, flags); + *flags = LOWORD(This->flags); return S_OK; }

1 0

Dmitry Timoshkov : mstask: Try opening a file more times when saving a job file.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 87cc8cf3bb56f9fb954bc964325b4b438ca742d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87cc8cf3bb56f9fb954bc964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:41 2018 +0800 mstask: Try opening a file more times when saving a job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a5dd603..82ba96e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1195,7 +1195,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta FIXDLEN_DATA fixed; WORD word, user_data_size = 0; HANDLE hfile; - DWORD size, ver, disposition; + DWORD size, ver, disposition, try; TaskImpl *This = impl_from_IPersistFile(iface); ITask *task = &This->ITask_iface; LPWSTR appname = NULL, params = NULL, workdir = NULL, creator = NULL, comment = NULL; @@ -1258,9 +1258,15 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.flags = This->flags; memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); - hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); - if (hfile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + try = 1; + for (;;) + { + hfile = CreateFileW(task_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) return HRESULT_FROM_WIN32(GetLastError()); + Sleep(100); + } if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) {

1 0

Dmitry Timoshkov : mstask: Implement ITask::Terminate().
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 00261db37e5157f4328bb137b91b80da6e0a1e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00261db37e5157f4328bb137… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:45 2018 +0800 mstask: Implement ITask::Terminate(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index fa84f4e..9cdf92e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -283,11 +283,17 @@ static HRESULT WINAPI MSTASK_ITask_Run(ITask *iface) return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } -static HRESULT WINAPI MSTASK_ITask_Terminate( - ITask* iface) +static HRESULT WINAPI MSTASK_ITask_Terminate(ITask *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p)\n", iface); + + if (!This->instance_count) + return SCHED_E_TASK_NOT_RUNNING; + + This->flags |= 0x08000000; + return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } static HRESULT WINAPI MSTASK_ITask_EditWorkItem(

1 0