November 2017 - Wine-Commits

Jacek Caban : mshtml: Return S_OK in IHTMLStyle2::put_behavior.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: a0561068e3987e08d80d492de17e505d5934d75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0561068e3987e08d80d492de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:31:33 2017 +0100 mshtml: Return S_OK in IHTMLStyle2::put_behavior. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 12ce92b..fcec264 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3256,7 +3256,7 @@ static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle2_get_behavior(IHTMLStyle2 *iface, BSTR *p)

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Enabled.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 196a97740e2ca0a001ab97f85d48be937426d6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=196a97740e2ca0a001ab97f85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:22:00 2017 +0100 taskschd: Implement ITaskSettings_put_Enabled. 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 | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7d0d8fa..7c5dca3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1165,8 +1165,13 @@ static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOO static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOOL enabled) { - FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, enabled); + + taskset->enabled = enabled ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR *delay) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f710219..fe54bff 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1132,6 +1132,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Enabled(set, test->enabled); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->delete_expired_task_after[0]) + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); + else + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1141,12 +1147,6 @@ todo_wine return; } - if (!test->delete_expired_task_after[0]) - 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); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_ExecutionTimeLimit.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 64c08e68c03862ec5773cbde2584567a78199f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c08e68c03862ec5773cbde2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:59 2017 +0100 taskschd: Implement ITaskSettings_put_ExecutionTimeLimit. 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 188944f..7d0d8fa 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1138,8 +1138,16 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_ExecutionTimeLimit(ITaskSettings *iface, BSTR limit) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(limit)); - return E_NOTIMPL; + + if (limit && !(str = heap_strdupW(limit))) return E_OUTOFMEMORY; + heap_free(taskset->execution_time_limit); + taskset->execution_time_limit = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9e3e381..f710219 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1129,6 +1129,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Enabled(set, test->enabled); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1138,9 +1141,6 @@ todo_wine return; } - hr = ITaskSettings_put_Enabled(set, test->enabled); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->delete_expired_task_after[0]) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 2032eedfa65cc00e15d6b829c777570052282582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2032eedfa65cc00e15d6b829c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:55 2017 +0100 taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries. 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 70340be..0419ed0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1023,8 +1023,13 @@ static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL disallow) { - FIXME("%p,%d: stub\n", iface, disallow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, disallow); + + taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL *allow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e2f85b1..4d038e1 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1114,6 +1114,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) 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); + + hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1123,9 +1126,6 @@ todo_wine return; } - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Fabian Maurer : gdi32: In AddFaceToList allow fonts with long names and add tests.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 6f790606c0befdf5c683d4a20789470c43b6f6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f790606c0befdf5c683d4a20… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:17 2017 +0100 gdi32: In AddFaceToList allow fonts with long names and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 45 +++++++++++-------------- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 143 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f790606c0befdf5c683d…

1 0

Piotr Caban : msvcrt: Set errno when close() is called on already closed fd.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 67926ec8c344db4250f1e74a5943d0b8a536e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67926ec8c344db4250f1e74a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:48:33 2017 +0100 msvcrt: Set errno when close() is called on already closed fd. Based on a patch by Olly Betts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5eaee2b..1e662e9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1051,7 +1051,7 @@ int CDECL MSVCRT__close(int fd) if (fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; ret = -1; - } else if (!(info->wxflag & WX_OPEN)) { + } else if (!MSVCRT_CHECK_PMT_ERR(info->wxflag & WX_OPEN, MSVCRT_EBADF)) { ret = -1; } else if (fd == MSVCRT_STDOUT_FILENO && info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 99ceb97..00f5e7e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2466,6 +2466,12 @@ static void test_close(void) ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); ok(close(fd2), "close(fd2) succeeded\n"); + /* test close on already closed fd */ + errno = 0xdeadbeef; + ret1 = close(fd1); + ok(ret1 == -1, "close(fd1) succeeded\n"); + ok(errno == 9, "errno = %d\n", errno); + /* test close on stdout and stderr that use the same handle */ h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);

1 0

