July 2014 - Wine-commits - list.winehq.org

Tag wine-1.7.22 : Alexandre Julliard : Release 1.7.22
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: refs/tags/wine-1.7.22 Tag: 4c9393a7c1eb0c5665e68e3523b57bc74e56dc00 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4c9393a7c1eb0c5665e68e3523b5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:29:24 2014 +0200 Release 1.7.22

1 0

Shuai Meng : vbscript: Implemented VarType.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: 393f4bc5475f87150187d3c0f19db99db169feac URL: http://source.winehq.org/git/wine.git/?a=commit;h=393f4bc5475f87150187d3c0f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:43:28 2014 +0800 vbscript: Implemented VarType. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5a12729..fa53757 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -602,8 +602,16 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) & ~VT_TYPEMASK) { + FIXME("not supported %s\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + return return_short(res, V_VT(arg)); } static HRESULT Global_IsDate(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 ded9b8b..abdb6c7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -857,4 +857,25 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) +Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) +Call ok(VarType(Null) = vbNull, "VarType(Null) = " & VarType(Null)) +Call ok(getVT(VarType(Null)) = "VT_I2", "getVT(VarType(Null)) = " & getVT(VarType(Null))) +Call ok(VarType(255) = vbInteger, "VarType(255) = " & VarType(255)) +Call ok(getVT(VarType(255)) = "VT_I2", "getVT(VarType(255)) = " & getVT(VarType(255))) +Call ok(VarType(32768) = vbLong, "VarType(32768) = " & VarType(32768)) +Call ok(getVT(VarType(32768)) = "VT_I2", "getVT(VarType(32768)) = " & getVT(VarType(32768))) +Call ok(VarType(CSng(0.5)) = vbSingle, "VarType(CSng(0.5)) = " & VarType(CSng(0.5))) +Call ok(getVT(VarType(CSng(0.5))) = "VT_I2", "getVT(VarType(CSng(0.5))) = " & getVT(VarType(CSng(0.5)))) +Call ok(VarType(-0.5) = vbDouble, "VarType(-0.5) = " & VarType(-0.5)) +Call ok(getVT(VarType(-0.5)) = "VT_I2", "getVT(VarType(-0.5)) = " & getVT(VarType(-0.5))) +Call ok(VarType(CCur(0.5)) = vbCurrency, "VarType(CCur(0.5)) = " & VarType(CCur(0.5))) +Call ok(getVT(VarType(CCur(0.5))) = "VT_I2", "getVT(VarType(CCur(0.5))) = " & getVT(VarType(CCur(0.5)))) +Call ok(VarType(CStr(0.5)) = vbString, "VarType(CStr(0.5)) = " & VarType(CStr(0.5))) +Call ok(getVT(VarType(CStr(0.5))) = "VT_I2", "getVT(VarType(CStr(0.5))) = " & getVT(VarType(CStr(0.5)))) +Call ok(VarType(CBool(0.5)) = vbBoolean, "VarType(CBool(0.5)) = " & VarType(CBool(0.5))) +Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & getVT(VarType(CBool(0.5)))) +Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) +Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Sgn.
by Alexandre Julliard 11 Jul '14

11 Jul '14

