wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alexandre Julliard : make_unicode: Move codepage file output code to a common routine and make default characters configurable .
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: f54c2f65b8cdc0ed3220aef87e23165da559f598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54c2f65b8cdc0ed3220aef87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 17:28:15 2013 +0200 make_unicode: Move codepage file output code to a common routine and make default characters configurable. --- tools/make_unicode | 156 +++++++++++++++++++++++++++------------------------ 1 files changed, 83 insertions(+), 73 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 59c75ab..8ac2411 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -310,6 +310,8 @@ my @joining_table = (0) x 65536; my @direction_table = (); my @decomp_table = (); my @compose_table = (); +my $default_char; +my $default_wchar; my %joining_forms = ( @@ -495,8 +497,30 @@ sub READ_DEFAULTS($) ################################################################ -# parse the input file -sub READ_FILE($) +# define a new lead byte +sub add_lead_byte($) +{ + my $ch = shift; + push @lead_bytes, $ch; + $cp2uni[$ch] = 0; +} + +################################################################ +# define a new char mapping +sub add_mapping($$) +{ + my ($cp, $uni) = @_; + $cp2uni[$cp] = $uni unless defined($cp2uni[$cp]); + $uni2cp[$uni] = $cp unless defined($uni2cp[$uni]); + if ($cp > 0xff && !defined($cp2uni[$cp >> 8])) + { + add_lead_byte( $cp >> 8 ); + } +} + +################################################################ +# parse a standard codepage file +sub read_codepage_file($) { my $name = shift; my $INPUT = open_data_file( $MAPPINGS, $name ); @@ -510,22 +534,13 @@ sub READ_FILE($) if (/^0x([0-9a-fA-F]+)\s+\#DBCS LEAD BYTE/) { - my $cp = hex $1; - push @lead_bytes,$cp; - $cp2uni[$cp] = 0; + add_lead_byte( hex $1 ); next; } + # 0x12 0x3456 if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\s+(\#.*)?/) { - my $cp = hex $1; - my $uni = hex $2; - $cp2uni[$cp] = $uni unless defined($cp2uni[$cp]); - $uni2cp[$uni] = $cp unless defined($uni2cp[$uni]); - if ($cp > 0xff && !defined($cp2uni[$cp >> 8])) - { - push @lead_bytes,$cp >> 8; - $cp2uni[$cp >> 8] = 0; - } + add_mapping( hex $1, hex $2 ); next; } die "$name: Unrecognized line $_\n"; @@ -1847,17 +1862,45 @@ sub DUMP_COMPOSE_TABLES($) save_file($filename); } - ################################################################ -# handle a "bestfit" Windows mapping file +# output a codepage definition file from the global tables +sub output_codepage_file($$$$) +{ + my ($codepage, $filename, $comment, $has_glyphs) = @_; + + my $output = sprintf "libs/wine/c_%03d.c", $codepage; + open OUTPUT,">$output.new" or die "Cannot create $output"; -sub handle_bestfit_file($$$) + printf "Building %s from %s (%s)\n", $output, $filename || "hardcoded data", $comment; + + # dump all tables + + printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment; + if ($filename) + { + print OUTPUT "/* generated from $MAPPINGS/$filename */\n"; + print OUTPUT "/* DO NOT EDIT!! */\n\n"; + } + else + { + printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; + } + printf OUTPUT "#include \"wine/unicode.h\"\n\n"; + + if (!@lead_bytes) { dump_sbcs_table( $codepage, $has_glyphs, $comment, $default_char, $default_wchar ); } + else { dump_dbcs_table( $codepage, $comment, $default_char, $default_wchar, get_lb_ranges() ); } + close OUTPUT; + save_file($output); +} + +################################################################ +# read a "bestfit" Windows mapping file +sub read_bestfit_file($) { - my ($filename, $has_glyphs, $comment) = @_; + my ($filename) = @_; my $state = ""; - my ($codepage, $width, $def, $defw, $count); + my ($codepage, $width, $count); my ($lb_cur, $lb_end); - my @lb_ranges = (); my $INPUT = open_data_file( $MAPPINGS, $filename ) or die "Cannot open $filename"; @@ -1876,8 +1919,8 @@ sub handle_bestfit_file($$$) if (/^CPINFO\s+(\d+)\s+0x([0-9a-fA-f]+)\s+0x([0-9a-fA-F]+)/) { $width = $1; - $def = hex $2; - $defw = hex $3; + $default_char = hex $2; + $default_wchar = hex $3; next; } if (/^(MBTABLE|WCTABLE|DBCSRANGE|DBCSTABLE)\s+(\d+)/) @@ -1906,12 +1949,7 @@ sub handle_bestfit_file($$$) { my $start = hex $1; my $end = hex $2; - push @lb_ranges, $start, $end; - for (my $i = $start; $i <= $end; $i++) - { - push @lead_bytes, $i; - $cp2uni[$i] = 0; - } + for (my $i = $start; $i <= $end; $i++) { add_lead_byte( $i ); } $lb_cur = $start; $lb_end = $end; next; @@ -1932,23 +1970,6 @@ sub handle_bestfit_file($$$) die "$filename: Unrecognized line $_\n"; } close $INPUT; - - my $output = sprintf "libs/wine/c_%03d.c", $codepage; - open OUTPUT,">$output.new" or die "Cannot create $output"; - - printf "Building %s from %s (%s)\n", $output, $filename, $comment; - - # dump all tables - - printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment; - printf OUTPUT "/* generated from $MAPPINGS/$filename */\n"; - printf OUTPUT "/* DO NOT EDIT!! */\n\n"; - printf OUTPUT "#include \"wine/unicode.h\"\n\n"; - - if ($width == 1) { dump_sbcs_table( $codepage, $has_glyphs, $comment, $def, $defw ); } - else { dump_dbcs_table( $codepage, $comment, $def, $defw, @lb_ranges ); } - close OUTPUT; - save_file($output); } @@ -1956,47 +1977,36 @@ sub handle_bestfit_file($$$) # read an input file and generate the corresponding .c file sub HANDLE_FILE(@) { - my ($codepage,$filename,$has_glyphs,$comment) = @_; + my ($codepage,$filename,$has_glyphs,$comment,$def,$defw) = @_; @cp2uni = (); @lead_bytes = (); @uni2cp = (); + $default_char = $def || $DEF_CHAR; + $default_wchar = $defw || $DEF_CHAR; - # symbol codepage file is special - if ($codepage == 20932) { READ_JIS0208_FILE( $filename ); } - elsif ($codepage == 20127) { fill_20127_codepage(); } - elsif ($filename =~ /\/bestfit/) + # some codepage files are special + if ($codepage == 20932) { - handle_bestfit_file( $filename, $has_glyphs, $comment ); - return; + READ_JIS0208_FILE( $filename ); + ADD_DEFAULT_MAPPINGS(); } - else { READ_FILE( $filename ); } - - ADD_DEFAULT_MAPPINGS(); - - my $output = sprintf "libs/wine/c_%03d.c", $codepage; - open OUTPUT,">$output.new" or die "Cannot create $output"; - - printf "Building %s from %s (%s)\n", $output, $filename || "hardcoded data", $comment; - - # dump all tables - - printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment; - if ($filename) + elsif ($codepage == 20127) { - print OUTPUT "/* generated from $MAPPINGS/$filename */\n"; - print OUTPUT "/* DO NOT EDIT!! */\n\n"; + fill_20127_codepage(); + ADD_DEFAULT_MAPPINGS(); + } + elsif ($filename =~ /\/bestfit/) + { + read_bestfit_file( $filename ); } else { - printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; + read_codepage_file( $filename ); + ADD_DEFAULT_MAPPINGS(); } - printf OUTPUT "#include \"wine/unicode.h\"\n\n"; - if (!@lead_bytes) { dump_sbcs_table( $codepage, $has_glyphs, $comment, $DEF_CHAR, $DEF_CHAR ); } - else { dump_dbcs_table( $codepage, $comment, $DEF_CHAR, $DEF_CHAR, get_lb_ranges() ); } - close OUTPUT; - save_file($output); + output_codepage_file( $codepage, $filename, $comment, $has_glyphs ); }

1 0

Mykola Zadorozhnyy : po: Update Ukrainian translation.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 9259eae27a89ae1700550a1fdc578a6769824965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9259eae27a89ae1700550a1fd… Author: Mykola Zadorozhnyy <alokym86(a)ukr.net> Date: Wed Jun 26 12:45:42 2013 +0300 po: Update Ukrainian translation. --- po/uk.po | 294 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 112 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9259eae27a89ae1700550…

1 0

Dmitry Timoshkov : ntdll: Correct RtlFreeHeap .spec parameter type.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 934ba51c80a14aa71f803a1c8d7d917d968c1977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934ba51c80a14aa71f803a1c8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 26 13:43:50 2013 +0900 ntdll: Correct RtlFreeHeap .spec parameter type. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 60f70b1..3d4fa2e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -604,7 +604,7 @@ @ stdcall RtlFormatMessage(ptr long long long long ptr ptr long) @ stdcall RtlFreeAnsiString(long) @ stdcall RtlFreeHandle(ptr ptr) -@ stdcall RtlFreeHeap(long long long) +@ stdcall RtlFreeHeap(long long ptr) @ stdcall RtlFreeOemString(ptr) # @ stub RtlFreeRangeList @ stdcall RtlFreeSid (long) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 90393b6..10ff0ab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1025,7 +1025,7 @@ @ stub RtlFindUnicodePrefix @ stdcall RtlFormatCurrentUserKeyPath(ptr) ntdll.RtlFormatCurrentUserKeyPath @ stdcall RtlFreeAnsiString(long) ntdll.RtlFreeAnsiString -@ stdcall RtlFreeHeap(long long long) ntdll.RtlFreeHeap +@ stdcall RtlFreeHeap(long long ptr) ntdll.RtlFreeHeap @ stdcall RtlFreeOemString(ptr) ntdll.RtlFreeOemString @ stub RtlFreeRangeList @ stdcall RtlFreeUnicodeString(ptr) ntdll.RtlFreeUnicodeString

1 0

Dmitry Timoshkov : kernel32: Correct HeapFree .spec parameter type.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: e7ade611add69883ee8ec8765c04a769924805c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ade611add69883ee8ec8765… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 26 13:43:42 2013 +0900 kernel32: Correct HeapFree .spec parameter type. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9d06e12..c9a4b5d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -728,7 +728,7 @@ @ stub HeapCreateTagsW @ stdcall HeapDestroy(long) @ stub HeapExtend -@ stdcall HeapFree(long long long) ntdll.RtlFreeHeap +@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap @ stdcall HeapLock(long) @ stdcall HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW

1 0

André Hentschel : oleaut32/tests: Don' t use autoheader styled defines in varformat.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: 01c591de7a2a4e796e05a933f016728f5f13f551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c591de7a2a4e796e05a933f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 00:21:14 2013 +0200 oleaut32/tests: Don't use autoheader styled defines in varformat. --- dlls/oleaut32/tests/varformat.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 0354d19..8370d1d 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -44,11 +44,8 @@ static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*) static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); -/* Have I8/UI8 data type? */ -#define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) - -/* Is a given function exported from oleaut32? */ -#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) +/* Has I8/UI8 data type? */ +static BOOL has_i8; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ @@ -96,7 +93,7 @@ static void test_VarFormatNumber(void) FMT_NUMBER(VT_UI2, V_UI2); FMT_NUMBER(VT_I4, V_I4); FMT_NUMBER(VT_UI4, V_UI4); - if (HAVE_OLEAUT32_I8) + if (has_i8) { FMT_NUMBER(VT_I8, V_I8); FMT_NUMBER(VT_UI8, V_UI8); @@ -278,7 +275,7 @@ static void test_VarFormat(void) VNUMFMT(VT_I1,V_I1); VNUMFMT(VT_I2,V_I2); VNUMFMT(VT_I4,V_I4); - if (HAVE_OLEAUT32_I8) + if (has_i8) { VNUMFMT(VT_I8,V_I8); } @@ -286,7 +283,7 @@ static void test_VarFormat(void) VNUMFMT(VT_UI1,V_UI1); VNUMFMT(VT_UI2,V_UI2); VNUMFMT(VT_UI4,V_UI4); - if (HAVE_OLEAUT32_I8) + if (has_i8) { VNUMFMT(VT_UI8,V_UI8); } @@ -565,6 +562,8 @@ START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); + has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; + test_VarFormatNumber(); test_VarFormat(); test_VarWeekdayName();