Piotr Caban : msvcp90: Use correct locale in basic_ios:: narrow and basic_ios::widen.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 53bab55d303dd8ee8ce696b94c47718feb7bc3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bab55d303dd8ee8ce696b94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:13:43 2017 +0100 msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/tests/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9ae9e65..3f85997 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5880,7 +5880,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12) char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PAV32@@Z */ @@ -5953,7 +5953,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8) char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ @@ -6161,7 +6161,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12) char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@2(a)PAV32@@Z */ @@ -6248,7 +6248,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8) wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 90fa6b1..5dcb1d4 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -496,10 +496,14 @@ static basic_ostream_wchar* (*__thiscall p_basic_ostream_short_print_ushort)(bas /* basic_ios */ static locale* (*__thiscall p_basic_ios_char_imbue)(basic_ios_char*, locale*, const locale*); +static basic_ios_char* (*__thiscall p_basic_ios_char_ctor)(basic_ios_char*); +static char (*__thiscall p_basic_ios_char_widen)(basic_ios_char*, char); +static void (*__thiscall p_basic_ios_char_dtor)(basic_ios_char*); static locale* (*__thiscall p_basic_ios_wchar_imbue)(basic_ios_wchar*, locale*, const locale*); /* ios_base */ +static void (*__thiscall p_ios_base__Init)(ios_base*); static IOSB_iostate (*__thiscall p_ios_base_rdstate)(const ios_base*); static IOSB_fmtflags (*__thiscall p_ios_base_setf_mask)(ios_base*, IOSB_fmtflags, IOSB_fmtflags); static void (*__thiscall p_ios_base_unsetf)(ios_base*, IOSB_fmtflags); @@ -724,6 +728,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IEAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QEBAHXZ"); SET(p_ios_base_setf_mask, @@ -735,6 +741,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IEAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); @@ -856,6 +868,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBAHXZ"); SET(p_ios_base_setf_mask, @@ -867,6 +881,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); @@ -987,6 +1007,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAEXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBEHXZ"); SET(p_ios_base_setf_mask, @@ -998,6 +1020,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBEDD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); @@ -2331,6 +2359,20 @@ static void test_istream_read_complex_double(void) } } +static void test_basic_ios(void) +{ + basic_ios_char bi; + char c; + + call_func1(p_basic_ios_char_ctor, &bi); + call_func1(p_ios_base__Init, &bi.base); + + c = (UINT_PTR)call_func2(p_basic_ios_char_widen, &bi, 'a'); + ok(c == 'a', "basic_ios::widen('a') returned %x\n", c); + + call_func1(p_basic_ios_char_dtor, &bi); +} + START_TEST(ios) { if(!init()) @@ -2356,6 +2398,7 @@ START_TEST(ios) test_ostream_print_complex_double(); test_ostream_print_complex_ldouble(); test_istream_read_complex_double(); + test_basic_ios(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Sergio Gómez Del Real : ole32: Add DIB saving in data cache, and relevant tests.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 51c8fa65740ce9b3c041493fba052500d0f82e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c8fa65740ce9b3c041493fb… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Tue Nov 28 13:01:06 2017 -0500 ole32: Add DIB saving in data cache, and relevant tests. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- dlls/ole32/tests/ole2.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 0256957..da7a536 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -838,6 +838,29 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag } break; } + case CF_DIB: + { + header.dwSize = GlobalSize(cache_entry->stgmedium.u.hGlobal); + if (header.dwSize) + { + const BITMAPINFO *bmi = GlobalLock(cache_entry->stgmedium.u.hGlobal); + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) + { + header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter ); + header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter ); + } + else + { + HDC hdc = GetDC(0); + header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX) ); + header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY) ); + ReleaseDC(0, hdc); + } + GlobalUnlock(cache_entry->stgmedium.u.hGlobal); + } + break; + } default: break; } @@ -866,20 +889,32 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag IStream_Release(pres_stream); return DV_E_STGMEDIUM; } - data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); - GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); + if (header.dwSize) + { + data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); + GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); + GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); + if (data) + { + hr = IStream_Write(pres_stream, data, header.dwSize, NULL); + HeapFree(GetProcessHeap(), 0, data); + } + } } break; } + case CF_DIB: + { + data = GlobalLock(cache_entry->stgmedium.u.hGlobal); + if (header.dwSize) + hr = IStream_Write(pres_stream, data, header.dwSize, NULL); + GlobalUnlock(cache_entry->stgmedium.u.hGlobal); + break; + } default: break; } - if (data) - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - HeapFree(GetProcessHeap(), 0, data); - IStream_Release(pres_stream); return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 59a0fe1..88ad207 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4092,6 +4092,12 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) return stg; } +static const BYTE dib_inf[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00 +}; + static const BYTE mf_rec[] = { 0xd7, 0xcd, 0xc6, 0x9a, 0x00, 0x00, 0x00, 0x00, @@ -4107,6 +4113,23 @@ static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *st switch (cf) { + case CF_DIB: + data_size = sizeof(dib); + if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) + { + data_size += sizeof(dib_inf); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(data, dib_inf, sizeof(dib_inf)); + memcpy(data + sizeof(dib_inf), dib, sizeof(dib)); + } + else + { + data = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(data, dib, sizeof(dib)); + } + stg_def->stream[stm_idx].data = data; + stg_def->stream[stm_idx].data_size = data_size; + break; case CF_METAFILEPICT: mfpict = GlobalLock(U(stg_med)->hMetaFilePict); data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); @@ -4133,6 +4156,9 @@ static void get_stgmedium(CLIPFORMAT cfFormat, STGMEDIUM *stgmedium) { switch (cfFormat) { + case CF_DIB: + create_dib(stgmedium); + break; case CF_METAFILEPICT: create_mfpict(stgmedium); break; @@ -4164,6 +4190,15 @@ static void test_data_cache_save_data(void) { { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + }, + 1, 1, &CLSID_WineTest, + { + &CLSID_WineTest, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + { + { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, 1, 1, &CLSID_WineTest,

