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

Nikolay Sivov : riched20: Support setting boolean font properties.
by Alexandre Julliard 26 May '15

26 May '15

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

Thomas Faller : vbscript: Fix for unchecked memory access.
by Alexandre Julliard 26 May '15

26 May '15

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 26 May '15

26 May '15

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

Piotr Caban : msvcr120: Add fmax implementation.
by Alexandre Julliard 26 May '15

26 May '15

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

Piotr Caban : msvcr120: Add _dsign implementation.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 530d269e0187f2d0b406f8d5e3c4de974bf553ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=530d269e0187f2d0b406f8d5e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 26 14:54:49 2015 +0200 msvcr120: Add _dsign implementation. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120/tests/msvcr120.c | 24 ++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 16 ++++++++++++++++ 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7fa5f89..1d1196d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1109,7 +1109,7 @@ @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dosmaperr @ stub _dpcomp -@ stub _dsign +@ cdecl _dsign(double) MSVCR120__dsign @ extern _dstbias MSVCRT__dstbias @ cdecl _dtest(ptr) MSVCR120__dtest @ cdecl _dup(long) MSVCRT__dup @@ -1143,7 +1143,7 @@ @ cdecl _fdclass(float) MSVCR120__fdclass @ cdecl _fdopen(long str) MSVCRT__fdopen @ stub _fdpcomp -@ stub _fdsign +@ cdecl _fdsign(float) MSVCR120__fdsign @ cdecl _fdtest(ptr) MSVCR120__fdtest @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @@ -1391,7 +1391,7 @@ @ cdecl _kbhit() @ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldpcomp -@ stub _ldsign +@ cdecl _ldsign(double) MSVCR120__dsign @ cdecl _ldtest(ptr) MSVCR120__ldtest @ cdecl _lfind(ptr ptr ptr long ptr) @ stub _lfind_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index c0a582f..e7749a6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -61,6 +61,8 @@ struct MSVCRT_lconv static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); +static int (CDECL *p__dsign)(double); +static int (CDECL *p__fdsign)(float); static BOOL init(void) { @@ -76,6 +78,8 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p_localeconv = (void*)GetProcAddress(module, "localeconv"); p_wcstombs_s = (void*)GetProcAddress(module, "wcstombs_s"); + p__dsign = (void*)GetProcAddress(module, "_dsign"); + p__fdsign = (void*)GetProcAddress(module, "_fdsign"); return TRUE; } @@ -148,8 +152,28 @@ static void test_lconv(void) test_lconv_helper(locstrs[i]); } +static void test__dsign(void) +{ + int ret; + + ret = p__dsign(1); + ok(ret == 0, "p_dsign(1) = %x\n", ret); + ret = p__dsign(0); + ok(ret == 0, "p_dsign(0) = %x\n", ret); + ret = p__dsign(-1); + ok(ret == 0x8000, "p_dsign(-1) = %x\n", ret); + + ret = p__fdsign(1); + ok(ret == 0, "p_fdsign(1) = %x\n", ret); + ret = p__fdsign(0); + ok(ret == 0, "p_fdsign(0) = %x\n", ret); + ret = p__fdsign(-1); + ok(ret == 0x8000, "p_fdsign(-1) = %x\n", ret); +} + START_TEST(msvcr120) { if (!init()) return; test_lconv(); + test__dsign(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 271e2f0..7f6be1d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1050,7 +1050,7 @@ @ cdecl _difftime64(long long) msvcr120._difftime64 @ stub _dosmaperr @ stub _dpcomp -@ stub _dsign +@ cdecl _dsign(double) msvcr120._dsign @ extern _dstbias msvcr120._dstbias @ cdecl _dtest(ptr) msvcr120._dtest @ cdecl _dup(long) msvcr120._dup @@ -1073,7 +1073,7 @@ @ cdecl _fdclass(float) msvcr120._fdclass @ cdecl _fdopen(long str) msvcr120._fdopen @ stub _fdpcomp -@ stub _fdsign +@ cdecl _fdsign(float) msvcr120._fdsign @ cdecl _fdtest(ptr) msvcr120._fdtest @ cdecl _fflush_nolock(ptr) msvcr120._fflush_nolock @ cdecl _fgetc_nolock(ptr) msvcr120._fgetc_nolock @@ -1257,7 +1257,7 @@ @ cdecl _jn(long double) msvcr120._jn @ cdecl _ldclass(double) msvcr120._ldclass @ stub _ldpcomp -@ stub _ldsign +@ cdecl _ldsign(double) msvcr120._ldsign @ cdecl _ldtest(ptr) msvcr120._ldtest @ cdecl _lfind(ptr ptr ptr long ptr) msvcr120._lfind @ stub _lfind_s diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f796dd9..6779430 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2633,3 +2633,19 @@ double CDECL MSVCR120_fmax(double x, double y) return signbit(x) ? y : x; return x<y ? y : x; } + +/********************************************************************* + * _fdsign (MSVCR120.@) + */ +int CDECL MSVCR120__fdsign(float x) +{ + return signbit(x) ? 0x8000 : 0; +} + +/********************************************************************* + * _dsign (MSVCR120.@) + */ +int CDECL MSVCR120__dsign(double x) +{ + return signbit(x) ? 0x8000 : 0; +}

1 0

Jacek Caban : mshtml: Pass EventTarget to call_event_handlers.
by Alexandre Julliard 26 May '15

26 May '15

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

Piotr Caban : msvcr120: Add copysign export.
by Alexandre Julliard 26 May '15

26 May '15

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

Bruno Jesus : user32/tests: Add tests for GetRawInputDeviceList.
by Alexandre Julliard 26 May '15

26 May '15

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

Mark Harmstone : include: Add GetFileMUIPath to winnls.h.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 8d42c76e889f0f66150d46482bfe9b6435c51909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d42c76e889f0f66150d46482… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon May 25 18:19:04 2015 +0100 include: Add GetFileMUIPath to winnls.h. --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 7e9bfa5..693cb30 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -877,6 +877,7 @@ WINBASEAPI INT WINAPI GetDateFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LP WINBASEAPI INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetDateFormat WINELIB_NAME_AW(GetDateFormat) WINBASEAPI BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); +WINBASEAPI BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo)

1 0

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

26 May '15

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