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

Piotr Caban : msvcr120: Add fmax implementation.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: ec2f02db0cdb8de2368696cbb34f994a8643d859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2f02db0cdb8de2368696cbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 26 14:54:40 2015 +0200 msvcr120: Add fmax implementation. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bf6159b..7fa5f89 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2164,9 +2164,9 @@ @ stub fma @ stub fmaf @ stub fmal -@ stub fmax -@ stub fmaxf -@ stub fmaxl +@ cdecl fmax(double double) MSVCR120_fmax +@ cdecl fmaxf(float float) MSVCR120_fmaxf +@ cdecl fmaxl(double double) MSVCR120_fmax @ stub fmin @ stub fminf @ stub fminl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 903120b..271e2f0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1833,9 +1833,9 @@ @ stub fma @ stub fmaf @ stub fmal -@ stub fmax -@ stub fmaxf -@ stub fmaxl +@ cdecl fmax(double double) msvcr120.fmax +@ cdecl fmaxf(float float) msvcr120.fmaxf +@ cdecl fmaxl(double double) msvcr120.fmaxl @ stub fmin @ stub fminf @ stub fminl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7c971d3..f796dd9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2605,3 +2605,31 @@ short CDECL MSVCR120__ldtest(LDOUBLE *x) { return MSVCR120__dclass(*x); } + +/********************************************************************* + * fmaxf (MSVCR120.@) + */ +float CDECL MSVCR120_fmaxf(float x, float y) +{ + if(isnanf(x)) + return y; + if(isnanf(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? y : x; + return x<y ? y : x; +} + +/********************************************************************* + * fmax (MSVCR120.@) + */ +double CDECL MSVCR120_fmax(double x, double y) +{ + if(isnan(x)) + return y; + if(isnan(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? y : x; + return x<y ? y : x; +}

1 0

Nikolay Sivov : riched20: Support setting boolean font properties.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 38f69193123b499f4cc283033b9d0e91461200f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f69193123b499f4cc283033… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:18:48 2015 +0300 riched20: Support setting boolean font properties. --- dlls/riched20/richole.c | 175 ++++++++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38f69193123b499f4cc28…

1 0

Nikolay Sivov : riched20: Initial support for changing font properties.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 64faf03cf3248d6fed7b89d9246e4b13f20300db URL: http://source.winehq.org/git/wine.git/?a=commit;h=64faf03cf3248d6fed7b89d92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:17:02 2015 +0300 riched20: Initial support for changing font properties. --- dlls/riched20/richole.c | 90 ++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index eb803e7..063522b 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -237,6 +237,7 @@ typedef struct ITextFontImpl { ITextRange *range; textfont_prop_val props[FONT_PROPID_LAST]; BOOL get_cache_enabled; + BOOL set_cache_enabled; } ITextFontImpl; typedef struct ITextParaImpl { @@ -556,6 +557,75 @@ static HRESULT get_textfont_propl(const ITextFontImpl *font, enum textfont_prop_ return hr; } +/* Value should already have a terminal value, for boolean properties it means tomToggle is not handled */ +static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id propid, const textfont_prop_val *value) +{ + const IRichEditOleImpl *reole; + ME_Cursor from, to; + CHARFORMAT2W fmt; + LONG start, end; + + /* when font is not attached to any range use cache */ + if (!font->range || font->set_cache_enabled) { + font->props[propid] = *value; + return S_OK; + } + + if (!(reole = get_range_reole(font->range))) + return CO_E_RELEASED; + + memset(&fmt, 0, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + fmt.dwMask = textfont_prop_masks[propid]; + + switch (propid) + { + case FONT_ITALIC: + fmt.dwEffects = value->l == tomTrue ? CFE_ITALIC : 0; + break; + default: + FIXME("unhandled font property %d\n", propid); + return E_FAIL; + } + + ITextRange_GetStart(font->range, &start); + ITextRange_GetEnd(font->range, &end); + + ME_CursorFromCharOfs(reole->editor, start, &from); + ME_CursorFromCharOfs(reole->editor, end, &to); + ME_SetCharFormat(reole->editor, &from, &to, &fmt); + + return S_OK; +} + +static HRESULT set_textfont_propd(ITextFontImpl *font, enum textfont_prop_id propid, LONG value) +{ + textfont_prop_val v; + + switch (value) + { + case tomUndefined: + return S_OK; + case tomToggle: { + LONG oldvalue; + get_textfont_propl(font, propid, &oldvalue); + if (oldvalue == tomFalse) + value = tomTrue; + else if (oldvalue == tomTrue) + value = tomFalse; + else + return E_INVALIDARG; + /* fallthrough */ + } + case tomTrue: + case tomFalse: + v.l = value; + return set_textfont_prop(font, propid, &v); + default: + return E_INVALIDARG; + } +} + static HRESULT textfont_getname_from_range(ITextRange *range, BSTR *ret) { const IRichEditOleImpl *reole; @@ -2178,6 +2248,13 @@ static void textfont_reset_to_undefined(ITextFontImpl *font) } } +static void textfont_apply_range_props(ITextFontImpl *font) +{ + enum textfont_prop_id propid; + for (propid = FONT_PROPID_FIRST; propid < FONT_PROPID_LAST; propid++) + set_textfont_prop(font, propid, &font->props[propid]); +} + static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); @@ -2201,6 +2278,13 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) case tomTrackParms: This->get_cache_enabled = FALSE; break; + case tomApplyLater: + This->set_cache_enabled = TRUE; + break; + case tomApplyNow: + This->set_cache_enabled = FALSE; + textfont_apply_range_props(This); + break; default: FIXME("reset mode %d not supported\n", value); } @@ -2366,8 +2450,8 @@ static HRESULT WINAPI TextFont_GetItalic(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, value); + return set_textfont_propd(This, FONT_ITALIC, value); } static HRESULT WINAPI TextFont_GetKerning(ITextFont *iface, FLOAT *value) @@ -2675,6 +2759,7 @@ static HRESULT create_textfont(ITextRange *range, const ITextFontImpl *src, ITex if (src) { font->range = NULL; font->get_cache_enabled = TRUE; + font->set_cache_enabled = TRUE; memcpy(&font->props, &src->props, sizeof(font->props)); if (font->props[FONT_NAME].str) font->props[FONT_NAME].str = SysAllocString(font->props[FONT_NAME].str); @@ -2685,6 +2770,7 @@ static HRESULT create_textfont(ITextRange *range, const ITextFontImpl *src, ITex /* cache current properties */ font->get_cache_enabled = FALSE; + font->set_cache_enabled = FALSE; textfont_cache_range_props(font); } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 72cb1db..adb96c3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2214,6 +2214,13 @@ static void test_ITextFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); test_textfont_global_defaults(font2); + hr = ITextFont_SetItalic(font2, tomUndefined); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font2, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + hr = ITextFont_Reset(font2, tomCacheParms); ok(hr == S_OK, "got 0x%08x\n", hr); test_textfont_global_defaults(font2); @@ -2292,6 +2299,48 @@ static void test_ITextFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(value == tomTrue, "got %d\n", value); + /* tomApplyLater */ + hr = ITextFont_Reset(font, tomApplyLater); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_SetItalic(font, tomFalse); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == CFE_ITALIC, "got 0x%08x\n", cf.dwEffects); + + hr = ITextFont_Reset(font, tomApplyNow); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == 0, "got 0x%08x\n", cf.dwEffects); + + hr = ITextFont_SetItalic(font, tomUndefined); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + hr = ITextFont_SetItalic(font, tomAutoColor); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cf.dwEffects = 0; + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok((cf.dwEffects & CFE_ITALIC) == 0, "got 0x%08x\n", cf.dwEffects); + ITextRange_Release(range); ITextFont_Release(font); release_interfaces(&hwnd, &reOle, &doc, NULL);

1 0

Thomas Faller : vbscript: Fix for unchecked memory access.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 06dfe8fcd6e82ceb4adf4cee576e676f59d24778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dfe8fcd6e82ceb4adf4cee5… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sat May 23 18:58:00 2015 +0200 vbscript: Fix for unchecked memory access. --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1a20527..129d6ce 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1827,7 +1827,7 @@ static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, assert(2 <= args_cnt && args_cnt <= 4); - if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || V_VT(args+2) == VT_NULL) + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (args_cnt > 2 && V_VT(args+2) == VT_NULL)) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); hres = to_string(args, &str1);

1 0

Qian Hong : atl: Added stub AtlIPersistPropertyBag_Save.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 852f6a5bccc0ce37dd06509dd866e2f4d6023b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=852f6a5bccc0ce37dd06509dd… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue May 26 16:43:43 2015 +0800 atl: Added stub AtlIPersistPropertyBag_Save. --- dlls/atl/atl.c | 12 ++++++++++++ dlls/atl/atl.spec | 2 +- dlls/atl100/atl100.spec | 2 +- dlls/atl110/atl110.spec | 2 +- dlls/atl80/atl80.spec | 2 +- dlls/atl90/atl90.spec | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 795ca9b..23be343 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -286,6 +286,18 @@ HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pE } /*********************************************************************** + * AtlIPersistPropertyBag_Save [atl100.@] + */ +HRESULT WINAPI AtlIPersistPropertyBag_Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, + BOOL fSaveAll, ATL_PROPMAP_ENTRY *pMap, + void *pThis, IUnknown *pUnk) +{ + FIXME("(%p, %d, %d, %p, %p, %p)\n", pPropBag, fClearDirty, fSaveAll, pMap, pThis, pUnk); + + return S_OK; +} + +/*********************************************************************** * AtlModuleAddTermFunc [atl100.@] */ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index aa0f44b..da12228 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -44,7 +44,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 25fad3d..80b4b16 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -36,7 +36,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 25fad3d..80b4b16 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -36,7 +36,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index f313944..e82fba0 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -38,7 +38,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 25fad3d..80b4b16 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -36,7 +36,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long)