1 0

Sergio Gómez Del Real : ole32/tests: Add some tests for testing metafiles.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 0f0e2173e739407c435ed43db5f5de3b1be4f279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0e2173e739407c435ed43db… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Tue Nov 28 13:01:05 2017 -0500 ole32/tests: Add some tests for testing metafiles. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index a72985e..59a0fe1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -229,6 +229,24 @@ static void create_bitmap( STGMEDIUM *med ) med->pUnkForRelease = NULL; } +static void create_mfpict(STGMEDIUM *med) +{ + METAFILEPICT *mf; + HDC hdc = CreateMetaFileW(NULL); + + Rectangle(hdc, 0, 0, 100, 200); + + med->tymed = TYMED_MFPICT; + U(med)->hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + mf = GlobalLock(U(med)->hMetaFilePict); + mf->mm = MM_ANISOTROPIC; + mf->xExt = 100; + mf->yExt = 200; + mf->hMF = CloseMetaFile(hdc); + GlobalUnlock(U(med)->hMetaFilePict); + med->pUnkForRelease = NULL; +} + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); @@ -3939,7 +3957,7 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ int clipformat = -1; PresentationDataHeader header; char name[32]; - BYTE data[256]; + BYTE data[1024]; memset(&header, 0, sizeof(header)); @@ -4074,6 +4092,143 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) return stg; } +static const BYTE mf_rec[] = +{ + 0xd7, 0xcd, 0xc6, 0x9a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x16, 0x00, 0x2d, 0x00, 0x40, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x6a, 0x55 +}; + +static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *stg_med, int stm_idx) +{ + BYTE *data; + int data_size; + METAFILEPICT *mfpict; + + switch (cf) + { + case CF_METAFILEPICT: + mfpict = GlobalLock(U(stg_med)->hMetaFilePict); + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) + { + data = HeapAlloc(GetProcessHeap(), 0, data_size + sizeof(mf_rec)); + memcpy(data, mf_rec, sizeof(mf_rec)); + GetMetaFileBitsEx(mfpict->hMF, data_size, data + sizeof(mf_rec)); + data_size += sizeof(mf_rec); + } + else + { + data = HeapAlloc(GetProcessHeap(), 0, data_size); + GetMetaFileBitsEx(mfpict->hMF, data_size, data); + } + GlobalUnlock(U(stg_med)->hMetaFilePict); + stg_def->stream[stm_idx].data_size = data_size; + stg_def->stream[stm_idx].data = data; + break; + } +} + +static void get_stgmedium(CLIPFORMAT cfFormat, STGMEDIUM *stgmedium) +{ + switch (cfFormat) + { + case CF_METAFILEPICT: + create_mfpict(stgmedium); + break; + default: + ok(0, "cf %x not implemented\n", cfFormat); + } +} + +#define MAX_FMTS 5 +static void test_data_cache_save_data(void) +{ + HRESULT hr; + STGMEDIUM stgmed; + ILockBytes *ilb; + IStorage *doc; + IOleCache2 *cache; + IPersistStorage *persist; + int enumerated_streams, matched_streams, i; + DWORD dummy; + struct tests_data_cache + { + FORMATETC fmts[MAX_FMTS]; + int num_fmts, num_set; + const CLSID *clsid; + struct storage_def stg_def; + }; + + static struct tests_data_cache *pdata, data[] = + { + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_WineTest, + { + &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + { + { + { 0 } + } + } + }; + + /* test _Save after caching directly through _Cache + _SetData */ + for (pdata = data; pdata->clsid != NULL; pdata++) + { + hr = CreateDataCache(NULL, pdata->clsid, &IID_IOleCache2, (void **)&cache); + ok(hr == S_OK, "unexpected %#x\n", hr); + + for (i = 0; i < pdata->num_fmts; i++) + { + hr = IOleCache2_Cache(cache, &pdata->fmts[i], 0, &dummy); + ok(SUCCEEDED(hr), "unexpected %#x\n", hr); + if (i < pdata->num_set) + { + get_stgmedium(pdata->fmts[i].cfFormat, &stgmed); + get_stgdef(&pdata->stg_def, pdata->fmts[i].cfFormat, &stgmed, i); + hr = IOleCache2_SetData(cache, &pdata->fmts[i], &stgmed, TRUE); + ok(hr == S_OK, "unexpected %#x\n", hr); + } + } + + /* create Storage in memory where we'll save cache */ + hr = CreateILockBytesOnHGlobal(0, TRUE, &ilb); + ok(hr == S_OK, "unexpected %#x\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); + ok(hr == S_OK, "unexpected %#x\n", hr); + ILockBytes_Release(ilb); + hr = IStorage_SetClass(doc, pdata->clsid); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + + /* cache entries are dirty. test saving them to stg */ + trace("IPersistStorage_Save:\n"); + hr = IPersistStorage_Save(persist, doc, FALSE); + ok(hr == S_OK, "unexpected %#x\n", hr); + + check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == pdata->stg_def.stream_count, "created %d != def streams %d\n", + enumerated_streams, pdata->stg_def.stream_count); + + for (i = 0; i < pdata->num_set; i++) + HeapFree(GetProcessHeap(), 0, (void *)pdata->stg_def.stream[i].data); + + IPersistStorage_Release(persist); + IStorage_Release(doc); + IOleCache2_Release(cache); + } +} + static void test_data_cache_contents(void) { HRESULT hr; @@ -4199,6 +4354,7 @@ START_TEST(ole2) test_OleDraw(); test_OleDoAutoConvert(); test_data_cache_save(); + test_data_cache_save_data(); test_data_cache_contents(); CoUninitialize();

