wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Henri Verbeet : ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 64a5dc11bf20b8a4b8a581657912bea3d713598e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a5dc11bf20b8a4b8a581657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:28 2014 +0200 ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces. --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f230a2..a326404 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6127,6 +6127,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else if (!(desc->dwFlags & DDSD_LPSURFACE)) { desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~DDSD_LINEARSIZE; desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } @@ -6147,7 +6148,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s return hr; } - desc->dwFlags &= ~DDSD_LPSURFACE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } wined3d_surface_incref(wined3d_surface); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df74488..c5198f5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4522,12 +4522,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2ca7047..f07a1bd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5598,12 +5598,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ec53ae6..b515acc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6493,6 +6493,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6503,8 +6505,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c90d89b..7ed2f00 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6316,6 +6316,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6326,8 +6328,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0);

1 0

Henri Verbeet : ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 7e33bc7a473578dfbf6c53b2f70b993ca20706e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e33bc7a473578dfbf6c53b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:27 2014 +0200 ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases. --- dlls/ddraw/tests/ddraw1.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++-------------------- 4 files changed, 106 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e33bc7a473578dfbf6c5…

1 0

Jacek Caban : jscript: Added accessing not existing property on IDispatchEx tests.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: cbe63d977c8e90a0d384a944f54410874ad6ac67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe63d977c8e90a0d384a944f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 12 10:44:03 2014 +0200 jscript: Added accessing not existing property on IDispatchEx tests. --- dlls/jscript/tests/run.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index dbd9b6b..f6d600a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -101,6 +101,7 @@ DEFINE_EXPECT(testobj_withprop_i); DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); +DEFINE_EXPECT(testobj_notexists_d); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -327,6 +328,11 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_TESTOBJ_ONLYDISPID; return S_OK; } + if(!strcmp_wa(bstrName, "notExists")) { + CHECK_EXPECT(testobj_notexists_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + return DISP_E_UNKNOWNNAME; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; @@ -2055,6 +2061,10 @@ static BOOL run_tests(void) parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d); + SET_EXPECT(testobj_notexists_d); + parse_script_a("testObj.notExists;"); + CHECK_CALLED(testobj_notexists_d); + parse_script_a("function f() { var testPropGet; }"); parse_script_a("(function () { var testPropGet; })();"); parse_script_a("(function () { eval('var testPropGet;'); })();");

1 0

Piotr Caban : msvcp70: Export operators working on basic_string.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 84bf97087db1f023beba8fb783d71ef7da162304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bf97087db1f023beba8fb78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 10:37:08 2014 +0200 msvcp70: Export operators working on basic_string. --- dlls/msvcp70/msvcp70.spec | 102 ++++++++++++++++++++++----------------------- dlls/msvcp90/string.c | 53 +++++++++++++++++++++++ 2 files changed, 104 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84bf97087db1f023beba8…

1 0

Shuai Meng : vbscript: Fixed CInt.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 89dd8401b3d11ec57c087862f710c5ca0594188f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd8401b3d11ec57c087862f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:17:54 2014 +0800 vbscript: Fixed CInt. --- dlls/vbscript/global.c | 12 ++++++--- dlls/vbscript/tests/api.vbs | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1eaf377..294004b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -398,18 +398,24 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - hres = to_int(arg, &val); + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I2); if(FAILED(hres)) return hres; - return return_int(res, val); + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1ba1cb7..2aad761 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -738,4 +738,63 @@ MyObject.myval = 0 Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +Sub testCIntError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CInt(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CInt(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CInt(Empty) = 0, "CInt(Empty) = " & CInt(Empty)) +Call ok(getVT(CInt(Empty)) = "VT_I2", "getVT(CInt(Empty)) = " & getVT(CInt(Empty))) +Call ok(CInt(CByte(0)) = 0, "CInt(CByte(0)) = " & CInt(CByte(0))) +Call ok(getVT(CInt(CByte(0))) = "VT_I2", "getVT(CInt(CByte(0))) = " & getVT(CInt(CByte(0)))) +Call ok(CInt(CCur(0)) = 0, "CInt(CCur(0)) = " & CInt(CCur(0))) +Call ok(getVT(CInt(CCur(0))) = "VT_I2", "getVT(CInt(CCur(0))) = " & getVT(CInt(CCur(0)))) +Call ok(CInt(0.49) = 0, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0.5)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(0.51) = 1, "CInt(0.51) = " & CInt(0.51)) +Call ok(getVT(CInt(0.51)) = "VT_I2", "getVT(CInt(0.51)) = " & getVT(CInt(0.51))) +Call ok(CInt(1.49) = 1, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(1.5) = 2, "CInt(1.5) = " & CInt(1.5)) +Call ok(getVT(CInt(1.5)) = "VT_I2", "getVT(CInt(1.5)) = " & getVT(CInt(1.5))) +Call ok(CInt(1.51) = 2, "CInt(1.51) = " & CInt(1.51)) +Call ok(getVT(CInt(1.51)) = "VT_I2", "getVT(CInt(1.51)) = " & getVT(CInt(1.51))) +Call ok(CInt("-1") = -1, "CInt(""-1"") = " & CInt("-1")) +Call ok(getVT(CInt("-1")) = "VT_I2", "getVT(CInt(""-1"")) = " & getVT(CInt("-1"))) +If isEnglishLang Then + Call ok(CInt("-0.5") = 0, "CInt(""-0.5"") = " & CInt("-0.5")) + Call ok(getVT(CInt("-0.5")) = "VT_I2", "getVT(CInt(""-0.5"")) = " & getVT(CInt("-0.5"))) +End If +Call testCIntError("", 13, 13) +Call testCIntError("-1", 0, 458) +Call testCIntError("TRUE", 13, 13) +Call testCIntError("FALSE", 13, 13) +Call testCIntError("#TRue#", 13, 13) +Call testCIntError("#fAlSE#", 13, 13) +Call testCIntError(1, 0, 458) +Call testCIntError(32767.49, 0, 458) +Call testCIntError(32767.5, 6, 6) +Call testCIntError(-32768.5, 0, 458) +Call testCIntError(-32768.51, 6, 6) +Call ok(CInt(True) = -1, "CInt(True) = " & CInt(True)) +Call ok(getVT(CInt(True)) = "VT_I2", "getVT(CInt(True)) = " & getVT(CInt(True))) +Call ok(CInt(False) = 0, "CInt(False) = " & CInt(False)) +Call ok(getVT(CInt(False)) = "VT_I2", "getVT(CInt(False)) = " & getVT(CInt(False))) +MyObject.myval = 2.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +MyObject.myval = 1.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented CLng.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: ded01d657e96599bfbc260427a7687602ca4809d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded01d657e96599bfbc260427… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:16:43 2014 +0800 vbscript: Implemented CLng. --- dlls/vbscript/global.c | 20 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68b7638..1eaf377 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -414,8 +414,24 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c9ae774..1ba1cb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -682,4 +682,60 @@ MyObject.myval = 0 Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +Sub testCLngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CLng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CLng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CLng(Empty) = 0, "CLng(Empty) = " & CLng(Empty)) +Call ok(getVT(CLng(Empty)) = "VT_I4", "getVT(CLng(Empty)) = " & getVT(CLng(Empty))) +Call ok(CLng(CByte(0)) = 0, "CLng(CByte(0)) = " & CLng(CByte(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(CCur(0)) = 0, "CLng(CCur(0)) = " & CLng(CCur(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(0) = 0, "CLng(0) = " & CLng(0)) +Call ok(getVT(CLng(0)) = "VT_I4", "getVT(CLng(0)) = " & getVT(CLng(0))) +Call ok(CLng(0.49) = 0, "CLng(0.49) = " & CLng(0.49)) +Call ok(getVT(CLng(0.49)) = "VT_I4", "getVT(CLng(0.49)) = " & getVT(CLng(0.49))) +Call ok(CLng(0.5) = 0, "CLng(0.5) = " & CLng(0.5)) +Call ok(getVT(CLng(0.5)) = "VT_I4", "getVT(CLng(0.5)) = " & getVT(CLng(0.5))) +Call ok(CLng(0.51) = 1, "CLng(0.51) = " & CLng(0.51)) +Call ok(getVT(CLng(0.51)) = "VT_I4", "getVT(CLng(0.51)) = " & getVT(CLng(0.51))) +Call ok(CLng(1.49) = 1, "CLng(1.49) = " & CLng(1.49)) +Call ok(getVT(CLng(1.49)) = "VT_I4", "getVT(CLng(1.49)) = " & getVT(CLng(1.49))) +Call ok(CLng(1.5) = 2, "CLng(1.5) = " & CLng(1.5)) +Call ok(getVT(CLng(1.5)) = "VT_I4", "getVT(CLng(1.5)) = " & getVT(CLng(1.5))) +Call ok(CLng(1.51) = 2, "CLng(1.51) = " & CLng(1.51)) +Call ok(getVT(CLng(1.51)) = "VT_I4", "getVT(CLng(1.51)) = " & getVT(CLng(1.51))) +Call ok(CLng("-1") = -1, "CLng(""-1"") = " & CLng("-1")) +Call ok(getVT(CLng("-1")) = "VT_I4", "getVT(CLng(""-1"")) = " & getVT(CLng("-1"))) +If isEnglishLang Then + Call ok(CLng("-0.5") = 0, "CLng(""-0.5"") = " & CLng("-0.5")) + Call ok(getVT(CLng("-0.5")) = "VT_I4", "getVT(CLng(""-0.5"")) = " & getVT(CLng("-0.5"))) +End If +Call testCLngError("", 13, 13) +Call testCLngError("TRUE", 13, 13) +Call testCLngError("FALSE", 13, 13) +Call testCLngError("#TRue#", 13, 13) +Call testCLngError("#fAlSE#", 13, 13) +Call testCLngError(1, 0, 458) +Call ok(CLng(True) = -1, "CLng(True) = " & CLng(True)) +Call ok(getVT(CLng(True)) = "VT_I4", "getVT(CLng(True)) = " & getVT(CLng(True))) +Call ok(CLng(False) = 0, "CLng(False) = " & CLng(False)) +Call ok(getVT(CLng(False)) = "VT_I4", "getVT(CLng(False)) = " & getVT(CLng(False))) +MyObject.myval = 1 +Call ok(CLng(MyObject) = 1, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +MyObject.myval = 0 +Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented CDbl.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: cde73e3a5eb8ae6d35c342eebd806c31641aeb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73e3a5eb8ae6d35c342eeb… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:15:34 2014 +0800 vbscript: Implemented CDbl. --- dlls/vbscript/global.c | 20 ++++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f8c875d..68b7638 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -470,8 +470,24 @@ static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 46c80d4..c9ae774 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -634,4 +634,52 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDblError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDbl(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDbl(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDbl(Empty) = 0, "CDbl(Empty) = " & CDbl(Empty)) +Call ok(getVT(CDbl(Empty)) = "VT_R8", "getVT(CDbl(Empty)) = " & getVT(CDbl(Empty))) +Call ok(CDbl(CByte(0)) = 0, "CDbl(CByte(0)) = " & CDbl(CByte(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(CCur(0)) = 0, "CDbl(CCur(0)) = " & CDbl(CCur(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(0) = 0, "CDbl(0) = " & CDbl(0)) +Call ok(getVT(CDbl(0)) = "VT_R8", "getVT(CDbl(0)) = " & getVT(CDbl(0))) +Call ok(CDbl(32768) = 32768, "CDbl(32768) = " & CDbl(32768)) +Call ok(getVT(CDbl(32768)) = "VT_R8", "getVT(CDbl(32768)) = " & getVT(CDbl(32768))) +Call ok(CDbl(0.001 * 0.001) = 0.000001, "CDbl(0.001 * 0.001) = " & CDbl(0.001 * 0.001)) +Call ok(getVT(CDbl(0.001 * 0.001)) = "VT_R8", "getVT(CDbl(0.001 * 0.001)) = " & getVT(CDbl(0.001 * 0.001))) +Call ok(CDbl("-1") = -1, "CDbl(""-1"") = " & CDbl("-1")) +Call ok(getVT(CDbl("-1")) = "VT_R8", "getVT(CDbl(""-1"")) = " & getVT(CDbl("-1"))) +If isEnglishLang Then + Call ok(CDbl("-0.5") = -0.5, "CDbl(""-0.5"") = " & CDbl("-0.5")) + Call ok(getVT(CDbl("-0.5")) = "VT_R8", "getVT(CDbl(""-0.5"")) = " & getVT(CDbl("-0.5"))) +End If +Call testCDblError("", 13, 13) +Call testCDblError("TRUE", 13, 13) +Call testCDblError("FALSE", 13, 13) +Call testCDblError("#TRue#", 13, 13) +Call testCDblError("#fAlSE#", 13, 13) +Call testCDblError(1, 0, 458) +Call ok(CDbl(True) = -1, "CDbl(True) = " & CDbl(True)) +Call ok(getVT(CDbl(True)) = "VT_R8", "getVT(CDbl(True)) = " & getVT(CDbl(True))) +Call ok(CDbl(False) = 0, "CDbl(False) = " & CDbl(False)) +Call ok(getVT(CDbl(False)) = "VT_R8", "getVT(CDbl(False)) = " & getVT(CDbl(False))) +MyObject.myval = 0.1 +Call ok(CDbl(MyObject) = 0.1, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +MyObject.myval = 0 +Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) + Call reportSuccess()

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::insertCell method implementation.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 48e41c4dd70243ced8412ae911722fdece37e923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e41c4dd70243ced8412ae91… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 26 22:12:50 2014 +0800 mshtml: Added IHTMLTableRow::insertCell method implementation. --- dlls/mshtml/htmltablerow.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 731b403..589a38f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -308,8 +308,27 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableRowElement_InsertCell(This->nsrow, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Cell at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableCell_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableCell failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c16e073..4eb02fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5737,10 +5737,22 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; + IDispatch *disp; + IUnknown *unk; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); test_tr_possess(elem, row, 1, "td2"); + + hres = IHTMLTableRow_insertCell(row, 0, &disp); + ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + if (SUCCEEDED(hres)) + IUnknown_Release(unk); + test_tr_possess(elem, row, 2, "td2"); + IDispatch_Release(disp); } static void test_tr_elem(IHTMLElement *elem)

1 0

Zhenbo Li : mshtml: Added IHTMLDocument2:toString method.
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 4719c438a9cd16c56ed2854de317bc7008aadc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4719c438a9cd16c56ed2854de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 31 19:51:07 2014 +0800 mshtml: Added IHTMLDocument2:toString method. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9db920..6992c93 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1578,8 +1578,17 @@ static HRESULT WINAPI HTMLDocument_get_onerrorupdate(IHTMLDocument2 *iface, VARI static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; + } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb1e7be..c16e073 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5243,10 +5243,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; + BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), + "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres);

1 0

Felix Janda : iphlpapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard 12 Jun '14

12 Jun '14

Module: wine Branch: master Commit: 0547c0d236ab197c14b5fec0abfad4c31eade7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0547c0d236ab197c14b5fec0a… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 iphlpapi: stdio.h needs to be included for sprintf(). --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e145386..8c55048 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h>

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2014