1 0

Austin English : version: Move GetFileVersionInfoSize(A/W) implemementation to GetFileVersionInfoSizeEx(A/W).
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: e3ae89e8e204eb7948f7edfb869d171acdb71a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ae89e8e204eb7948f7edfb8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 18:23:58 2015 -0700 version: Move GetFileVersionInfoSize(A/W) implemementation to GetFileVersionInfoSizeEx(A/W). --- dlls/version/version.c | 51 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 68dab66..bcc6d01 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -607,11 +607,34 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { + return GetFileVersionInfoSizeExW( 0, filename, handle ); +} + +/*********************************************************************** + * GetFileVersionInfoSizeA [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) +{ + return GetFileVersionInfoSizeExA( 0, filename, handle ); +} + +/****************************************************************************** + * GetFileVersionInfoSizeExW [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD handle ) +{ DWORD len, offset, magic = 1; HFILE lzfd; HMODULE hModule; OFSTRUCT ofs; + if (flags) + { + FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + TRACE("(%s,%p)\n", debugstr_w(filename), handle ); if (handle) *handle = 0; @@ -676,10 +699,10 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) } } -/*********************************************************************** - * GetFileVersionInfoSizeA [VERSION.@] +/****************************************************************************** + * GetFileVersionInfoSizeExA [VERSION.@] */ -DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) +DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD handle ) { UNICODE_STRING filenameW; DWORD retval; @@ -691,7 +714,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) else filenameW.Buffer = NULL; - retval = GetFileVersionInfoSizeW(filenameW.Buffer, handle); + retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle); RtlFreeUnicodeString(&filenameW); @@ -1615,26 +1638,6 @@ DWORD WINAPI VerInstallFileW( } /****************************************************************************** - * GetFileVersionInfoSizeExA [VERSION.@] - */ -DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle) -{ - FIXME("stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/****************************************************************************** - * GetFileVersionInfoSizeExW [VERSION.@] - */ -DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle) -{ - FIXME("stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/****************************************************************************** * GetFileVersionInfoExA [VERSION.@] */ BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data)

1 0

Bruno Jesus : user32/tests: Add tests for GetRawInputDeviceList.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 1bba9674d9e3902e20dc7d5f94352b1e0c556cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bba9674d9e3902e20dc7d5f9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 25 16:11:56 2015 -0300 user32/tests: Add tests for GetRawInputDeviceList. --- dlls/user32/tests/input.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a67c74..7639b66 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -77,6 +77,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); +static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -160,6 +161,7 @@ static void init_function_pointers(void) GET_PROC(SendInput) GET_PROC(GetMouseMovePointsEx) + GET_PROC(GetRawInputDeviceList) #undef GET_PROC } @@ -1486,6 +1488,51 @@ static void test_GetMouseMovePointsEx(void) #undef MYERROR } +static void test_GetRawInputDeviceList(void) +{ + RAWINPUTDEVICELIST devices[32]; + UINT ret, devcount, odevcount; + DWORD err; + + SetLastError(0xdeadbeef); + ret = pGetRawInputDeviceList(NULL, NULL, 0); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetRawInputDeviceList(NULL, NULL, sizeof(devices[0])); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_NOACCESS, "expected 998, got %d\n", err); + + devcount = 0; + ret = pGetRawInputDeviceList(NULL, &devcount, sizeof(devices[0])); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(devcount > 0, "expected non-zero\n"); + + SetLastError(0xdeadbeef); + devcount = 0; + ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); + err = GetLastError(); + ok(ret == -1, "expected -1, got %d\n", ret); +todo_wine + ok(err == ERROR_INSUFFICIENT_BUFFER, "expected 122, got %d\n", err); + ok(devcount > 0, "expected non-zero\n"); + + /* devcount contain now the correct number of devices */ + ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); + ok(ret > 0, "expected non-zero\n"); + + /* check if variable changes from larger to smaller value */ + devcount = odevcount = sizeof(devices) / sizeof(devices[0]); + ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); + ok(ret > 0, "expected non-zero\n"); + ok(devcount == odevcount, "expected %d, got %d\n", devcount, odevcount); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2353,4 +2400,9 @@ START_TEST(input) test_GetMouseMovePointsEx(); else win_skip("GetMouseMovePointsEx is not available\n"); + + if(pGetRawInputDeviceList) + test_GetRawInputDeviceList(); + else + win_skip("GetRawInputDeviceList is not available\n"); }