1 0

Alex Henrie : wevtapi: Add EvtOpenSession stub.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: d91cf685e1fadf90c5103393a2ea0bef1ed78a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91cf685e1fadf90c5103393a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:49 2017 -0700 wevtapi: Add EvtOpenSession stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index e4cf995..50696ba 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -44,6 +44,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD timeout, DWORD flags) +{ + FIXME("(%u %p %u %u) stub\n", login_class, login, timeout, flags); + return NULL; +} + BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index fef3ec0..070fd09 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -35,7 +35,7 @@ @ stub EvtOpenLog @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata -@ stub EvtOpenSession +@ stdcall EvtOpenSession(long ptr long long) @ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender @ stub EvtSaveChannelConfig diff --git a/include/winevt.h b/include/winevt.h index 53ffe44..6d2ef1a 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -53,6 +53,10 @@ typedef enum _EVT_CHANNEL_CONFIG_PROPERTY_ID { EvtChannelConfigPropertyIdEND } EVT_CHANNEL_CONFIG_PROPERTY_ID; +typedef enum _EVT_LOGIN_CLASS { + EvtRpcLogin = 1 +} EVT_LOGIN_CLASS; + typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionError = 0, EvtSubscribeActionDeliver

1 0

Jacek Caban : server: Use default_fd_signaled for named pipe client.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 0a11448968d521a070ee15099636544c016b72b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a11448968d521a070ee15099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:35:34 2017 +0100 server: Use default_fd_signaled for named pipe client. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index f594664..8c50278 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -191,7 +191,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); -static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -202,7 +201,7 @@ static const struct object_ops pipe_client_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - pipe_client_signaled, /* signaled */ + default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ @@ -306,13 +305,6 @@ static void pipe_client_dump( struct object *obj, int verbose ) fprintf( stderr, "Named pipe client server=%p\n", client->server ); } -static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct pipe_client *client = (struct pipe_client *) obj; - - return client->pipe_end.fd && is_fd_signaled(client->pipe_end.fd); -} - static void named_pipe_destroy( struct object *obj) { struct named_pipe *pipe = (struct named_pipe *) obj; @@ -377,7 +369,7 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status pipe_end->connection = NULL; - if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); + fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); async_wake_up( &pipe_end->read_q, status ); LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) {

1 0

Nikolay Sivov : mshtml/tests: Test return values in more places (Coverity) .
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: f6d58e69e182da420d16c2822dc49270e13102d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d58e69e182da420d16c2822… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 28 14:18:15 2017 +0300 mshtml/tests: Test return values in more places (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 6 ++++-- dlls/mshtml/tests/events.c | 7 +++++-- dlls/mshtml/tests/script.c | 13 +++++++++---- dlls/mshtml/tests/style.c | 7 +++++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 48262bb..5128d2f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7742,7 +7742,8 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) dim.lLbound = 0; dim.cElements = 1; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&var); + hres = SafeArrayAccessData(sa, (void**)&var); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(var) = VT_BSTR; V_BSTR(var) = a2bstr(text); SafeArrayUnaccessData(sa); @@ -7764,7 +7765,8 @@ static void doc_complex_write(IHTMLDocument2 *doc) HRESULT hres; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&args); + hres = SafeArrayAccessData(sa, (void**)&args); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(args) = VT_BSTR; V_BSTR(args) = a2bstr("<body i4val=\""); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4f57745..bc8e045 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3129,6 +3129,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3138,9 +3139,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 243c10c..b07cce1 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1259,6 +1259,7 @@ static void load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -1266,9 +1267,11 @@ static void load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -2325,7 +2328,8 @@ static void test_script_run(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; - dispex_propput(document, id, 0, &var, NULL); + hres = dispex_propput(document, id, 0, &var, NULL); + ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2823,7 +2827,8 @@ static void report_data(ProtocolHandler *This) IServiceProvider_Release(service_provider); ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); - IUri_GetDisplayUri(This->uri, &url); + hres = IUri_GetDisplayUri(This->uri, &url); + ok(hres == S_OK, "Failed to get display uri: %08x\n", hres); hres = IHttpNegotiate_BeginningTransaction(http_negotiate, url, emptyW, 0, &addl_headers); ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); SysFreeString(url); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7fc04a4..73c074e 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -3144,6 +3144,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IPersistStreamInit *init; IStream *stream; IHTMLDocument2 *doc; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3155,9 +3156,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: ee12d7c917098a5c4b2d7306c27fef575986ce85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee12d7c917098a5c4b2d7306c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:58 2017 +0100 taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable. 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 | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 0903526..188944f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1107,8 +1107,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfNetworkAvailable(ITaskSettings * static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(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_network_available = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, BSTR *limit) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8a90993..9e3e381 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1123,6 +1123,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->execution_time_limit[0]) + hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); + else + hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1132,12 +1138,6 @@ todo_wine return; } - if (!test->execution_time_limit[0]) - hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); - else - hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Enabled(set, test->enabled); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_StartWhenAvailable.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 62dd24af4ab930d227cfab2bf5125d3c99fd52e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dd24af4ab930d227cfab2bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:57 2017 +0100 taskschd: Implement ITaskSettings_put_StartWhenAvailable. 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 508b233..0903526 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1071,8 +1071,13 @@ static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL start) { - FIXME("%p,%d: stub\n", iface, start); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, start); + + taskset->start_when_available = start ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ab061d5..8a90993 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1120,6 +1120,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1129,9 +1132,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->execution_time_limit[0]) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else