Module: wine Branch: master Commit: 0b13d721c27c2ede6a0e15d7822b37f6ef57f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b13d721c27c2ede6a0e15d78… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:47:45 2014 +0800 vbscript: Implemented Sgn. --- dlls/vbscript/global.c | 53 ++++++++++++++++++++------------------------- dlls/vbscript/tests/api.vbs | 31 ++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 56 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa53757..fa06353 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -182,35 +182,15 @@ HRESULT to_int(VARIANT *v, int *ret) static HRESULT to_double(VARIANT *v, double *ret) { - switch(V_VT(v)) { - case VT_I2: - *ret = V_I2(v); - break; - case VT_I4: - *ret = V_I4(v); - break; - case VT_R4: - *ret = V_R4(v); - break; - case VT_R8: - *ret = V_R8(v); - break; - case VT_BSTR: { - VARIANT dst; - HRESULT hres; + VARIANT dst; + HRESULT hres; - V_VT(&dst) = VT_EMPTY; - hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); - if(FAILED(hres)) - return hres; - *ret = V_R8(&dst); - break; - } - default: - FIXME("arg %s not supported\n", debugstr_variant(v)); - return E_NOTIMPL; - } + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + *ret = V_R8(&dst); return S_OK; } @@ -1284,8 +1264,23 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + double v; + short val; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_double(arg, &v); + if (FAILED(hres)) + return hres; + + val = v == 0 ? 0 : (v > 0 ? 1 : -1); + return return_short(res, val); } static HRESULT Global_Now(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 abdb6c7..33596d3 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -878,4 +878,35 @@ Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) +Call ok(Sgn(Empty) = 0, "Sgn(MyEmpty) = " & Sgn(Empty)) +Call ok(getVT(Sgn(Empty)) = "VT_I2", "getVT(Sgn(MyEmpty)) = " & getVT(Sgn(Empty))) +Call ok(Sgn(0) = 0, "Sgn(0) = " & Sgn(0)) +Call ok(getVT(Sgn(0)) = "VT_I2", "getVT(Sgn(0)) = " & getVT(Sgn(0))) +Call ok(Sgn(-32769) = -1, "Sgn(-32769) = " & Sgn(-32769)) +Call ok(getVT(Sgn(-32769)) = "VT_I2", "getVT(Sgn(-32769)) = " & getVT(Sgn(-32769))) +Call ok(Sgn(CSng(-0.5)) = -1, "Sgn(CSng(-0.5)) = " & Sgn(CSng(-0.5))) +Call ok(getVT(Sgn(CSng(-0.5))) = "VT_I2", "getVT(Sgn(CSng(-0.5))) = " & getVT(Sgn(CSng(-0.5)))) +Call ok(Sgn(0.5) = 1, "Sgn(0.5) = " & Sgn(0.5)) +Call ok(getVT(Sgn(0.5)) = "VT_I2", "getVT(Sgn(0.5)) = " & getVT(Sgn(0.5))) +Call ok(Sgn(CCur(-1)) = -1, "Sgn(CCur(-1)) = " & Sgn(CCur(-1))) +Call ok(getVT(Sgn(CCur(-1))) = "VT_I2", "getVT(Sgn(CCur(-1))) = " & getVT(Sgn(CCur(-1)))) +Call ok(Sgn(CStr(-1)) = -1, "Sgn(CStr(-1)) = " & Sgn(CStr(-1))) +Call ok(getVT(Sgn(CStr(-1))) = "VT_I2", "getVT(Sgn(CStr(-1))) = " & getVT(Sgn(CStr(-1)))) +Call ok(Sgn(False) = 0, "Sgn(False) = " & Sgn(False)) +Call ok(getVT(Sgn(False)) = "VT_I2", "getVT(Sgn(False)) = " & getVT(Sgn(False))) +Call ok(Sgn(True) = -1, "Sgn(True) = " & Sgn(True)) +Call ok(getVT(Sgn(True)) = "VT_I2", "getVT(Sgn(True)) = " & getVT(Sgn(True))) +Call ok(Sgn(CByte(1)) = 1, "Sgn(CByte(1)) = " & Sgn(CByte(1))) +Call ok(getVT(Sgn(CByte(1))) ="VT_I2", "getVT(Sgn(CByte(1))) = " & getVT(Sgn(CByte(1)))) + +Sub testSgnError(strings, error_num) + on error resume next + + Call Err.clear() + Call Sgn(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testSgnError(Null, 94) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c2fedd6..ed9491c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -406,6 +406,7 @@ HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN; #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_OLE_NOT_SUPPORTED 430 #define VBSE_OLE_NO_PROP_OR_METHOD 438 #define VBSE_ACTION_NOT_SUPPORTED 445

1 0

Gediminas Jakutis : d3dx9: Implement D3DXCreateTorus() + tests.
by Alexandre Julliard 10 Jul '14

10 Jul '14

Module: wine Branch: master Commit: fe802d92bbe40d68e3ce61e1f30de1f0db531224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe802d92bbe40d68e3ce61e1f… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Jul 10 04:26:11 2014 +0300 d3dx9: Implement D3DXCreateTorus() + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 107 +++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/mesh.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shape.h | 2 + 4 files changed, 270 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe802d92bbe40d68e3ce6…

1 0

Qian Hong : gdi32/tests: Improve font name localization tests by not requiring a strict language match.
by Alexandre Julliard 10 Jul '14

10 Jul '14

Module: wine Branch: master Commit: 887a6832bb6e70c5813da7dd65cb89a7eb17ce64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887a6832bb6e70c5813da7dd6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jul 10 12:59:13 2014 +0800 gdi32/tests: Improve font name localization tests by not requiring a strict language match. --- dlls/gdi32/tests/font.c | 251 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 218 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887a6832bb6e70c5813da…

1 0

Piotr Caban : msvcrt: Always set fd to -1 in _sopen_s on failure.
by Alexandre Julliard 10 Jul '14

10 Jul '14

Module: wine Branch: master Commit: a5665693053b15a148407481c603a848fa183726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5665693053b15a148407481c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 10 15:12:12 2014 +0200 msvcrt: Always set fd to -1 in _sopen_s on failure. --- dlls/msvcrt/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8b12ae9..0e5deba 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2185,6 +2185,9 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i MSVCRT_wchar_t *pathW; int ret; + if (!MSVCRT_CHECK_PMT(fd != NULL)) + return MSVCRT_EINVAL; + *fd = -1; if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) return MSVCRT_EINVAL;

