wine-devel November 2017

wine-devel@winehq.org

68 participants
380 discussions

[PATCH 2/3] mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)

3 2

[PATCH 1/3] mlang: Implement IMLangFontLink2_MapFont, IMLangFontLink2_ReleaseFont and IMLangFontLink2_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 7 deletions(-)

2 1

Re: [PATCH 2/3] mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont.
by Ziqing Hui 27 Nov '17

27 Nov '17

>> @@ -2055,23 +2055,26 @@ static HRESULT WINAPI fnIMLangFontLink_MapFont( >> HFONT hSrcFont, >> HFONT* phDestFont) >> { >> - FIXME("\n"); >> - return E_NOTIMPL; >> + TRACE("(%p)->%p %08x %p %p\n",iface, hDC, dwCodePages, hSrcFont, phDestFont); >> + >> + return map_font(hDC, dwCodePages, hSrcFont, phDestFont); >> } >Is it correct that IMLangFontLink method does not give FIXME same way >IMLangFontLink2 does? It is correct. IMLangFontLink2 need a FIXME for the reason that it has a parameter "chSrc" which I just ignore in the implementation. While IMLangFontLink doesn't have this parameter. So it doesn't need a FIXME.

1 0

[PATCH] ucrtbase/tests: Properly use quotes
by Fabian Maurer 27 Nov '17

27 Nov '17

Don't know why it was like this, but it outputs "" #func "", which is wrong Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ucrtbase/tests/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 96de238848..ab86f46810 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -36,7 +36,7 @@ #define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -48,7 +48,7 @@ #define CHECK_CALLED(func) \ do { \ - ok(called_ ## func, "expected " #func "\n"); \ + ok(called_ ## func, "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE; \ }while(0) -- 2.15.0

2 1

[PATCH 5/5] taskschd: Implement ITaskSettings_put_StopIfGoingOnBatteries.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 12b2cb5d17..e417c05382 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -999,8 +999,13 @@ static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL stop) { - FIXME("%p,%d: stub\n", iface, stop); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, stop); + + taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL *disallow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 906d033d56..e2f85b1b73 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1111,6 +1111,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1120,9 +1123,6 @@ todo_wine return; } - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 4/5] taskschd: Implement ITaskSettings_put_MultipleInstances.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 683a20c114..12b2cb5d17 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -975,8 +975,13 @@ static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, T static HRESULT WINAPI TaskSettings_put_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY policy) { - FIXME("%p,%d: stub\n", iface, policy); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, policy); + + taskset->policy = policy; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL *stop) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index eac17340cd..906d033d56 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1108,6 +1108,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_MultipleInstances(set, test->policy); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1117,9 +1120,6 @@ todo_wine return; } - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 3/5] taskschd: Implement ITaskSettings_put_RestartCount.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 e184ca813a..683a20c114 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -951,8 +951,13 @@ static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *c static HRESULT WINAPI TaskSettings_put_RestartCount(ITaskSettings *iface, INT count) { - FIXME("%p,%d: stub\n", iface, count); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, count); + + taskset->restart_count = count; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY *policy) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0e1c2ebc3d..eac17340cd 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1105,6 +1105,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RestartCount(set, test->restart_count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_MultipleInstances(set, test->policy); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1114,9 +1117,6 @@ todo_wine return; } - hr = ITaskSettings_put_MultipleInstances(set, test->policy); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 2/5] taskschd: Implement ITaskSettings_put_RestartInterval.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 cca5414a3a..e184ca813a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -924,8 +924,16 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + BSTR str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(interval)); - return E_NOTIMPL; + + if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; + SysFreeString(taskset->restart_interval); + taskset->restart_interval = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *count) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65287b3f24..0e1c2ebc3d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1102,6 +1102,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_RestartInterval(set, NULL); else hr = ITaskSettings_put_RestartInterval(set, test->restart_interval); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RestartCount(set, test->restart_count); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1111,9 +1114,6 @@ todo_wine return; } - hr = ITaskSettings_put_RestartCount(set, test->restart_count); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_MultipleInstances(set, test->policy); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 1/5] taskschd: Return success from a couple of stubs.
by Hans Leidekker 27 Nov '17

27 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/regtask.c | 2 +- dlls/taskschd/task.c | 6 +++--- dlls/taskschd/tests/scheduler.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 10562fe08d..5c81821e69 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -181,7 +181,7 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * static HRESULT WINAPI regtask_put_Enabled(IRegisteredTask *iface, VARIANT_BOOL enabled) { FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI regtask_Run(IRegisteredTask *iface, VARIANT params, IRunningTask **task) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6a1acc81eb..cca5414a3a 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -184,7 +184,7 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(start)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_EndBoundary(IDailyTrigger *iface, BSTR *end) @@ -212,7 +212,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO { DailyTrigger *This = impl_from_IDailyTrigger(iface); FIXME("(%p)->(%x)\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_DaysInterval(IDailyTrigger *iface, short *days) @@ -711,7 +711,7 @@ static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) { FIXME("%p,%s: stub\n", iface, debugstr_variant(&sddl)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR *source) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a71e1c151b..65287b3f24 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -890,7 +890,6 @@ todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); -todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -- 2.11.0

1 0

[PATCH] shell32: add stub for Shell_NotifyIconGetRect
by Louis Lenders 27 Nov '17

27 Nov '17

This is part of bug https://bugs.winehq.org/attachment.cgi?id=59745

2 1

← Newer
1
...
7
8
9
10
11
12
13
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2017