1 0

Jacek Caban : kernel32/tests: Silence noisy debug traces.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 4e9f4ee4a727387736fb6820bfd6848561753463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9f4ee4a727387736fb6820b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:38:22 2017 +0100 kernel32/tests: Silence noisy debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 132 ++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e9f4ee4a727387736fb6…

1 0

Alex Henrie : wevtapi: Add EvtOpenChannelEnum stub.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: 5b0f94f0f117bdc8b218458c398f051d798c33b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0f94f0f117bdc8b218458c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:47 2017 -0700 wevtapi: Add EvtOpenChannelEnum stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 0b88165..aa23c77 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -74,6 +74,12 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C return NULL; } +EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) +{ + FIXME("(%p %u) stub\n", session, flags); + return NULL; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 328b0db..149fe25 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -30,7 +30,7 @@ @ stub EvtNextEventMetadata @ stub EvtNextPublisherId @ stdcall EvtOpenChannelConfig(ptr wstr long) -@ stub EvtOpenChannelEnum +@ stdcall EvtOpenChannelEnum(ptr long) @ stub EvtOpenEventMetadataEnum @ stub EvtOpenLog @ stub EvtOpenPublisherEnum

1 0

Jacek Caban : mshtml: Added support for default removeEventListener capture argument.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: ed62ae5faa5d60330731100cb49aefc18b694238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed62ae5faa5d60330731100cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:31:27 2017 +0100 mshtml: Added support for default removeEventListener capture argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/events.js | 8 ++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d93a43e..0b9a36b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2188,6 +2188,27 @@ HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD f return S_FALSE; /* fallback to default */ } +HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + /* If only two arguments were given, implicitly set capture to false */ + if((flags & DISPATCH_METHOD) && dp->cArgs == 2 && !dp->cNamedArgs) { + VARIANT args[3]; + DISPPARAMS new_dp = {args, NULL, 3, 0}; + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + args[1] = dp->rgvarg[0]; + args[2] = dp->rgvarg[1]; + + TRACE("implicit capture\n"); + + return IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IEVENTTARGET_REMOVEEVENTLISTENER, + lcid, flags, &new_dp, res, ei, caller); + } + + return S_FALSE; /* fallback to default */ +} + static const IEventTargetVtbl EventTargetVtbl = { EventTarget_QueryInterface, EventTarget_AddRef, @@ -2238,6 +2259,7 @@ void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t comp { static const dispex_hook_t IEventTarget_hooks[] = { {DISPID_IEVENTTARGET_ADDEVENTLISTENER, IEventTarget_addEventListener_hook}, + {DISPID_IEVENTTARGET_REMOVEEVENTLISTENER, IEventTarget_removeEventListener_hook}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index d613c9d..9ec3db7 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -183,6 +183,14 @@ function test_add_remove_listener() { div.removeEventListener("click", listener, false); + /* test implicit capture removeEventListener argument */ + div.addEventListener("click", listener, false); + div.removeEventListener("click", listener); + + calls = ""; + div.click(); + ok(calls === "", "calls = " + calls); + next_test(); }

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_AllowHardTerminate.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: a883a26f0ffae10b9f0b571cc37c3db90d8abae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a883a26f0ffae10b9f0b571cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:56 2017 +0100 taskschd: Implement ITaskSettings_put_AllowHardTerminate. 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 0419ed0..508b233 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1047,8 +1047,13 @@ static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(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_hard_terminate = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL *start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4d038e1..ab061d5 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1117,6 +1117,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) 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); + + hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1126,9 +1129,6 @@ todo_wine return; } - hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Use heap_strdupW to allocate the interval in TaskSettings_put_RestartInterval.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: eb87ede3fed95129606951b5370a619bb2500585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb87ede3fed95129606951b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:54 2017 +0100 taskschd: Use heap_strdupW to allocate the interval in TaskSettings_put_RestartInterval. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e417c05..70340be 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -925,12 +925,12 @@ 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; + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(interval)); - if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; - SysFreeString(taskset->restart_interval); + if (interval && !(str = heap_strdupW(interval))) return E_OUTOFMEMORY; + heap_free(taskset->restart_interval); taskset->restart_interval = str; return S_OK;

