June 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : libwine: Add support for codepage 10002 ( Mac Traditional Chinese).
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: c90c593288a6e6b6336a95010c8cd4f18ed40a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90c593288a6e6b6336a95010… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 17:46:35 2013 +0200 libwine: Add support for codepage 10002 (Mac Traditional Chinese). --- libs/wine/Makefile.in | 1 + libs/wine/c_10002.c | 6630 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 6635 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c90c593288a6e6b6336a9…

1 0

Alexandre Julliard : libwine: Add support for codepage 10003 (Mac Korean).
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 701d5efdefee650c60419999fb2c6be95d3eb9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=701d5efdefee650c60419999f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 17:49:30 2013 +0200 libwine: Add support for codepage 10003 (Mac Korean). --- libs/wine/Makefile.in | 1 + libs/wine/c_10003.c | 8313 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 8318 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=701d5efdefee650c60419…

1 0

Alexandre Julliard : libwine: Add support for codepage 10008 ( Mac Simplified Chinese).
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 1aebebaf725f1611d9e127d88486c44988f9b741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aebebaf725f1611d9e127d88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 17:51:47 2013 +0200 libwine: Add support for codepage 10008 (Mac Simplified Chinese). --- libs/wine/Makefile.in | 1 + libs/wine/c_10008.c | 6399 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 6404 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1aebebaf725f1611d9e12…

1 0

Alexandre Julliard : libwine: Add support for codepage 10010 (Mac Romanian) .
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: ee34072cfb6467f8bf32ab83bbdc5c906ebf5a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee34072cfb6467f8bf32ab83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 13:38:21 2013 +0200 libwine: Add support for codepage 10010 (Mac Romanian). --- libs/wine/Makefile.in | 1 + libs/wine/c_10010.c | 750 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 755 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee34072cfb6467f8bf32a…

1 0

Alexandre Julliard : libwine: Add support for codepage 10017 (Mac Ukrainian ).
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 092801225100818cb8884559aef1fd446871b61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=092801225100818cb8884559a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 12:49:42 2013 +0200 libwine: Add support for codepage 10017 (Mac Ukrainian). --- libs/wine/Makefile.in | 1 + libs/wine/c_10017.c | 750 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 755 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=092801225100818cb8884…

1 0

