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

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

11 May '18

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 11 May '18

11 May '18

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: Try opening a file more times when saving a job file.
by Alexandre Julliard 11 May '18

11 May '18

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::Run().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: df0fbd5c18de40c69b9095b681456cee59618140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0fbd5c18de40c69b9095b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:43 2018 +0800 mstask: Implement ITask::Run(). 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 82ba96e..fa84f4e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -270,11 +270,17 @@ static HRESULT WINAPI MSTASK_ITask_GetIdleWait(ITask *iface, WORD *idle_minutes, return S_OK; } -static HRESULT WINAPI MSTASK_ITask_Run( - ITask* iface) +static HRESULT WINAPI MSTASK_ITask_Run(ITask *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p)\n", iface); + + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + return SCHED_E_TASK_NOT_READY; + + This->flags |= 0x04000000; + return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } static HRESULT WINAPI MSTASK_ITask_Terminate(

1 0

Dmitry Timoshkov : mstask: Implement ITask::Terminate().
by Alexandre Julliard 11 May '18

11 May '18

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

Dmitry Timoshkov : mstask/tests: Add some tests for ITask::Run().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 3310cd5385f76a9be95a04c6ea98b608657d7961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3310cd5385f76a9be95a04c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:47 2018 +0800 mstask/tests: Add some tests for ITask::Run(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6837782..2e8ee93 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -591,6 +591,169 @@ static void test_task_state(void) cleanup_task(); } +static void save_job(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + IPersistFile_Release(pfile); +} + +static void test_Run(void) +{ + static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; + static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; + ITaskScheduler *scheduler; + ITask *task; + ITaskTrigger *trigger; + WORD idx, i; + TASK_TRIGGER trigger_data; + SYSTEMTIME st; + HRESULT hr, status; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, wine_test_runW); + + hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_Run(task); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + + hr = ITask_Terminate(task); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&trigger_data, 0, sizeof(trigger_data)); + trigger_data.cbTriggerSize = sizeof(trigger_data); + trigger_data.Reserved1 = 0; + GetLocalTime(&st); + trigger_data.wBeginYear = st.wYear; + trigger_data.wBeginMonth = st.wMonth; + trigger_data.wBeginDay = st.wDay; + trigger_data.wStartHour = st.wHour; + trigger_data.wStartMinute = st.wMinute; + trigger_data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; + trigger_data.Type.Weekly.WeeksInterval = 1; + trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ + hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); + ok(hr == S_OK, "got %#x\n", hr); + ITaskTrigger_Release(trigger); + + hr = ITask_SetApplicationName(task, cmdW); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetParameters(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetWorkingDirectory(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + /* Save the task so that the Scheduler service would notice the changes */ + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + hr = ITask_Run(task); + ok(hr == S_OK, "got %#x\n", hr); + + /* According to MSDN the task status doesn't update dynamically */ + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + ITask_Release(task); + + /* Running the process associated with the task to start up may + * take quite a bit a of time, and waiting for it during the test + * may be not the best idea. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status == SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + if (status == SCHED_S_TASK_RUNNING) + { + hr = ITask_Terminate(task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + /* Waiting for the process associated with the task to terminate + * may take quite a bit a of time, and waiting for it during the + * test is not practical. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status != SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + } + else + ITask_Release(task); + + hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); +} + START_TEST(task) { CoInitialize(NULL); @@ -601,5 +764,6 @@ START_TEST(task) test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); test_task_state(); + test_Run(); CoUninitialize(); }

1 0

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

11 May '18

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

Dmitry Timoshkov : mstask: Add stdcall to cdecl thunks for AT Service RPC API.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: f3f2eeb88c076ee1dbe28119cd0c26b4480dbcd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f2eeb88c076ee1dbe28119… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 18:30:52 2018 +0800 mstask: Add stdcall to cdecl thunks for AT Service RPC API. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index dcfb20c..df8ea7a 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stdcall NetrJobAdd(wstr ptr ptr) -@ stdcall NetrJobDel(wstr long long) -@ stdcall NetrJobEnum(wstr ptr long ptr ptr) -@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow(a)0 @ stub _DllGetClassObject(a)12 @ stub _GetNetScheduleAccountInformation(a)12 -@ stdcall _NetrJobAdd(a)12(wstr ptr ptr) NetrJobAdd -@ stdcall _NetrJobDel(a)12(wstr long long) NetrJobDel -@ stdcall _NetrJobEnum(a)20(wstr ptr long ptr ptr) NetrJobEnum -@ stdcall _NetrJobGetInfo(a)12(wstr long ptr) NetrJobGetInfo +@ stdcall _NetrJobAdd(a)12(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall _NetrJobDel(a)12(wstr long long) NetrJobDel_wrapper +@ stdcall _NetrJobEnum(a)20(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall _NetrJobGetInfo(a)12(wstr long ptr) NetrJobGetInfo_wrapper @ stub _SAGetAccountInformation(a)16 @ stub _SAGetNSAccountInformation(a)12 @ stub _SASetAccountInformation(a)20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c1e903681..e747af6 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( hInst ); } +DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid) +{ + return NetrJobAdd(server_name, info, jobid); +} + +DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + return NetrJobDel(server_name, min_jobid, max_jobid); +} + +DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container, + DWORD max_length, LPDWORD total, LPDWORD resume) +{ + return NetrJobEnum(server_name, container, max_length, total, resume); +} + +DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info) +{ + return NetrJobGetInfo(server_name, jobid, info); +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n);

1 0

Nikolay Sivov : user32/menu: Return locked menu data when looking for menu items.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 387ba1d605b60499d1e173f93167397ce84da685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387ba1d605b60499d1e173f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 15:50:48 2018 +0300 user32/menu: Return locked menu data when looking for menu items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 564 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 352 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=387ba1d605b60499d1e1…

1 0

Józef Kucia : winebus: Print SDL error message when SDL cannot be initialized.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 142169960acacf673266f29dcf81e0427046e553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=142169960acacf673266f29d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 11 10:06:40 2018 +0200 winebus: Print SDL error message when SDL cannot be initialized. SDL_Init(SDL_INIT_HAPTIC) fails if SDL is built without haptic support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 03e7cb3..159727f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -910,7 +910,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) { - ERR("Can't Init SDL\n"); + ERR("Can't init SDL: %s\n", pSDL_GetError()); return STATUS_UNSUCCESSFUL; }

1 0