December 2012 - Wine-Commits

Piotr Caban : msvcrt: Added _atodbl tests.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 78553db096daf2b776a37612f7955ec1f2c71499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78553db096daf2b776a37612f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:19 2012 +0100 msvcrt: Added _atodbl tests. --- dlls/msvcrt/tests/string.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d606ebb..bbaeda0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -30,6 +30,7 @@ #include <locale.h> #include <errno.h> #include <limits.h> +#include <math.h> static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -89,6 +90,7 @@ static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); +static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -2376,6 +2378,66 @@ static void test_tolower(void) setlocale(LC_ALL, "C"); } +static void test__atodbl(void) +{ + _CRT_DOUBLE d; + char num[32]; + int ret; + + if(!p__atodbl_l) { + /* Old versions of msvcrt use different values for _OVERFLOW and _UNDERFLOW + * Because of this lets skip _atodbl tests when _atodbl_l is not available */ + win_skip("_atodbl_l is not available\n"); + return; + } + + num[0] = 0; + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "t"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"t\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"t\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "0"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"0\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"0\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "123"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"123\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"123\") returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + + strcpy(num, "1e-309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _UNDERFLOW, "_atodbl_l(&d, \"1e-309\", NULL) returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == _UNDERFLOW, "_atodbl(&d, \"1e-309\") returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + + strcpy(num, "1e309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _OVERFLOW, "_atodbl_l(&d, \"1e309\", NULL) returned %d, expected _OVERFLOW\n", ret); + ret = _atodbl(&d, num); + ok(ret == _OVERFLOW, "_atodbl(&d, \"1e309\") returned %d, expected _OVERFLOW\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2420,6 +2482,7 @@ START_TEST(string) p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); + p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2469,4 +2532,5 @@ START_TEST(string) test_wctob(); test_wctomb(); test_tolower(); + test__atodbl(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 5010949..d4755f4 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -140,6 +140,7 @@ typedef int (__cdecl *_onexit_t)(void); int __cdecl _atodbl(_CRT_DOUBLE*,char*); +int __cdecl _atodbl_l(_CRT_DOUBLE*,char*,_locale_t); int __cdecl _atoflt(_CRT_FLOAT*,char*); int __cdecl _atoflt_l(_CRT_FLOAT*,char*,_locale_t); __int64 __cdecl _atoi64(const char*);

1 0

Christian Costa : d3drm: Fix return error code.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: f0dd3100189488f80ac9b2129d0d09ae7866b9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd3100189488f80ac9b2129… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:51 2012 +0100 d3drm: Fix return error code. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7f246ce..709a2f8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1541,7 +1541,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc } else if (hr != DXFILE_OK) { - ret = D3DRMERR_NOTFOUND; + ret = D3DRMERR_BADFILE; goto end; }

1 0

Jacek Caban : urlmon: Added IWinInetInfo and IWinInetHttpInfo proxy/ stub implementation.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: cc75a52c6a59c4f13d0f02f6b9d5083ae805e06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc75a52c6a59c4f13d0f02f6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 14:53:24 2012 +0100 urlmon: Added IWinInetInfo and IWinInetHttpInfo proxy/stub implementation. --- dlls/urlmon/usrmarshal.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index e6b468a..d669918 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -26,30 +26,30 @@ HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + return IWinInetHttpInfo_RemoteQueryInfo_Proxy(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } HRESULT __RPC_STUB IWinInetHttpInfo_QueryInfo_Stub(IWinInetHttpInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + return IWinInetHttpInfo_QueryInfo(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } HRESULT CALLBACK IWinInetInfo_QueryOption_Proxy(IWinInetInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + return IWinInetInfo_RemoteQueryOption_Proxy(This, dwOption, pBuffer, pcbBuf); } HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + return IWinInetInfo_QueryOption(This, dwOption, pBuffer, pcbBuf); } HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This,

1 0