1 0

André Hentschel : oleaut32/tests: Don' t use autoheader styled defines in vartype.
by Alexandre Julliard 26 Jun '13

26 Jun '13

Module: wine Branch: master Commit: b1804fd7e3ac74feada392ed2bde17991d2883b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1804fd7e3ac74feada392ed2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 25 23:59:17 2013 +0200 oleaut32/tests: Don't use autoheader styled defines in vartype. --- dlls/oleaut32/tests/vartype.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c87ada8..4c823c6 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -50,13 +50,10 @@ static HMODULE hOleaut32; if (!p##func) { \ win_skip("function " # func " not available, not testing it\n"); return; } -/* Is a given function exported from oleaut32? */ -#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) - -/* Have I8/UI8 data type? */ -#define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) -/* Have proper locale conversions? */ -#define HAVE_OLEAUT32_LOCALES (HAVE_FUNC(GetVarConversionLocaleSetting) && HAVE_OLEAUT32_I8) +/* Has I8/UI8 data type? */ +static BOOL has_i8; +/* Has proper locale conversions? */ +static BOOL has_locales; /* Is vt a type unavailable to ancient versions? */ #define IS_MODERN_VTYPE(vt) (vt==VT_VARIANT||vt==VT_DECIMAL|| \ @@ -161,7 +158,7 @@ static HMODULE hOleaut32; TYPETEST(VT_R4, V_R4(&vDst), fs); \ TYPETEST(VT_R8, V_R8(&vDst), fs); \ TYPETEST(VT_DATE, V_DATE(&vDst), fs); \ - if (HAVE_OLEAUT32_I8) \ + if (has_i8) \ { \ TYPETEST(VT_I8, V_I8(&vDst), fs); \ TYPETEST(VT_UI8, V_UI8(&vDst), fs); \ @@ -2314,7 +2311,7 @@ static void test_VarI8Copy(void) VARIANTARG vSrc, vDst; LONGLONG in = 1; - if (!HAVE_OLEAUT32_I8) + if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; @@ -2345,7 +2342,7 @@ static void test_VarI8ChangeTypeEx(void) LONG64 in; VARIANTARG vSrc, vDst; - if (!HAVE_OLEAUT32_I8) + if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; @@ -2583,7 +2580,7 @@ static void test_VarUI8Copy(void) VARIANTARG vSrc, vDst; ULONGLONG in = 1; - if (!HAVE_OLEAUT32_I8) + if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; @@ -2614,7 +2611,7 @@ static void test_VarUI8ChangeTypeEx(void) ULONG64 in; VARIANTARG vSrc, vDst; - if (!HAVE_OLEAUT32_I8) + if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; @@ -3474,7 +3471,7 @@ static void test_VarDateChangeTypeEx(void) VariantClear(&vDst); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - if (HAVE_OLEAUT32_LOCALES) + if (has_locales) { hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, VARIANT_NOUSEROVERRIDE|VARIANT_USE_NLS, VT_BSTR); ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && V_BSTR(&vDst) && !lstrcmpW(V_BSTR(&vDst), sz25570Nls), @@ -4757,7 +4754,7 @@ static void test_VarBoolFromStr(void) /* And is still not case sensitive */ CONVERT_STR(VarBoolFromStr,"False",0); EXPECT(VARIANT_FALSE); - if (HAVE_OLEAUT32_LOCALES) + if (has_locales) { /* French is rejected without VARIANT_LOCALBOOL */ CONVERT_STR(VarBoolFromStr,"faux",0); EXPECT_MISMATCH; @@ -4777,7 +4774,7 @@ static void test_VarBoolFromStr(void) CONVERT_STR(VarBoolFromStr,"-1",0); EXPECT(VARIANT_TRUE); CONVERT_STR(VarBoolFromStr,"+1",0); EXPECT(VARIANT_TRUE); - if (HAVE_OLEAUT32_LOCALES) + if (has_locales) { /* Numeric strings are read as floating point numbers. The line below fails * because '.' is not a valid decimal separator for Polish numbers */ @@ -4826,7 +4823,7 @@ static void test_VarBoolChangeTypeEx(void) V_BOOL(&vSrc) = 0; BOOL_STR(VARIANT_ALPHABOOL, szFalse); - if (HAVE_OLEAUT32_LOCALES) + if (has_locales) { lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); @@ -5700,7 +5697,7 @@ static void test_IUnknownChangeTypeEx(void) { if (vt == VT_I8 || vt == VT_UI8) { - if (HAVE_OLEAUT32_I8) + if (has_i8) hExpected = DISP_E_TYPEMISMATCH; } else if (vt == VT_RECORD) @@ -5850,7 +5847,7 @@ static void test_ErrorChangeTypeEx(void) { if (vt == VT_I8 || vt == VT_UI8) { - if (HAVE_OLEAUT32_I8) + if (has_i8) hExpected = DISP_E_TYPEMISMATCH; } else if (vt == VT_RECORD) @@ -5886,7 +5883,7 @@ static void test_EmptyChangeTypeEx(void) if (vt == VT_I8 || vt == VT_UI8) { - if (HAVE_OLEAUT32_I8) + if (has_i8) hExpected = S_OK; } else if (vt == VT_RECORD) @@ -5931,7 +5928,7 @@ static void test_NullChangeTypeEx(void) if (vt == VT_I8 || vt == VT_UI8) { - if (HAVE_OLEAUT32_I8) + if (has_i8) hExpected = DISP_E_TYPEMISMATCH; } else if (vt == VT_RECORD) @@ -6091,6 +6088,9 @@ START_TEST(vartype) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); + has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; + has_locales = has_i8 && GetProcAddress(hOleaut32, "GetVarConversionLocaleSetting") != NULL; + trace("LCIDs: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(), GetUserDefaultLCID());

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

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_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 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

← Newer
1
2
3
4
5
6
7
8
...
42
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 2013