1 0

Alex Henrie : wevtapi: Add EvtOpenLog stub.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: ed46a3268c2b5c088133df0e2266f7cabecc6221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed46a3268c2b5c088133df0e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:51 2017 -0700 wevtapi: Add EvtOpenLog stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 0dfe522..5b9949b 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -50,6 +50,12 @@ EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD return NULL; } +EVT_HANDLE WINAPI EvtOpenLog(EVT_HANDLE session, const WCHAR *path, DWORD flags) +{ + FIXME("(%p %s %u) stub\n", session, debugstr_w(path), flags); + return NULL; +} + BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 9f3edbf..e2bec57 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -32,7 +32,7 @@ @ stdcall EvtOpenChannelConfig(ptr wstr long) @ stdcall EvtOpenChannelEnum(ptr long) @ stub EvtOpenEventMetadataEnum -@ stub EvtOpenLog +@ stdcall EvtOpenLog(ptr wstr long) @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata @ stdcall EvtOpenSession(long ptr long long)

1 0

Alex Henrie : mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: d052ff0f3785b9beb744ebb19761808199dd2e1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d052ff0f3785b9beb744ebb19… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 23:03:35 2017 -0700 mmsystem.dll16: Pass through MCI_LIST, MCI_SETAUDIO, and MCI_SETVIDEO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/mci16.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index b356a44..d7a356d 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -134,8 +134,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l if (*lParam == 0) return MMSYSTEM_MAP_OK; /* FIXME: to add also (with seg/linear modifications to do): - * MCI_LIST, MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE - * MCI_SETAUDIO, MCI_SETTUNER, MCI_SETVIDEO + * MCI_LOAD, MCI_QUALITY, MCI_RESERVE, MCI_RESTORE, MCI_SAVE, MCI_SETTUNER */ switch (wMsg) { /* case MCI_CAPTURE */ @@ -148,6 +147,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_DELETE: case MCI_GETDEVCAPS: /* case MCI_INDEX: */ + case MCI_LIST: /* case MCI_MARK: */ /* case MCI_MONITOR: */ case MCI_PASTE: @@ -158,6 +158,8 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_RESUME: case MCI_SEEK: case MCI_SET: + case MCI_SETAUDIO: + case MCI_SETVIDEO: /* case MCI_SETTIMECODE:*/ /* case MCI_SIGNAL:*/ case MCI_SPIN:

1 0

Piotr Caban : msvcrt: Call cdecl functions with empty FPU stack in _CI* functions.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: wine Branch: master Commit: ee33d38c5041a8293c64257801572d1c742b0aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee33d38c5041a8293c6425780… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 27 20:29:44 2017 +0100 msvcrt: Call cdecl functions with empty FPU stack in _CI* functions. The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 269 ++++++++++++++++++++++------------------------------- 1 file changed, 111 insertions(+), 158 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf..0627bfa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -593,164 +593,117 @@ double CDECL MSVCRT_tanh( double x ) #if defined(__GNUC__) && defined(__i386__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/********************************************************************* - * _CIacos (MSVCRT.@) - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_acos(x); -} - -/********************************************************************* - * _CIasin (MSVCRT.@) - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_asin(x); -} - -/********************************************************************* - * _CIatan (MSVCRT.@) - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_atan(x); -} - -/********************************************************************* - * _CIatan2 (MSVCRT.@) - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_atan2(x,y); -} - -/********************************************************************* - * _CIcos (MSVCRT.@) - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cos(x); -} - -/********************************************************************* - * _CIcosh (MSVCRT.@) - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cosh(x); -} - -/********************************************************************* - * _CIexp (MSVCRT.@) - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return MSVCRT_exp(x); -} - -/********************************************************************* - * _CIfmod (MSVCRT.@) - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_fmod(x,y); -} - -/********************************************************************* - * _CIlog (MSVCRT.@) - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log(x); -} - -/********************************************************************* - * _CIlog10 (MSVCRT.@) - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log10(x); -} - -/********************************************************************* - * _CIpow (MSVCRT.@) - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_pow(x,y); -} - -/********************************************************************* - * _CIsin (MSVCRT.@) - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sin(x); -} - -/********************************************************************* - * _CIsinh (MSVCRT.@) - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sinh(x); -} - -/********************************************************************* - * _CIsqrt (MSVCRT.@) - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sqrt(x); -} - -/********************************************************************* - * _CItan (MSVCRT.@) - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tan(x); -} - -/********************************************************************* - * _CItanh (MSVCRT.@) - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tanh(x); -} - -/********************************************************************* - * _ftol (MSVCRT.@) - */ -LONGLONG CDECL MSVCRT__ftol(void) -{ - FPU_DOUBLE(x); - return (LONGLONG)x; -} +#define CREATE_FPU_FUNC1(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl (%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "movl $1, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl (%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $0, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +#define CREATE_FPU_FUNC2(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl 8(%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "fstpl (%esp)\n\t" \ + "fwait\n\t" \ + "movl $2, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl 8(%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $1, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +CREATE_FPU_FUNC1(_CIacos, MSVCRT_acos) +CREATE_FPU_FUNC1(_CIasin, MSVCRT_asin) +CREATE_FPU_FUNC1(_CIatan, MSVCRT_atan) +CREATE_FPU_FUNC2(_CIatan2, MSVCRT_atan2) +CREATE_FPU_FUNC1(_CIcos, MSVCRT_cos) +CREATE_FPU_FUNC1(_CIcosh, MSVCRT_cosh) +CREATE_FPU_FUNC1(_CIexp, MSVCRT_exp) +CREATE_FPU_FUNC2(_CIfmod, MSVCRT_fmod) +CREATE_FPU_FUNC1(_CIlog, MSVCRT_log) +CREATE_FPU_FUNC1(_CIlog10, MSVCRT_log10) +CREATE_FPU_FUNC2(_CIpow, MSVCRT_pow) +CREATE_FPU_FUNC1(_CIsin, MSVCRT_sin) +CREATE_FPU_FUNC1(_CIsinh, MSVCRT_sinh) +CREATE_FPU_FUNC1(_CIsqrt, MSVCRT_sqrt) +CREATE_FPU_FUNC1(_CItan, MSVCRT_tan) +CREATE_FPU_FUNC1(_CItanh, MSVCRT_tanh) + +__ASM_GLOBAL_FUNC(MSVCRT__ftol, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ + "fnstcw (%esp)\n\t" + "mov (%esp), %ax\n\t" + "or $0xc, %ax\n\t" + "mov %ax, 2(%esp)\n\t" + "fldcw 2(%esp)\n\t" + "fistpq 4(%esp)\n\t" + "fldcw (%esp)\n\t" + "movl 4(%esp), %eax\n\t" + "movl 8(%esp), %edx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret") #endif /* defined(__GNUC__) && defined(__i386__) */

1 0

Francois Gouget : testbot/WineSendLog: Fix the message warning there is no log.
by Alexandre Julliard Nov. 28, 2017

Nov. 28, 2017

Module: tools Branch: master Commit: 0a198869a3a61b17aee5ebb189e7817b6218be72 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a198869a3a61b17aee5ebb1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 28 12:08:32 2017 +0100 testbot/WineSendLog: Fix the message warning there is no log. Email it to the patch author instead of printing it to stdout where it will be lost. Also distinguish the 'empty test log' message from the 'no test log' one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index eadfe77..2e23976 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -284,7 +284,7 @@ EOF { if (! $HasLogEntries) { - print SENDMAIL "Empty log\n"; + print SENDMAIL "Empty test log and no error message\n"; } elsif ($StepTask->Type eq "build") { @@ -313,7 +313,7 @@ EOF close ERRFILE; if (! $HasErrEntries) { - print "Empty log"; + print SENDMAIL "No test log and no error message"; } else {

1 0

Lucian Poston : dwrite: Stub SetIncrementalTabStop with S_OK.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: d00f9bce6c40fc7a3a70ba03a52d5ece19b67545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00f9bce6c40fc7a3a70ba03a… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Thu Nov 23 09:31:02 2017 -0800 dwrite: Stub SetIncrementalTabStop with S_OK. Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index eda90ec..104b039 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4263,7 +4263,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextF { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat1(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *iface, DWRITE_TRIMMING const *trimming, @@ -5272,7 +5272,7 @@ static HRESULT WINAPI dwritetextformat_SetIncrementalTabStop(IDWriteTextFormat2 { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); FIXME("(%p)->(%f): stub\n", This, tabstop); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI dwritetextformat_SetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING const *trimming,

1 0

Hans Leidekker : taskschd: Return success from a couple of stubs.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: ca20711f110d69037d40d59c68ce930e720dc4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca20711f110d69037d40d59c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 27 10:41:18 2017 +0100 taskschd: Return success from a couple of stubs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 10562fe..5c81821 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 6a1acc8..cca5414 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 a71e1c1..65287b3 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);

1 0