Jacek Caban : jscript: Fixed deleting property by ID from IDispatchEx interface.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: f780ae0f86cb925e6fa149b901960536f50202d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f780ae0f86cb925e6fa149b90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:55 2012 +0100 jscript: Fixed deleting property by ID from IDispatchEx interface. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/run.c | 34 +++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0ecd20a..9e2ba5b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1501,7 +1501,7 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) if(FAILED(hres)) return hres; - *ret = TRUE; + *ret = hres == S_OK; return S_OK; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 52fee57..0b0215c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -81,6 +81,7 @@ DEFINE_EXPECT(global_propget_i); DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_propdelete_d); +DEFINE_EXPECT(global_nopropdelete_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); @@ -102,6 +103,7 @@ DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); +DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -130,7 +132,8 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_TESTRES 0x1018 #define DISPID_GLOBAL_TESTNORES 0x1019 -#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -497,6 +500,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTPROPDELETE; return S_OK; } + if(!strcmp_wa(bstrName, "testNoPropDelete")) { + CHECK_EXPECT(global_nopropdelete_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTNOPROPDELETE; + return S_OK; + } if(!strcmp_wa(bstrName, "getVT")) { test_grfdex(grfdex, fdexNameCaseSensitive); *pid = DISPID_GLOBAL_GETVT; @@ -1082,9 +1091,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static HRESULT WINAPI Global_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { - CHECK_EXPECT(DeleteMemberByDispID); - ok(id == DISPID_GLOBAL_TESTPROPDELETE, "id = %d\n", id); - return S_OK; + switch(id) { + case DISPID_GLOBAL_TESTPROPDELETE: + CHECK_EXPECT(DeleteMemberByDispID); + return S_OK; + case DISPID_GLOBAL_TESTNOPROPDELETE: + CHECK_EXPECT(DeleteMemberByDispID_false); + return S_FALSE; + default: + ok(0, "id = %d\n", id); + } + + return E_FAIL; } static IDispatchExVtbl GlobalVtbl = { @@ -1855,10 +1873,16 @@ static BOOL run_tests(void) SET_EXPECT(global_propdelete_d); SET_EXPECT(DeleteMemberByDispID); - parse_script_a("delete testPropDelete;"); + parse_script_a("ok((delete testPropDelete) === true, 'delete testPropDelete did not return true');"); CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + SET_EXPECT(global_nopropdelete_d); + SET_EXPECT(DeleteMemberByDispID_false); + parse_script_a("ok((delete testNoPropDelete) === false, 'delete testPropDelete did not return false');"); + CHECK_CALLED(global_nopropdelete_d); + CHECK_CALLED(DeleteMemberByDispID_false); + SET_EXPECT(puredisp_prop_d); parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); CHECK_CALLED(puredisp_prop_d);

1 0

