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

Nikolay Sivov : setupapi/tests: Skip a test if user is not allowed to open logging.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 98b991fdcf3f2cdbdae7d61203367ce9728a5e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b991fdcf3f2cdbdae7d6120… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 12:39:34 2015 +0300 setupapi/tests: Skip a test if user is not allowed to open logging. --- dlls/setupapi/tests/misc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index d5cfa01..09e0fb8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -789,6 +789,11 @@ static void test_SetupLogError(void) SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("SetupOpenLog() failed on insufficient permissions\n"); + return; + } ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Nikolay Sivov : dwrite: Fix breakpoint update logic.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 76577c8e4b3861957bc6165689c3e297b70737eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76577c8e4b3861957bc616568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 13:53:49 2015 +0300 dwrite: Fix breakpoint update logic. --- dlls/dwrite/layout.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0a95c4e..8ab1ef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -366,32 +366,36 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, layout->actual_breakpoints = heap_alloc(sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); if (!layout->actual_breakpoints) return E_OUTOFMEMORY; + memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); } - memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); for (i = cur->range.startPosition; i < cur->range.length + cur->range.startPosition; i++) { - UINT32 j = i + cur->range.startPosition; - if (i == 0) { - if (j) - layout->actual_breakpoints[j].breakConditionBefore = layout->actual_breakpoints[j-1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j-1].breakConditionAfter, before); + /* for first codepoint check if there's anything before it and update accordingly */ + if (i == cur->range.startPosition) { + if (i > 0) + layout->actual_breakpoints[i].breakConditionBefore = layout->actual_breakpoints[i-1].breakConditionAfter = + override_break_condition(layout->actual_breakpoints[i-1].breakConditionAfter, before); else - layout->actual_breakpoints[j].breakConditionBefore = before; - - layout->actual_breakpoints[j].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionBefore = before; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } - - layout->actual_breakpoints[j].isWhitespace = 0; - layout->actual_breakpoints[j].isSoftHyphen = 0; - - if (i == cur->range.length - 1) { - layout->actual_breakpoints[j].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; - if (j < layout->len - 1) - layout->actual_breakpoints[j].breakConditionAfter = layout->actual_breakpoints[j+1].breakConditionAfter = - override_break_condition(layout->actual_breakpoints[j+1].breakConditionAfter, before); + /* similar check for last codepoint */ + else if (i == cur->range.startPosition + cur->range.length - 1) { + if (i == layout->len - 1) + layout->actual_breakpoints[i].breakConditionAfter = after; else - layout->actual_breakpoints[j].breakConditionAfter = before; + layout->actual_breakpoints[i].breakConditionAfter = layout->actual_breakpoints[i+1].breakConditionBefore = + override_break_condition(layout->actual_breakpoints[i+1].breakConditionBefore, after); + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } + /* for all positions within a range disable breaks */ + else { + layout->actual_breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + } + + layout->actual_breakpoints[i].isWhitespace = FALSE; + layout->actual_breakpoints[i].isSoftHyphen = FALSE; } return S_OK;

1 0

André Hentschel : Add WWN 391
by Jeremy Newman May 22, 2015

May 22, 2015

Module: website Branch: master Commit: 541599da59f39fec48f00bfb95693d2b66abb50d URL: http://source.winehq.org/git/website.git/?a=commit;h=541599da59f39fec48f00b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 22 16:37:11 2015 +0200 Add WWN 391 --- news/de/2015052201.xml | 10 + news/en/2015052201.xml | 10 + wwn/en/wn20150522_391.xml | 556 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 576 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=541599da59f39fec48…

1 0

Huw Davies : riched20/tests: Fix test on 64-bit.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 008ceb662dd617feeea80273c5310fb09b9e046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=008ceb662dd617feeea80273c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:17:21 2015 +0100 riched20/tests: Fix test on 64-bit. --- dlls/riched20/tests/richole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5472ce1..51e5631 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -525,8 +525,11 @@ static void test_ITextSelection_GetText(void) hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); - hres = ITextSelection_GetText(txtSel, NULL); - ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + if (!is64bit) + { + hres = ITextSelection_GetText(txtSel, NULL); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + } ITextSelection_Release(txtSel); }

1 0