André Hentschel : oleaut32/tests: Get rid of IS_ANCIENT in vartype.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 7bb58e88a4afe79645f1ce67d5cd133310b06eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb58e88a4afe79645f1ce67d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 25 23:55:09 2013 +0200 oleaut32/tests: Get rid of IS_ANCIENT in vartype. --- dlls/oleaut32/tests/vartype.c | 85 +++++++++++------------------------------ 1 files changed, 23 insertions(+), 62 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bce6fff..64a5410 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -63,8 +63,7 @@ static HMODULE hOleaut32; #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) /* Have proper locale conversions? */ #define HAVE_OLEAUT32_LOCALES (HAVE_FUNC(GetVarConversionLocaleSetting) && HAVE_OLEAUT32_I8) -/* Is this an ancient version with support for only I2/I4/R4/R8/DATE? */ -#define IS_ANCIENT (!HAVE_FUNC(VarI1FromI2)) + /* Is vt a type unavailable to ancient versions? */ #define IS_MODERN_VTYPE(vt) (vt==VT_VARIANT||vt==VT_DECIMAL|| \ vt==VT_I1||vt==VT_UI2||vt==VT_UI4||vt == VT_INT||vt == VT_UINT) @@ -160,16 +159,11 @@ static HMODULE hOleaut32; VariantInit(&vDst); \ V_VT(&vSrc) = vt; \ (val(&vSrc)) = in; \ - if (!IS_ANCIENT) { \ - TYPETEST(VT_I1, V_I1(&vDst), fs); \ - TYPETEST(VT_UI2, V_UI2(&vDst), fs); \ - TYPETEST(VT_UI4, V_UI4(&vDst), fs); \ - TYPETEST(VT_INT, V_INT(&vDst), fs); \ - TYPETEST(VT_UINT, V_UINT(&vDst), fs); \ - } else { \ - BADVAR(VT_I1); BADVAR(VT_UI2); BADVAR(VT_UI4); \ - BADVAR(VT_INT); BADVAR(VT_UINT); \ - } \ + TYPETEST(VT_I1, V_I1(&vDst), fs); \ + TYPETEST(VT_UI2, V_UI2(&vDst), fs); \ + TYPETEST(VT_UI4, V_UI4(&vDst), fs); \ + TYPETEST(VT_INT, V_INT(&vDst), fs); \ + TYPETEST(VT_UINT, V_UINT(&vDst), fs); \ TYPETEST(VT_UI1, V_UI1(&vDst), fs); \ TYPETEST(VT_I2, V_I2(&vDst), fs); \ TYPETEST(VT_I4, V_I4(&vDst), fs); \ @@ -187,9 +181,7 @@ static HMODULE hOleaut32; VariantInit(&vDst); \ V_VT(&vSrc) = vt; \ (val(&vSrc)) = in; \ - if (!IS_ANCIENT) { \ - TYPETEST(vtneg, valneg(&vDst), fs); \ - } + TYPETEST(vtneg, valneg(&vDst), fs); #define INITIAL_TYPETESTI8(vt, val) \ VariantInit(&vSrc); \ @@ -248,7 +240,7 @@ static HMODULE hOleaut32; MISMATCH(VT_DISPATCH); \ MISMATCH(VT_ERROR); \ MISMATCH(VT_UNKNOWN); \ - if (!IS_ANCIENT) { MISMATCH(VT_VARIANT); } else { BADVAR(VT_VARIANT); } \ + MISMATCH(VT_VARIANT); \ if (HAVE_OLEAUT32_RECORD) \ { \ MISMATCH(VT_RECORD); \ @@ -842,10 +834,7 @@ static void test_VarI1FromStr(void) static void test_VarI1Copy(void) { - if (!IS_ANCIENT) - { - COPYTEST(1, VT_I1, V_I1(&vSrc), V_I1(&vDst), V_I1REF(&vSrc), V_I1REF(&vDst), "%d"); - } + COPYTEST(1, VT_I1, V_I1(&vSrc), V_I1(&vDst), V_I1REF(&vSrc), V_I1REF(&vDst), "%d"); } static void test_VarI1ChangeTypeEx(void) @@ -856,12 +845,9 @@ static void test_VarI1ChangeTypeEx(void) in = 1; - if (!IS_ANCIENT) - { - INITIAL_TYPETEST(VT_I1, V_I1, "%d"); - COMMON_TYPETEST; - NEGATIVE_TYPETEST(VT_I1, V_I1, "%d", VT_UI1, V_UI1); - } + INITIAL_TYPETEST(VT_I1, V_I1, "%d"); + COMMON_TYPETEST; + NEGATIVE_TYPETEST(VT_I1, V_I1, "%d", VT_UI1, V_UI1); } #undef CONV_TYPE @@ -1615,10 +1601,7 @@ static void test_VarUI2FromStr(void) static void test_VarUI2Copy(void) { - if (!IS_ANCIENT) - { - COPYTEST(1, VT_UI2, V_UI2(&vSrc), V_UI2(&vDst), V_UI2REF(&vSrc), V_UI2REF(&vDst), "%d"); - } + COPYTEST(1, VT_UI2, V_UI2(&vSrc), V_UI2(&vDst), V_UI2REF(&vSrc), V_UI2REF(&vDst), "%d"); } static void test_VarUI2ChangeTypeEx(void) @@ -1629,12 +1612,9 @@ static void test_VarUI2ChangeTypeEx(void) in = 1; - if (!IS_ANCIENT) - { - INITIAL_TYPETEST(VT_UI2, V_UI2, "%d"); - COMMON_TYPETEST; - NEGATIVE_TYPETEST(VT_UI2, V_UI2, "%d", VT_I2, V_I2); - } + INITIAL_TYPETEST(VT_UI2, V_UI2, "%d"); + COMMON_TYPETEST; + NEGATIVE_TYPETEST(VT_UI2, V_UI2, "%d", VT_I2, V_I2); } /* @@ -2103,10 +2083,7 @@ static void test_VarUI4FromStr(void) static void test_VarUI4Copy(void) { - if (!IS_ANCIENT) - { - COPYTEST(1u, VT_UI4, V_UI4(&vSrc), V_UI4(&vDst), V_UI4REF(&vSrc), V_UI4REF(&vDst), "%u"); - } + COPYTEST(1u, VT_UI4, V_UI4(&vSrc), V_UI4(&vDst), V_UI4REF(&vSrc), V_UI4REF(&vDst), "%u"); } static void test_VarUI4ChangeTypeEx(void) @@ -2117,12 +2094,9 @@ static void test_VarUI4ChangeTypeEx(void) in = 1; - if (!IS_ANCIENT) - { - INITIAL_TYPETEST(VT_UI4, V_UI4, "%u"); - COMMON_TYPETEST; - NEGATIVE_TYPETEST(VT_UI4, V_UI4, "%u", VT_I4, V_I4); - } + INITIAL_TYPETEST(VT_UI4, V_UI4, "%u"); + COMMON_TYPETEST; + NEGATIVE_TYPETEST(VT_UI4, V_UI4, "%u", VT_I4, V_I4); } /* @@ -4870,12 +4844,9 @@ static void test_VarBoolChangeTypeEx(void) V_VT(&vSrc) = VT_BOOL; V_BOOL(&vSrc) = 1; - if (!IS_ANCIENT) - { - BOOL_STR(VARIANT_ALPHABOOL, szTrue); - V_BOOL(&vSrc) = 0; - BOOL_STR(VARIANT_ALPHABOOL, szFalse); - } + BOOL_STR(VARIANT_ALPHABOOL, szTrue); + V_BOOL(&vSrc) = 0; + BOOL_STR(VARIANT_ALPHABOOL, szFalse); if (HAVE_OLEAUT32_LOCALES) { @@ -5762,8 +5733,6 @@ static void test_IUnknownChangeTypeEx(void) else if (vt >= VT_I2 && vt <= VT_UINT && vt != (VARTYPE)15) hExpected = DISP_E_TYPEMISMATCH; } - if (IS_ANCIENT && IS_MODERN_VTYPE(vt)) - hExpected = DISP_E_BADVARTYPE; hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); ok(hres == hExpected, @@ -5915,8 +5884,6 @@ static void test_ErrorChangeTypeEx(void) else if (vt <= VT_UINT && vt != (VARTYPE)15) hExpected = DISP_E_TYPEMISMATCH; } - if (IS_ANCIENT && IS_MODERN_VTYPE(vt)) - hExpected = DISP_E_BADVARTYPE; ok(hres == hExpected, "change err: vt %d expected 0x%08x, got 0x%08x\n", vt, hExpected, hres); @@ -5959,9 +5926,6 @@ static void test_EmptyChangeTypeEx(void) else if (vt <= VT_UINT && vt != (VARTYPE)15) hExpected = S_OK; - if (IS_ANCIENT && IS_MODERN_VTYPE(vt)) - hExpected = DISP_E_BADVARTYPE; - hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt), @@ -6009,9 +5973,6 @@ static void test_NullChangeTypeEx(void) (vt <= VT_UINT && vt != (VARTYPE)15)) hExpected = DISP_E_TYPEMISMATCH; - if (IS_ANCIENT && IS_MODERN_VTYPE(vt)) - hExpected = DISP_E_BADVARTYPE; - hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt),

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartype.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: c64d409aa807258ccb4e08b8a867fa1fa2d49a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64d409aa807258ccb4e08b8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 25 23:55:40 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartype. --- dlls/oleaut32/tests/vartype.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 64a5410..d8633c7 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -53,8 +53,6 @@ static HMODULE hOleaut32; /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) -/* Have IRecordInfo data type? */ -#define HAVE_OLEAUT32_RECORD HAVE_FUNC(SafeArraySetRecordInfo) /* Have DECIMAL data type with new error checking? */ #define HAVE_OLEAUT32_DECIMAL HAVE_FUNC(VarDecAdd) /* Have CY data type? */ @@ -241,10 +239,7 @@ static HMODULE hOleaut32; MISMATCH(VT_ERROR); \ MISMATCH(VT_UNKNOWN); \ MISMATCH(VT_VARIANT); \ - if (HAVE_OLEAUT32_RECORD) \ - { \ - MISMATCH(VT_RECORD); \ - } \ + MISMATCH(VT_RECORD); \ BADVAR(VT_VOID); \ BADVAR(VT_HRESULT); \ BADVAR(VT_SAFEARRAY); \ @@ -5727,8 +5722,7 @@ static void test_IUnknownChangeTypeEx(void) } else if (vt == VT_RECORD) { - if (HAVE_OLEAUT32_RECORD) - hExpected = DISP_E_TYPEMISMATCH; + hExpected = DISP_E_TYPEMISMATCH; } else if (vt >= VT_I2 && vt <= VT_UINT && vt != (VARTYPE)15) hExpected = DISP_E_TYPEMISMATCH; @@ -5878,8 +5872,7 @@ static void test_ErrorChangeTypeEx(void) } else if (vt == VT_RECORD) { - if (HAVE_OLEAUT32_RECORD) - hExpected = DISP_E_TYPEMISMATCH; + hExpected = DISP_E_TYPEMISMATCH; } else if (vt <= VT_UINT && vt != (VARTYPE)15) hExpected = DISP_E_TYPEMISMATCH; @@ -5915,8 +5908,7 @@ static void test_EmptyChangeTypeEx(void) } else if (vt == VT_RECORD) { - if (HAVE_OLEAUT32_RECORD) - hExpected = DISP_E_TYPEMISMATCH; + hExpected = DISP_E_TYPEMISMATCH; } else if (vt == VT_VARIANT || vt == VT_DISPATCH || vt == VT_UNKNOWN || vt == VT_ERROR) @@ -5961,8 +5953,7 @@ static void test_NullChangeTypeEx(void) } else if (vt == VT_RECORD) { - if (HAVE_OLEAUT32_RECORD) - hExpected = DISP_E_TYPEMISMATCH; + hExpected = DISP_E_TYPEMISMATCH; } else if (vt == VT_NULL) {

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in vartype.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 5601edd043d45ad75838cd77d39ac6f3760007c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5601edd043d45ad75838cd77d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 25 23:57:09 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in vartype. --- dlls/oleaut32/tests/vartype.c | 42 ++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d8633c7..90f6640 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -53,8 +53,6 @@ static HMODULE hOleaut32; /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) -/* Have DECIMAL data type with new error checking? */ -#define HAVE_OLEAUT32_DECIMAL HAVE_FUNC(VarDecAdd) /* Have CY data type? */ #define HAVE_OLEAUT32_CY HAVE_FUNC(VarCyAdd) /* Have I8/UI8 data type? */ @@ -110,13 +108,10 @@ static HMODULE hOleaut32; #define CONVERT_DEC64(func,scl,sgn,hi,mid,lo) SETDEC64(in,scl,sgn,hi,mid,lo); hres = p##func(&in, &out) #define CONVERT_BADDEC(func) \ - if (HAVE_OLEAUT32_DECIMAL) \ - { \ - CONVERT_DEC(func,29,0,0,0); EXPECT_INVALID; \ - CONVERT_DEC(func,0,0x1,0,0); EXPECT_INVALID; \ - CONVERT_DEC(func,0,0x40,0,0); EXPECT_INVALID; \ - CONVERT_DEC(func,0,0x7f,0,0); EXPECT_INVALID; \ - } + CONVERT_DEC(func,29,0,0,0); EXPECT_INVALID; \ + CONVERT_DEC(func,0,0x1,0,0); EXPECT_INVALID; \ + CONVERT_DEC(func,0,0x40,0,0); EXPECT_INVALID; \ + CONVERT_DEC(func,0,0x7f,0,0); EXPECT_INVALID; #define CONVERT_STR(func,str,flags) \ SetLastError(0); \ @@ -221,16 +216,13 @@ static HMODULE hOleaut32; "->VT_BSTR hres=0x%X, type=%d (should be VT_BSTR), *bstr='%c'\n", \ hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?'); \ } \ - if (HAVE_OLEAUT32_DECIMAL) \ - { \ - hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_DECIMAL); \ - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && \ - S(U(V_DECIMAL(&vDst))).sign == 0 && S(U(V_DECIMAL(&vDst))).scale == 0 && \ - V_DECIMAL(&vDst).Hi32 == 0 && U1(V_DECIMAL(&vDst)).Lo64 == (ULONGLONG)in, \ - "->VT_DECIMAL hres=0x%X, type=%d (should be VT_DECIMAL), sign=%d, scale=%d, hi=%u, lo=(%8x %8x),\n", \ - hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign, S(U(V_DECIMAL(&vDst))).scale, \ - V_DECIMAL(&vDst).Hi32, S1(U1(V_DECIMAL(&vDst))).Mid32, S1(U1(V_DECIMAL(&vDst))).Lo32); \ - } \ + hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_DECIMAL); \ + ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && \ + S(U(V_DECIMAL(&vDst))).sign == 0 && S(U(V_DECIMAL(&vDst))).scale == 0 && \ + V_DECIMAL(&vDst).Hi32 == 0 && U1(V_DECIMAL(&vDst)).Lo64 == (ULONGLONG)in, \ + "->VT_DECIMAL hres=0x%X, type=%d (should be VT_DECIMAL), sign=%d, scale=%d, hi=%u, lo=(%8x %8x),\n", \ + hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign, S(U(V_DECIMAL(&vDst))).scale, \ + V_DECIMAL(&vDst).Hi32, S1(U1(V_DECIMAL(&vDst))).Mid32, S1(U1(V_DECIMAL(&vDst))).Lo32); \ hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_EMPTY); \ ok(hres == S_OK && V_VT(&vDst) == VT_EMPTY, "->VT_EMPTY hres=0x%X, type=%d (should be VT_EMPTY)\n", hres, V_VT(&vDst)); \ hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_NULL); \ @@ -4705,14 +4697,10 @@ static void test_VarBoolFromDec(void) CHECKPTR(VarBoolFromDec); CONVERT_BADDEC(VarBoolFromDec); - if (HAVE_OLEAUT32_DECIMAL) - { - /* Early versions of oleaut32 don't catch these errors */ - CONVERT_DEC(VarBoolFromDec,29,0,0,0); EXPECT_INVALID; - CONVERT_DEC(VarBoolFromDec,0,0x1,0,0); EXPECT_INVALID; - CONVERT_DEC(VarBoolFromDec,0,0x40,0,0); EXPECT_INVALID; - CONVERT_DEC(VarBoolFromDec,0,0x7f,0,0); EXPECT_INVALID; - } + CONVERT_DEC(VarBoolFromDec,29,0,0,0); EXPECT_INVALID; + CONVERT_DEC(VarBoolFromDec,0,0x1,0,0); EXPECT_INVALID; + CONVERT_DEC(VarBoolFromDec,0,0x40,0,0); EXPECT_INVALID; + CONVERT_DEC(VarBoolFromDec,0,0x7f,0,0); EXPECT_INVALID; CONVERT_DEC(VarBoolFromDec,0,0x80,0,1); EXPECT(VARIANT_TRUE); CONVERT_DEC(VarBoolFromDec,0,0,0,0); EXPECT(VARIANT_FALSE);

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_CY in vartype.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: a7c77f93ea00ba8964817b8d5ad5d789f3bc1bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c77f93ea00ba8964817b8d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 25 23:58:13 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_CY in vartype. --- dlls/oleaut32/tests/vartype.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 90f6640..c87ada8 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -53,8 +53,6 @@ static HMODULE hOleaut32; /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) -/* Have CY data type? */ -#define HAVE_OLEAUT32_CY HAVE_FUNC(VarCyAdd) /* Have I8/UI8 data type? */ #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) /* Have proper locale conversions? */ @@ -201,13 +199,10 @@ static HMODULE hOleaut32; (V_BOOL(&vDst) == VARIANT_TRUE || (V_VT(&vSrc) == VT_BOOL && V_BOOL(&vDst) == 1)), \ "->VT_BOOL hres=0x%X, type=%d (should be VT_BOOL), value %d (should be VARIANT_TRUE)\n", \ hres, V_VT(&vDst), V_BOOL(&vDst)); \ - if (HAVE_OLEAUT32_CY) \ - { \ - hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_CY); \ - ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == CY_MULTIPLIER, \ - "->VT_CY hres=0x%X, type=%d (should be VT_CY), value (%08x,%08x) (should be CY_MULTIPLIER)\n", \ - hres, V_VT(&vDst), S(V_CY(&vDst)).Hi, S(V_CY(&vDst)).Lo); \ - } \ + hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_CY); \ + ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == CY_MULTIPLIER, \ + "->VT_CY hres=0x%X, type=%d (should be VT_CY), value (%08x,%08x) (should be CY_MULTIPLIER)\n", \ + hres, V_VT(&vDst), S(V_CY(&vDst)).Hi, S(V_CY(&vDst)).Lo); \ if (V_VT(&vSrc) != VT_DATE) \ { \ hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_BSTR); \

1 0

Alexandre Julliard : libwine: Add support for codepage 10021 (Mac Thai).
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 085eda4e2dfbd4754aef346d94f91067c8455126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085eda4e2dfbd4754aef346d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 12:52:33 2013 +0200 libwine: Add support for codepage 10021 (Mac Thai). --- libs/wine/Makefile.in | 1 + libs/wine/c_10021.c | 750 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 755 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=085eda4e2dfbd4754aef3…

1 0