1 0

Piotr Caban : msvcr120: Add copysign export.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: e1de0eeae416f31203ec6a666614a2b0f8ab33b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1de0eeae416f31203ec6a666… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 25 19:11:11 2015 +0200 msvcr120: Add copysign export. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 811dcee..bf6159b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2087,9 +2087,9 @@ @ stub conj @ stub conjf @ stub conjl -@ stub copysign -@ stub copysignf -@ stub copysignl +@ cdecl copysign(double double) MSVCRT__copysign +@ cdecl copysignf(float float) MSVCRT__copysignf +@ cdecl copysignl(double double) MSVCRT__copysign @ cdecl cos(double) MSVCRT_cos @ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf @ cdecl cosh(double) MSVCRT_cosh diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2ac7ab9..903120b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1756,9 +1756,9 @@ @ stub conj @ stub conjf @ stub conjl -@ stub copysign -@ stub copysignf -@ stub copysignl +@ cdecl copysign(double double) msvcr120.copysign +@ cdecl copysignf(float float) msvcr120.copysignf +@ cdecl copysignl(double double) msvcr120.copysignl @ cdecl cos(double) msvcr120.cos @ cdecl -arch=arm,x86_64 cosf(float) msvcr120.cosf @ cdecl cosh(double) msvcr120.cosh