Piotr Caban : msvcp120: Add _Do_call implementation.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: d20c5965f1a29a2469125beb36bda03e995d583d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20c5965f1a29a2469125beb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:19:06 2015 +0200 msvcp120: Add _Do_call implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c87eb66..f43ed92 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3742,7 +3742,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b84a380..f2330df 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f89543f..b5b4301 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -45,6 +45,7 @@ static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); +static void (CDECL *p__Do_call)(void *this); static HMODULE msvcp; @@ -64,6 +65,7 @@ static BOOL init(void) p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); + p__Do_call = (void*)GetProcAddress(msvcp, "_Do_call"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -244,6 +246,31 @@ static void test__Call_once(void) ok(once == 1, "once = %x\n", once); } +static void **vtbl_func0; +#ifdef __i386__ +/* TODO: this should be a __thiscall function */ +static void __stdcall thiscall_func(void) +{ + cnt = 1; +} +#else +static void __cdecl thiscall_func(void *this) +{ + ok(this == &vtbl_func0, "incorrect this value\n"); + cnt = 1; +} +#endif + +static void test__Do_call(void) +{ + void *pfunc = thiscall_func; + + cnt = 0; + vtbl_func0 = &pfunc; + p__Do_call(&vtbl_func0); + ok(cnt == 1, "func was not called\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -251,6 +278,7 @@ START_TEST(msvcp120) test_xtime_get(); test__Getcvt(); test__Call_once(); + test__Do_call(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bdfea8b..dd3f6df 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm msvcp120._Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) msvcp120._Do_call @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 22f90c8..c8bb2bd 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -663,6 +663,11 @@ void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) TRACE("%p %p\n", once, func); _Call_onceEx(once, call_once_func_wrapper, func); } + +void __cdecl _Do_call(void *this) +{ + CALL_VTBL_FUNC(this, 0, void, (void*), (this)); +} #endif void init_misc(void *base)

1 0

Nikolay Sivov : dwrite: Fix splitting by bidi levels.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 90ed96a766b4b627a5dd18d601b41257c4f8e390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ed96a766b4b627a5dd18d60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:27:51 2015 +0300 dwrite: Fix splitting by bidi levels. --- dlls/dwrite/layout.c | 38 ++++++++++++++------------------------ dlls/dwrite/tests/analyzer.c | 7 +++++++ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 11d69d8..0a95c4e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2750,15 +2750,17 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); struct layout_run *cur_run; + TRACE("%u %u %u %u\n", position, length, explicitLevel, resolvedLevel); + LIST_FOR_EACH_ENTRY(cur_run, &layout->runs, struct layout_run, entry) { struct regular_layout_run *cur = &cur_run->u.regular; - struct layout_run *run, *run2; + struct layout_run *run; if (cur_run->kind == LAYOUT_RUN_INLINE) continue; /* FIXME: levels are reported in a natural forward direction, so start loop from a run we ended on */ - if (position < cur->descr.textPosition || position > cur->descr.textPosition + cur->descr.stringLength) + if (position < cur->descr.textPosition || position >= cur->descr.textPosition + cur->descr.stringLength) continue; /* full hit - just set run level */ @@ -2775,35 +2777,23 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink continue; } - /* now starting point is in a run, so it splits it */ + /* all fully covered runs are processed at this point, reuse existing run for remaining + reported bidi range and add another run for the rest of original one */ + run = alloc_layout_run(LAYOUT_RUN_REGULAR); if (!run) return E_OUTOFMEMORY; *run = *cur_run; - run->u.regular.descr.textPosition = position; - run->u.regular.descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; - run->u.regular.descr.string = &layout->str[position]; - run->u.regular.run.bidiLevel = resolvedLevel; - cur->descr.stringLength -= position - cur->descr.textPosition; + run->u.regular.descr.textPosition = position + length; + run->u.regular.descr.stringLength = cur->descr.stringLength - length; + run->u.regular.descr.string = &layout->str[position + length]; - list_add_after(&cur_run->entry, &run->entry); - - if (position + length == run->u.regular.descr.textPosition + run->u.regular.descr.stringLength) - break; + /* reduce existing run */ + cur->run.bidiLevel = resolvedLevel; + cur->descr.stringLength -= length; - /* split second time */ - run2 = alloc_layout_run(LAYOUT_RUN_REGULAR); - if (!run2) - return E_OUTOFMEMORY; - - *run2 = *cur_run; - run2->u.regular.descr.textPosition = run->u.regular.descr.textPosition + run->u.regular.descr.stringLength; - run2->u.regular.descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; - run2->u.regular.descr.string = &layout->str[run2->u.regular.descr.textPosition]; - run->u.regular.descr.stringLength -= run2->u.regular.descr.stringLength; - - list_add_after(&run->entry, &run2->entry); + list_add_after(&cur_run->entry, &run->entry); break; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 0043526..43c2a66 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -878,6 +878,13 @@ static struct sa_test sa_tests[] = { {0x2d30,0x2d4a,0}, 1, { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* LRE/PDF */ + {0x202a,0x202c,'a','b','c','\r',0}, 3, + { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, + { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 5, 1, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : riched20: Added some tom* constants used with ITextFont:: Reset().
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 1f55764dfcf67cd09f0dd233f99698961c93d692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f55764dfcf67cd09f0dd233f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:46:43 2015 +0300 riched20: Added some tom* constants used with ITextFont::Reset(). --- dlls/riched20/riched_tom.idl | 16 ++++++++++++---- dlls/riched20/richole.c | 4 ++-- include/tom.idl | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/riched_tom.idl b/dlls/riched20/riched_tom.idl index c5e1fe6..4cacbe0 100644 --- a/dlls/riched20/riched_tom.idl +++ b/dlls/riched20/riched_tom.idl @@ -46,10 +46,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3a4eb3b..5c6acb4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1821,14 +1821,14 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret) static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *ret) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, ret); + FIXME("(%p)->(%p %p): stub\n", This, font, ret); return E_NOTIMPL; } static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p)->(%d): stub\n", This, value); return E_NOTIMPL; } diff --git a/include/tom.idl b/include/tom.idl index 769e31b..343906d 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -33,10 +33,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0,

