November 2017 - Wine-commits

Alexandre Julliard : ntdll: Add a platform-specific helper for starting a process.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: afb16abc0f058df09a379020704e0f5553ddd7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb16abc0f058df09a3790207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 17:11:10 2017 +0100 ntdll: Add a platform-specific helper for starting a process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 20 ++--------------- dlls/ntdll/ntdll_misc.h | 5 +++-- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm.c | 32 +++++++++++++++++++++------- dlls/ntdll/signal_arm64.c | 36 ++++++++++++++++++++++++++++--- dlls/ntdll/signal_i386.c | 52 +++++++++++++++++++++++++++++++-------------- dlls/ntdll/signal_powerpc.c | 36 ++++++++++++++++++++++++++++--- dlls/ntdll/signal_x86_64.c | 42 ++++++++++++++++++++++++++---------- 8 files changed, 165 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb16abc0f058df09a379…

1 0

Alexandre Julliard : ntdll: Add a platform-specific helper for starting a thread.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 53e4c36ef8c0720b61b03bb40d5992225c2771f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e4c36ef8c0720b61b03bb40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 19:42:53 2017 +0100 ntdll: Add a platform-specific helper for starting a thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm64.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 35 +++++++++++++++++++++++++++++++++-- dlls/ntdll/signal_powerpc.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 23 +++-------------------- 7 files changed, 161 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index cab8d6d..d3a37e8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -68,6 +68,7 @@ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; +extern NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 2a68946..3ff8c91 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -62,6 +62,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -1012,6 +1013,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d1e4021..e0e424e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -59,6 +59,7 @@ #include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -883,6 +884,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /*********************************************************************** * start_process */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7914ff5..074ad3b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -69,6 +69,9 @@ #undef ERR /* Solaris needs to define this */ +WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); + /* not defined for x86, so copy the x86_64 definition */ typedef struct DECLSPEC_ALIGN(16) _M128A { @@ -468,8 +471,6 @@ typedef struct trapframe ucontext_t; #error You must define the signal context functions for your platform #endif /* linux */ -WINE_DEFAULT_DEBUG_CHANNEL(seh); - typedef int (*wine_signal_handler)(unsigned int sig); static const size_t teb_size = 4096; /* we reserve one page for the TEB */ @@ -2601,6 +2602,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 209339a..c5b3fdb 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -59,6 +59,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); static pthread_key_t teb_key; @@ -1085,6 +1086,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /*********************************************************************** * start_process */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b81bfc0..024af8e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -73,6 +73,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(relay); struct _DISPATCHER_CONTEXT; @@ -3143,6 +3144,36 @@ void signal_init_process(void) } +struct startup_info +{ + LPTHREAD_START_ROUTINE entry; + void *arg; +}; + +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + call_thread_entry_point( info->entry, info->arg ); +} + + +/*********************************************************************** + * signal_start_thread + */ +NTSTATUS signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + NTSTATUS status; + struct startup_info info = { entry, arg }; + + if (!(status = wine_call_on_stack( attach_dlls, (void *)1, NtCurrentTeb()->Tib.StackBase ))) + { + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); + wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + } + return status; +} + + /********************************************************************** * signal_start_process */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 80f4780..18d0fe1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -47,7 +47,6 @@ #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); -WINE_DECLARE_DEBUG_CHANNEL(relay); struct _KUSER_SHARED_DATA *user_shared_data = NULL; @@ -491,29 +490,13 @@ void exit_thread( int status ) /*********************************************************************** - * thread_startup - */ -static void thread_startup( void *param ) -{ - struct startup_info *info = param; - PRTL_THREAD_START_ROUTINE func = info->entry_point; - void *arg = info->entry_arg; - - attach_dlls( (void *)1 ); - - TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", func, arg ); - - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); -} - - -/*********************************************************************** * start_thread * * Startup routine for a newly created thread. */ static void start_thread( struct startup_info *info ) { + NTSTATUS status; TEB *teb = info->teb; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; struct debug_info debug_info; @@ -525,8 +508,8 @@ static void start_thread( struct startup_info *info ) signal_init_thread( teb ); server_init_thread( info->entry_point ); - - wine_switch_to_stack( thread_startup, info, teb->Tib.StackBase ); + status = signal_start_thread( (LPTHREAD_START_ROUTINE)info->entry_point, info->entry_arg ); + NtTerminateThread( GetCurrentThread(), status ); }

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_DeleteExpiredTaskAfter.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: f8483297a520761acdd4645718df8d5bd5ac2f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8483297a520761acdd464571… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:30 2017 +0100 taskschd: Implement ITaskSettings_put_DeleteExpiredTaskAfter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7c5dca3..894f4c4 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1196,8 +1196,16 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR delay) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(delay)); - return E_NOTIMPL; + + if (delay && !(str = heap_strdupW(delay))) return E_OUTOFMEMORY; + heap_free(taskset->delete_expired_task_after); + taskset->delete_expired_task_after = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *priority) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fe54bff..f15e214 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1138,6 +1138,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Priority(set, test->priority); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1147,9 +1150,6 @@ todo_wine return; } - hr = ITaskSettings_put_Priority(set, test->priority); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Compatibility(set, test->compatibility); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Priority.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 484055e85130ca4a3e7ed1edddabd68c5438c030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484055e85130ca4a3e7ed1edd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:31 2017 +0100 taskschd: Implement ITaskSettings_put_Priority. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 894f4c4..33ec2b4 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1223,8 +1223,13 @@ static HRESULT WINAPI TaskSettings_get_Priority(ITaskSettings *iface, INT *prior static HRESULT WINAPI TaskSettings_put_Priority(ITaskSettings *iface, INT priority) { - FIXME("%p,%d: stub\n", iface, priority); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, priority); + + taskset->priority = priority; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY *level) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f15e214..74c3ae4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1141,6 +1141,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Priority(set, test->priority); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Compatibility(set, test->compatibility); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1150,9 +1153,6 @@ todo_wine return; } - hr = ITaskSettings_put_Compatibility(set, test->compatibility); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Hidden(set, test->hidden); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Compatibility.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: c9c86fbc42e46de040529bb2d669d7bbe21bddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c86fbc42e46de040529bb2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:32 2017 +0100 taskschd: Implement ITaskSettings_put_Compatibility. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 33ec2b4..32baaae 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1247,8 +1247,13 @@ static HRESULT WINAPI TaskSettings_get_Compatibility(ITaskSettings *iface, TASK_ static HRESULT WINAPI TaskSettings_put_Compatibility(ITaskSettings *iface, TASK_COMPATIBILITY level) { - FIXME("%p,%d: stub\n", iface, level); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, level); + + taskset->compatibility = level; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL *hidden) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74c3ae4..5d39766 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1144,6 +1144,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Compatibility(set, test->compatibility); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Hidden(set, test->hidden); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1153,9 +1156,6 @@ todo_wine return; } - hr = ITaskSettings_put_Hidden(set, test->hidden); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Hidden.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 5a7f0bedf21259a6499081b53e60c9cb301e37c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7f0bedf21259a6499081b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:33 2017 +0100 taskschd: Implement ITaskSettings_put_Hidden. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 32baaae..d2b5d58 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1271,8 +1271,13 @@ static HRESULT WINAPI TaskSettings_get_Hidden(ITaskSettings *iface, VARIANT_BOOL static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL hidden) { - FIXME("%p,%d: stub\n", iface, hidden); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, hidden); + + taskset->hidden = hidden ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_IdleSettings(ITaskSettings *iface, IIdleSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5d39766..a2acda3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1147,6 +1147,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Hidden(set, test->hidden); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1156,9 +1159,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_RunOnlyIfIdle.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 1107e77b58ff8e058c04e2c0cfca99ea29f30aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1107e77b58ff8e058c04e2c0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:34 2017 +0100 taskschd: Implement ITaskSettings_put_RunOnlyIfIdle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d2b5d58..e64abde 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1307,8 +1307,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfIdle(ITaskSettings *iface, VARIA static HRESULT WINAPI TaskSettings_put_RunOnlyIfIdle(ITaskSettings *iface, VARIANT_BOOL run) { - FIXME("%p,%d: stub\n", iface, run); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, run); + + taskset->run_only_if_idle = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_WakeToRun(ITaskSettings *iface, VARIANT_BOOL *wake) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a2acda3..9054c54 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1150,6 +1150,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfIdle(set, test->run_only_if_idle); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1159,9 +1162,6 @@ todo_wine return; } - hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_WakeToRun.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 412a4a0620ffa9f2c380c876ec6a0cc46da13335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a4a0620ffa9f2c380c876e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:35 2017 +0100 taskschd: Implement ITaskSettings_put_WakeToRun. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 8 +------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e64abde..4172b37 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1331,8 +1331,13 @@ static HRESULT WINAPI TaskSettings_get_WakeToRun(ITaskSettings *iface, VARIANT_B static HRESULT WINAPI TaskSettings_put_WakeToRun(ITaskSettings *iface, VARIANT_BOOL wake) { - FIXME("%p,%d: stub\n", iface, wake); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, wake); + + taskset->wake_to_run = wake ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_NetworkSettings(ITaskSettings *iface, INetworkSettings **settings) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9054c54..dfa4f1a 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1153,16 +1153,10 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_WakeToRun(set, test->wake_to_run); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - ITaskSettings_Release(set); - return; - } hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); +todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: set IIdleSettings and INetworkSettings */

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_AllowDemandStart.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: f1861146766697ad7e701a7ae8fd9650851bb64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1861146766697ad7e701a7ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 29 10:05:36 2017 +0100 taskschd: Implement ITaskSettings_put_AllowDemandStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 4172b37..731c22d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -898,8 +898,13 @@ static HRESULT WINAPI TaskSettings_get_AllowDemandStart(ITaskSettings *iface, VA static HRESULT WINAPI TaskSettings_put_AllowDemandStart(ITaskSettings *iface, VARIANT_BOOL allow) { - FIXME("%p,%d: stub\n", iface, allow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, allow); + + taskset->allow_on_demand_start = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BSTR *interval) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index dfa4f1a..07083af 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1156,7 +1156,6 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_AllowDemandStart(set, test->allow_on_demand_start); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: set IIdleSettings and INetworkSettings */

1 0

Huw Davies : ole32: Make the synthesize helpers return a STGMEDIUM.
by Alexandre Julliard 29 Nov '17

29 Nov '17

Module: wine Branch: master Commit: 251e6edae5ddc5b998b0855f507d4e8e3a125349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251e6edae5ddc5b998b0855f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 29 09:28:45 2017 +0000 ole32: Make the synthesize helpers return a STGMEDIUM. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index da7a536..c550c75 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -958,12 +958,12 @@ static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, return S_OK; } -static HGLOBAL synthesize_dib( HBITMAP bm ) +static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); BITMAPINFOHEADER header; BITMAPINFO *bmi; - HGLOBAL ret = 0; + HRESULT hr = E_FAIL; DWORD header_size; memset( &header, 0, sizeof(header) ); @@ -971,55 +971,64 @@ static HGLOBAL synthesize_dib( HBITMAP bm ) if (!GetDIBits( hdc, bm, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS )) goto done; header_size = bitmap_info_size( (BITMAPINFO *)&header, DIB_RGB_COLORS ); - if (!(ret = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; - bmi = GlobalLock( ret ); + if (!(med->u.hGlobal = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; + bmi = GlobalLock( med->u.hGlobal ); memset( bmi, 0, header_size ); memcpy( bmi, &header, header.biSize ); GetDIBits( hdc, bm, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); - GlobalUnlock( ret ); + GlobalUnlock( med->u.hGlobal ); + med->tymed = TYMED_HGLOBAL; + med->pUnkForRelease = NULL; + hr = S_OK; done: ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HBITMAP synthesize_bitmap( HGLOBAL dib ) +static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) { - HBITMAP ret = 0; + HRESULT hr = E_FAIL; BITMAPINFO *bmi; HDC hdc = GetDC( 0 ); if ((bmi = GlobalLock( dib ))) { /* FIXME: validate data size */ - ret = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), - bmi, DIB_RGB_COLORS ); + med->u.hBitmap = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, + (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), + bmi, DIB_RGB_COLORS ); GlobalUnlock( dib ); + med->tymed = TYMED_GDI; + med->pUnkForRelease = NULL; + hr = S_OK; } ReleaseDC( 0, hdc ); - return ret; + return hr; } -static HENHMETAFILE synthesize_emf( HMETAFILEPICT data ) +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) { METAFILEPICT *pict; - HENHMETAFILE emf = 0; + HRESULT hr = E_FAIL; UINT size; void *bits; - if (!(pict = GlobalLock( data ))) return 0; + if (!(pict = GlobalLock( data ))) return hr; size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) { GetMetaFileBitsEx( pict->hMF, size, bits ); - emf = SetWinMetaFileBits( size, bits, NULL, pict ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; } GlobalUnlock( data ); - return emf; + return hr; } static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, @@ -1028,6 +1037,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, BOOL fRelease) { STGMEDIUM copy; + HRESULT hr; if ((!cache_entry->fmtetc.cfFormat && !formatetc->cfFormat) || (cache_entry->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) || @@ -1042,17 +1052,16 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, if (formatetc->cfFormat == CF_BITMAP) { - copy.tymed = TYMED_HGLOBAL; - copy.u.hGlobal = synthesize_dib( stgmedium->u.hBitmap ); - copy.pUnkForRelease = NULL; + hr = synthesize_dib( stgmedium->u.hBitmap, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; } else if (formatetc->cfFormat == CF_METAFILEPICT && cache_entry->fmtetc.cfFormat == CF_ENHMETAFILE) { - copy.tymed = TYMED_ENHMF; - copy.u.hEnhMetaFile = synthesize_emf( stgmedium->u.hMetaFilePict ); + hr = synthesize_emf( stgmedium->u.hMetaFilePict, &copy ); + if (FAILED(hr)) return hr; if (fRelease) ReleaseStgMedium(stgmedium); stgmedium = © fRelease = TRUE; @@ -1079,12 +1088,8 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fm return OLE_E_BLANK; if (fmt->cfFormat == CF_BITMAP) - { - stgmedium->tymed = TYMED_GDI; - stgmedium->u.hBitmap = synthesize_bitmap( cache_entry->stgmedium.u.hGlobal ); - stgmedium->pUnkForRelease = NULL; - return S_OK; - } + return synthesize_bitmap( cache_entry->stgmedium.u.hGlobal, stgmedium ); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, stgmedium, &cache_entry->stgmedium); }

1 0