1 0

Jacek Caban : mshtml: Pass EventTarget to call_event_handlers.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 9981890397550ed5e332f0fac4357f6c6598a7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981890397550ed5e332f0fac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 15:45:09 2015 +0200 mshtml: Pass EventTarget to call_event_handlers. --- dlls/mshtml/htmlevent.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 596c171..254b864 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -966,18 +966,15 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, event_target_t *event_target, +static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { + event_target_t *data = get_event_target_data(event_target, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; - handler_vector_t *handler_vector = NULL; VARIANT v; HRESULT hres; - if(event_target) - handler_vector = event_target->event_table[eid]; - - if(handler_vector && handler_vector->handler_prop) { + if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -987,7 +984,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&v) = VT_EMPTY; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(handler_vector->handler_prop, &dp, &v); + hres = call_disp_func(data->event_table[eid]->handler_prop, &dp, &v); if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); @@ -1005,7 +1002,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } - if(handler_vector && handler_vector->handler_cnt) { + if(data && data->event_table[eid] && data->event_table[eid]->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; int i; @@ -1013,13 +1010,13 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)event_obj; - i = handler_vector->handler_cnt; + i = data->event_table[eid]->handler_cnt; while(i--) { - if(handler_vector->handlers[i]) { + if(data->event_table[eid]->handlers[i]) { V_VT(&v) = VT_EMPTY; TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_disp_func(handler_vector->handlers[i], &dp, &v); + hres = call_disp_func(data->event_table[eid]->handlers[i], &dp, &v); if(hres == S_OK) { TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i); @@ -1121,8 +1118,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e do { hres = get_node(doc, nsnode, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), - node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); + call_event_handlers(doc, event_obj, &node->event_target, node->cp_container, eid, + script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1150,8 +1147,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e if(NS_SUCCEEDED(nsres) && nsbody) { hres = get_node(doc, (nsIDOMNode*)nsbody, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), - node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); + call_event_handlers(doc, event_obj, &node->event_target, node->cp_container, eid, + script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } nsIDOMHTMLElement_Release(nsbody); @@ -1160,7 +1157,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } } - call_event_handlers(doc, event_obj, doc->node.event_target.ptr, &doc->basedoc.cp_container, eid, + call_event_handlers(doc, event_obj, &doc->node.event_target, &doc->basedoc.cp_container, eid, script_this ? script_this : (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); break;

1 0

Nikolay Sivov : riched20: Implement tomTrackParms/tomCacheParms.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 1c0cf0efb324a72d843dcdf97b056703be387f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0cf0efb324a72d843dcdf97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:15:40 2015 +0300 riched20: Implement tomTrackParms/tomCacheParms. --- dlls/riched20/riched_tom.idl | 3 + dlls/riched20/richole.c | 152 +++++++++++++++++++++++++++++++++++------- dlls/riched20/tests/richole.c | 55 ++++++++++++++- include/tom.idl | 3 + 4 files changed, 189 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c0cf0efb324a72d843dc…

1 0