1 0

Michael Müller : wbemprox: Add support for Win32_SystemEnclosure.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 96b5d9aa973dade6d93b504ee19c536cb10e5e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b5d9aa973dade6d93b504ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 16 21:46:13 2015 +0200 wbemprox: Add support for Win32_SystemEnclosure. From: Michael Müller <michael(a)fds-team.de> --- dlls/wbemprox/builtin.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 12 +++++----- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1f51c5..b55e9ad 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -98,6 +98,8 @@ static const WCHAR class_sidW[] = {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; +static const WCHAR class_systemenclosureW[] = + {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; @@ -133,6 +135,8 @@ static const WCHAR prop_capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; +static const WCHAR prop_chassistypesW[] = + {'C','h','a','s','s','i','s','T','y','p','e','s',0}; static const WCHAR prop_classW[] = {'C','l','a','s','s',0}; static const WCHAR prop_codesetW[] = @@ -225,6 +229,8 @@ static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_lockpresentW[] = + {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -590,6 +596,16 @@ static const struct column col_stdregprov[] = { method_enumvaluesW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_getstringvalueW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_systemenclosure[] = +{ + { prop_captionW, CIM_STRING }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_descriptionW, CIM_STRING }, + { prop_lockpresentW, CIM_BOOLEAN }, + { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING }, + { prop_tagW, CIM_STRING }, +}; static const struct column col_systemsecurity[] = { { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, @@ -702,6 +718,12 @@ static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; +static const WCHAR systemenclosure_systemenclosureW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',0}; +static const WCHAR systemenclosure_tagW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',' ','0',0}; +static const WCHAR systemenclosure_manufacturerW[] = + {'W','i','n','e',0}; static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = @@ -960,6 +982,16 @@ struct record_systemsecurity class_method *getsd; class_method *setsd; }; +struct record_systemenclosure +{ + const WCHAR *caption; + const struct array *chassistypes; + const WCHAR *description; + int lockpresent; + const WCHAR *manufacturer; + const WCHAR *name; + const WCHAR *tag; +}; struct record_videocontroller { const WCHAR *adapter_dactype; @@ -1044,6 +1076,27 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_enum_key, reg_enum_values, reg_get_stringvalue } }; +static UINT16 systemenclosure_chassistypes[] = +{ + 1, +}; +static const struct array systemenclosure_chassistypes_array = +{ + SIZEOF(systemenclosure_chassistypes), + &systemenclosure_chassistypes +}; +static const struct record_systemenclosure data_systemenclosure[] = +{ + { + systemenclosure_systemenclosureW, + &systemenclosure_chassistypes_array, + systemenclosure_systemenclosureW, + FALSE, + systemenclosure_manufacturerW, + systemenclosure_systemenclosureW, + systemenclosure_tagW, + } +}; static const struct record_systemsecurity data_systemsecurity[] = { { security_get_sd, security_set_sd } @@ -2817,6 +2870,7 @@ static struct table builtin_classes[] = { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, + { class_systemenclosureW, SIZEOF(col_systemenclosure), col_systemenclosure, SIZEOF(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } }; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index bc85e62..a7bf201 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -437,10 +437,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - todo_wine ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - if (hr != S_OK) - goto done; type = 0xdeadbeef; VariantInit( &val ); @@ -455,6 +452,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); @@ -467,8 +465,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); - for (i = 0; i < upper - lower + 1; i++) - trace( "chassis type: %u\n", data[i] ); + if (V_VT( &val ) == (VT_I4|VT_ARRAY)) + { + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + } hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); } @@ -520,7 +521,6 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantClear( &val ); IWbemClassObject_Release( obj ); -done: IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Sebastian Lackner : wbemprox/tests: Add tests for Win32_SystemEnclosure.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: 856b03501a2ff896aad58a43dad272bd2aa7005e URL: http://source.winehq.org/git/wine.git/?a=commit;h=856b03501a2ff896aad58a43d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 22 07:55:14 2015 +0200 wbemprox/tests: Add tests for Win32_SystemEnclosure. --- dlls/wbemprox/tests/query.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 56c97ff..bc85e62 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -412,6 +412,120 @@ out: SysFreeString( wql ); } +static void test_Win32_SystemEnclosure( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR chassistypesW[] = {'C','h','a','s','s','i','s','T','y','p','e','s',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR tagW[] = {'T','a','g',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + DWORD *data; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + todo_wine + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + if (hr != S_OK) + goto done; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); + ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + if (SUCCEEDED(hr)) + { + LONG i, lower, upper; + + hr = SafeArrayGetLBound( V_ARRAY( &val ), 1, &lower ); + ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); + hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); + ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + } + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get description %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, lockpresentW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get lockpresent %08x\n", hr ); + ok( V_VT( &val ) == VT_BOOL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_BOOLEAN, "unexpected type 0x%x\n", type ); + trace( "lockpresent: %u\n", V_BOOL( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, tagW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get tag %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "tag: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); +done: + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -828,6 +942,7 @@ START_TEST(query) test_Win32_Process( services ); test_Win32_Service( services ); test_Win32_ComputerSystem( services ); + test_Win32_SystemEnclosure( services ); test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services );