Jacek Caban : jscript: Fixed Number.toFixed for value 0 with 0 precision.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 9de9c353ac5c09546fba139f3f446e62522e49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de9c353ac5c09546fba139f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:35:54 2012 +0100 jscript: Fixed Number.toFixed for value 0 with 0 precision. --- dlls/jscript/number.c | 6 ++++-- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index ed773a3..351e915 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -99,15 +99,17 @@ static inline jsstr_t *number_to_fixed(double val, int prec) jsstr_t *ret; WCHAR *str; + TRACE("%lf %d\n", val, prec); + if(val < 0) { neg = TRUE; val = -val; } - if(val<=-1 || val>=1) + if(val >= 1) buf_size = log10(val)+prec+2; else - buf_size = prec+1; + buf_size = prec ? prec+1 : 2; if(buf_size > NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6322eae..5d45777 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1204,6 +1204,14 @@ ok(tmp === "101.1", "num(5.5).toString(2) = " + tmp); tmp = (new Number(3)).toFixed(3); ok(tmp === "3.000", "num(3).toFixed(3) = " + tmp); +tmp = (new Number(3)).toFixed(); +ok(tmp === "3", "Number(3).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(); +ok(tmp === "0", "Number(0).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(1); +ok(tmp === "0.0", "Number(0).toFixed(1) = " + tmp); +tmp = (new Number(0)).toFixed(2); +ok(tmp === "0.00", "Number(0).toFixed(2) = " + tmp); tmp = (new Number(1.76)).toFixed(1); ok(tmp === "1.8", "num(1.76).toFixed(1) = " + tmp); tmp = (new Number(7.92)).toFixed(5);

1 0

Ken Thomases : winemac: Implement minimal Create[Compatible]DC() and DeleteDC().
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 59e339faac8b6fdf1672bdbfbce4c1bc1dbd72ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e339faac8b6fdf1672bdbfb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:07:10 2012 -0600 winemac: Implement minimal Create[Compatible]DC() and DeleteDC(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 254 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 +- 3 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e339faac8b6fdf1672b…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: d5e735554bec044cd3fac402f1f36616b2f30a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e735554bec044cd3fac402f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 17 11:14:43 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0fa120c..524409d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3530,7 +3530,7 @@ msgstr "끝나지 않은 문자열 상수" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "함수 밖에 'return'문장이 있음 " #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -3542,7 +3542,7 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: jscript.rc:42 msgid "Label redefined" -msgstr "라벨이 정의되지 않음" +msgstr "라벨이 중복정의됨" #: jscript.rc:43 msgid "Label not found"

1 0

Nikolay Sivov : msxml3: Add custom handling for DISPID_VALUE for node list.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: aaa8186a2ecc0bcdd6a3197efcd854afae81a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa8186a2ecc0bcdd6a3197ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 10:16:41 2012 +0400 msxml3: Add custom handling for DISPID_VALUE for node list. --- dlls/msxml3/nodelist.c | 66 +++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 39 ++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 756783d..c68eefc 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -329,28 +329,62 @@ static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = NULL; - - if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX) - return DISP_E_UNKNOWNNAME; - - switch(flags) + if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX) { - case INVOKE_PROPERTYGET: + switch(flags) { - IXMLDOMNode *disp = NULL; - - IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); - V_DISPATCH(res) = (IDispatch*)disp; - break; + case DISPATCH_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + V_VT(res) = VT_DISPATCH; + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + V_DISPATCH(res) = (IDispatch*)disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } } - default: + } + else if (id == DISPID_VALUE) + { + switch(flags) { - FIXME("unimplemented flags %x\n", flags); - break; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + { + IXMLDOMNode *item; + VARIANT index; + HRESULT hr; + + if (params->cArgs - params->cNamedArgs != 1) return DISP_E_BADPARAMCOUNT; + + VariantInit(&index); + hr = VariantChangeType(&index, params->rgvarg, 0, VT_I4); + if(FAILED(hr)) + { + FIXME("failed to convert arg, %s\n", debugstr_variant(params->rgvarg)); + return hr; + } + + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, V_I4(&index), &item); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)item; + break; + } + default: + { + FIXME("DISPID_VALUE: unimplemented flags %x\n", flags); + break; + } } } + else + return DISP_E_UNKNOWNNAME; TRACE("ret %p\n", V_DISPATCH(res)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f2b465..d846db5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10005,6 +10005,34 @@ static void test_dispex(void) V_VT(&arg) = VT_I4; V_I2(&arg) = 0; + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; dispparams.cArgs = 1; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10013,7 +10041,6 @@ static void test_dispex(void) V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -10025,6 +10052,13 @@ todo_wine ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + dispparams.cArgs = 0; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10046,10 +10080,9 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine { ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); -} + IXMLDOMNodeList_Release(node_list); /* IXMLDOMParseError */

1 0

Piotr Caban : msvcrt: Sync spec files.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 1cd0c4abd625b55a2cc5d7c289645ff9e24c658a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd0c4abd625b55a2cc5d7c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:38 2012 +0100 msvcrt: Sync spec files. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 160280b..cad39da 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -115,7 +115,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) CRTDLL__fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 24d3080..8f0ecdb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -687,7 +687,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -850,7 +850,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 789233c..141b791 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -323,7 +323,7 @@ @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 123d5c7..28bffdb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -317,7 +317,7 @@ @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bdb442d..b4eaf7b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -343,7 +343,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) msvcr100._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -504,7 +504,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bc122e6..90b4b04 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -335,7 +335,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) msvcr100._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -499,7 +499,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 77c41be..ded1bca 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -933,7 +933,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index d65b49d..a90436d 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1020,7 +1020,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index ffdc04a..044ecc6 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -303,7 +303,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt

1 0

Dmitry Timoshkov : wineps.drv: Add a trace to PSDRV_GetDeviceCaps.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: fd193bc78116f3021d486d6fc327fa9ccfd64cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd193bc78116f3021d486d6fc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:40:04 2012 +0800 wineps.drv: Add a trace to PSDRV_GetDeviceCaps. --- dlls/wineps.drv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3f31f45..01d7f13 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -355,6 +355,8 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p,%d\n", dev->hdc, cap); + switch(cap) { case DRIVERVERSION:

1 0