1 0

Sebastian Lackner : oleaut32/tests: Add additional tests for VarDecAdd.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 04f11ee55ae70b4d2af92a259680580b9234a090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f11ee55ae70b4d2af92a259… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 21:11:51 2014 +0200 oleaut32/tests: Add additional tests for VarDecAdd. --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b873d82..8ca3f14 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4408,9 +4408,40 @@ static void test_VarDecAdd(void) ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + SETDEC64(l,1,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,1,0,0,1); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); + + SETDEC64(l,0,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,0,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC64(l,1,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,1,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + SETDEC(l,3,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,4,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,5,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,6,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); + + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); + + SETDEC(l,3,128,0,123567); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); + /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); SETDEC(l,2,0,0,100); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(2,0,0,200);

1 0

Sebastian Lackner : oleaut32: Decrease accuracy if scaling is not possible in VarDecAdd.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: ec218b42181709c26cbb076761c345826f2b6353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec218b42181709c26cbb07676… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 22:13:59 2014 +0200 oleaut32: Decrease accuracy if scaling is not possible in VarDecAdd. --- dlls/oleaut32/tests/vartype.c | 10 +++---- dlls/oleaut32/vartype.c | 70 +++++++++++++++++++++++++++++++++---------- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8ca3f14..026149a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4419,7 +4419,7 @@ static void test_VarDecAdd(void) todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); SETDEC(l,3,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", @@ -4434,13 +4434,13 @@ static void test_VarDecAdd(void) S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC(l,6,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); SETDEC(l,3,128,0,123567); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); @@ -4663,7 +4663,7 @@ static void test_VarDecCmp(void) SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,3,0,0,123456); SETDEC64(out,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH1(VarDecCmp); todo_wine EXPECT_LT; + MATH1(VarDecCmp); EXPECT_LT; } static void test_VarDecCmpR8(void) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 4d067e0..e9b45ff 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4164,6 +4164,8 @@ static HRESULT VARIANT_DI_FromR4(float source, VARIANT_DI * dest); static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest); static void VARIANT_DIFromDec(const DECIMAL * from, VARIANT_DI * to); static void VARIANT_DecFromDI(const VARIANT_DI * from, DECIMAL * to); +static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned char divisor); +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n); /************************************************************************ * VarDecFromR4 (OLEAUT32.193) @@ -4439,12 +4441,13 @@ HRESULT WINAPI VarDecFromUI8(ULONG64 ullIn, DECIMAL* pDecOut) /* Make two DECIMALS the same scale; used by math functions below */ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, const DECIMAL** ppDecRight, - DECIMAL* pDecOut) + DECIMAL pDecOut[2]) { static DECIMAL scaleFactor; + unsigned char remainder; DECIMAL decTemp; + VARIANT_DI di; int scaleAmount, i; - HRESULT hRet = S_OK; if (DEC_SIGN(*ppDecLeft) & ~DECIMAL_NEG || DEC_SIGN(*ppDecRight) & ~DECIMAL_NEG) return E_INVALIDARG; @@ -4459,27 +4462,62 @@ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, if (scaleAmount > 0) { decTemp = *(*ppDecRight); /* Left is bigger - scale the right hand side */ - *ppDecRight = pDecOut; + *ppDecRight = &pDecOut[0]; } else { decTemp = *(*ppDecLeft); /* Right is bigger - scale the left hand side */ - *ppDecLeft = pDecOut; - i = scaleAmount = -scaleAmount; + *ppDecLeft = &pDecOut[0]; + i = -scaleAmount; } - if (DEC_SCALE(&decTemp) + scaleAmount > DEC_MAX_SCALE) - return DISP_E_OVERFLOW; /* Can't scale up */ + /* Multiply up the value to be scaled by the correct amount (if possible) */ + while (i > 0 && SUCCEEDED(VarDecMul(&decTemp, &scaleFactor, &pDecOut[0]))) + { + decTemp = pDecOut[0]; + i--; + } - /* Multiply up the value to be scaled by the correct amount */ - while (SUCCEEDED(hRet) && i--) + if (!i) { - /* Note we are multiplying by a value with a scale of 0, so we don't recurse */ - hRet = VarDecMul(&decTemp, &scaleFactor, pDecOut); - decTemp = *pDecOut; + DEC_SCALE(&pDecOut[0]) += (scaleAmount > 0) ? scaleAmount : (-scaleAmount); + return S_OK; /* Same scale */ } - DEC_SCALE(pDecOut) += scaleAmount; /* Set the new scale */ - return hRet; + + /* Scaling further not possible, reduce accuracy of other argument */ + pDecOut[0] = decTemp; + if (scaleAmount > 0) + { + DEC_SCALE(&pDecOut[0]) += scaleAmount - i; + VARIANT_DIFromDec(*ppDecLeft, &di); + *ppDecLeft = &pDecOut[1]; + } + else + { + DEC_SCALE(&pDecOut[0]) += (-scaleAmount) - i; + VARIANT_DIFromDec(*ppDecRight, &di); + *ppDecRight = &pDecOut[1]; + } + + di.scale -= i; + remainder = 0; + while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD))) + { + remainder = VARIANT_int_divbychar(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD), 10); + if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder); + } + + /* round up the result - native oleaut32 does this */ + if (remainder >= 5) { + for (remainder = 1, i = 0; i < sizeof(di.bitsnum)/sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = di.bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + di.bitsnum[i] = digit & 0xFFFFFFFF; + } + } + + VARIANT_DecFromDI(&di, &pDecOut[1]); + return S_OK; } /* Add two unsigned 32 bit values with overflow */ @@ -4554,9 +4592,9 @@ static inline int VARIANT_DecCmp(const DECIMAL *pDecLeft, const DECIMAL *pDecRig HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) { HRESULT hRet; - DECIMAL scaled; + DECIMAL scaled[2]; - hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, &scaled); + hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, scaled); if (SUCCEEDED(hRet)) {

1 0

Grazvydas Ignotas : kernel32: Don' t return uninitialized values on failures.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 4f62801aee06922731b9ed5d82caa7dd5daf8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f62801aee06922731b9ed5d8… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jul 9 03:05:51 2014 +0300 kernel32: Don't return uninitialized values on failures. --- dlls/kernel32/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d9f69c3..8210624 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -458,7 +458,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExA( SECURITY_ATTRIBUTES *sa, LPCSTR */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status; @@ -632,7 +632,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExA( SECURITY_ATTRIBUTES *sa, LPCSTR */ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status;

1 0

Qian Hong : mshtml: Fixed typo.
by Alexandre Julliard 09 Jul '14

09 Jul '14

Module: wine Branch: master Commit: 359767fdfabfaad7c672be4dfbd5d4ee03eced71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359767fdfabfaad7c672be4df… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jul 9 03:03:30 2014 +0800 mshtml: Fixed typo. --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6b261b1..c29e211 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -993,7 +993,7 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) break; } - MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; } }

1 0