1 0

Piotr Caban : msvcp120: Added _Call_once implementation.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: a7a3cd84b5581ccb1ac06a7788b4982c0deecde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a3cd84b5581ccb1ac06a778… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:18:58 2015 +0200 msvcp120: Added _Call_once implementation. --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 35 +++++++++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3be4944..c87eb66 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3727,8 +3727,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index d8187d5..b84a380 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 32ca437..f89543f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -43,6 +43,8 @@ static int (__cdecl *p_isleadbyte)(int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); +static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static HMODULE msvcp; @@ -60,6 +62,8 @@ static BOOL init(void) p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); + p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); + p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -190,12 +194,63 @@ static void test__Getcvt(void) } } +static int cnt; +static int once; + +static void __cdecl call_once_func(void) +{ + ok(!once, "once != 0\n"); + cnt += 0x10000; +} + +static void __cdecl call_once_ex_func(void *arg) +{ + int *i = arg; + + ok(!once, "once != 0\n"); + (*i)++; +} + +DWORD WINAPI call_once_thread(void *arg) +{ + p__Call_once(&once, call_once_func); + return 0; +} + +DWORD WINAPI call_once_ex_thread(void *arg) +{ + p__Call_onceEx(&once, call_once_ex_func, &cnt); + return 0; +} + +static void test__Call_once(void) +{ + HANDLE h[4]; + int i; + + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 0x10000, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); + + once = cnt = 0; + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_ex_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 1, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); +} + START_TEST(msvcp120) { if(!init()) return; test__Xtime_diff_to_millis2(); test_xtime_get(); test__Getcvt(); + test__Call_once(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bd949be..bdfea8b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAA_JPB_W_J(a)Z @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) msvcp120.?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) msvcp120._Call_once +@ cdecl _Call_onceEx(ptr ptr ptr) msvcp120._Call_onceEx @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 51b2a67..22f90c8 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -630,6 +630,41 @@ void __asm_dummy_vtables(void) { #endif #endif +#if _MSVCP_VER >= 110 +static CRITICAL_SECTION call_once_cs; +static CRITICAL_SECTION_DEBUG call_once_cs_debug = +{ + 0, 0, &call_once_cs, + { &call_once_cs_debug.ProcessLocksList, &call_once_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": call_once_cs") } +}; +static CRITICAL_SECTION call_once_cs = { &call_once_cs_debug, -1, 0, 0, 0, 0 }; + +void __cdecl _Call_onceEx(int *once, void (__cdecl *func)(void*), void *argv) +{ + TRACE("%p %p %p\n", once, func, argv); + + EnterCriticalSection(&call_once_cs); + if(!*once) { + /* FIXME: handle exceptions */ + func(argv); + *once = 1; + } + LeaveCriticalSection(&call_once_cs); +} + +void __cdecl call_once_func_wrapper(void *func) +{ + ((void (__cdecl*)(void))func)(); +} + +void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) +{ + TRACE("%p %p\n", once, func); + _Call_onceEx(once, call_once_func_wrapper, func); +} +#endif + void init_misc(void *base) { #ifdef __x86_64__

1 0