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

Thomas Mullaly : urlmon/tests: Added more test URI's.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 520902cb169c629c282f7faf85fd6e560e018e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520902cb169c629c282f7faf8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jun 17 19:26:53 2010 -0400 urlmon/tests: Added more test URI's. --- dlls/urlmon/tests/uri.c | 335 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=520902cb169c629c282f7…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetUserInfo.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 152a1efdae7ca0d58f85a875e7038b66025d982c URL: http://source.winehq.org/git/wine.git/?a=commit;h=152a1efdae7ca0d58f85a875e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jun 17 19:38:23 2010 -0400 urlmon: Implemented IUri_GetUserInfo. --- dlls/urlmon/tests/uri.c | 64 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 ++++++++++++++----- 2 files changed, 51 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=152a1efdae7ca0d58f85a…

1 0

Aric Stewart : libwine: Remove some previous c1 cntrl exceptions that are no longer valid.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 84561d76e5add36f13fa1393b3b72b2748b07327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84561d76e5add36f13fa1393b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:15 2010 -0500 libwine: Remove some previous c1 cntrl exceptions that are no longer valid. --- libs/wine/cpmap.pl | 2 +- libs/wine/wctype.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index fe35bfd..6d76f0b 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -156,7 +156,7 @@ my %special_categories = 0xff10..0xff19, 0xff21..0xff26, 0xff41..0xff46 ], "space" => [ 0x09..0x0d, 0x85 ], "blank" => [ 0x09, 0x20, 0xa0, 0x3000, 0xfeff ], - "cntrl" => [ 0x070f, 0x180b, 0x180c, 0x180d, 0x180e, 0x200c, 0x200d, + "cntrl" => [ 0x070f, 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, 0xfff9, 0xfffa, 0xfffb ] diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 9cc5412..38e71ee 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -776,7 +776,7 @@ const unsigned short wine_wctype_table[17152] = 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0xd220, 0xd220, 0xd220, 0xa228, 0x0000, + 0xb210, 0xb210, 0xb210, 0xd200, 0xd200, 0xd200, 0xa208, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300,

1 0

Aric Stewart : libwine: There are a number of characters of non punctuation type in the latin I block that Windows considers to be punctuation .
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 459fb56afbf6cfd9dcadcc750856c0a9a0bc1756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459fb56afbf6cfd9dcadcc750… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:29 2010 -0500 libwine: There are a number of characters of non punctuation type in the latin I block that Windows considers to be punctuation. --- libs/wine/cpmap.pl | 4 +++- libs/wine/wctype.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index 6d76f0b..7a02ee6 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -159,7 +159,9 @@ my %special_categories = "cntrl" => [ 0x070f, 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, - 0xfff9, 0xfffa, 0xfffb ] + 0xfff9, 0xfffa, 0xfffb ], + "punct" => [ 0x24, 0x2b, 0x3c..0x3e, 0x5e, 0x60, 0x7c, 0x7e, 0xa2..0xbe, + 0xd7, 0xf7 ] ); my %directions = diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 38e71ee..071a7b4 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -43,33 +43,33 @@ const unsigned short wine_wctype_table[17152] = 0xe220, 0x9268, 0x8228, 0x9228, 0xa228, 0x8228, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x8220, 0x8220, 0x8220, 0x9220, - 0xa248, 0xb210, 0xb210, 0x5210, 0x5200, 0x5210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0x4200, 0x7210, 0x4210, 0x7210, 0x7210, + 0xa248, 0xb210, 0xb210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, + 0xb210, 0xb210, 0xb210, 0x4210, 0x7210, 0x4210, 0x7210, 0x7210, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, 0x3284, - 0x3284, 0x3284, 0x7210, 0xb210, 0xb200, 0xb200, 0xb200, 0xb210, + 0x3284, 0x3284, 0x7210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1381, 0x1381, 0x1381, 0x1381, 0x1381, 0x1381, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, - 0x1301, 0x1301, 0x1301, 0xb210, 0xb210, 0xb210, 0xb200, 0xb210, - 0xb200, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1302, + 0x1301, 0x1301, 0x1301, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, + 0xb210, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1382, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, - 0x1302, 0x1302, 0x1302, 0xb210, 0xb200, 0xb210, 0xb200, 0xe220, + 0x1302, 0x1302, 0x1302, 0xb210, 0xb210, 0xb210, 0xb210, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x8228, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, - 0x7248, 0xb210, 0x5200, 0x5200, 0x5200, 0x5200, 0xb200, 0xb200, - 0xb200, 0xb200, 0x1302, 0xb210, 0xb200, 0xe220, 0xb200, 0xb200, - 0x5200, 0x5200, 0x3200, 0x3200, 0xb200, 0x1302, 0xb200, 0xb210, - 0xb200, 0x3200, 0x1302, 0xb210, 0xb200, 0xb200, 0xb200, 0xb210, + 0x7248, 0xb210, 0x5210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, + 0xb210, 0xb210, 0x1312, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, + 0x5210, 0x5210, 0x3210, 0x3210, 0xb210, 0x1312, 0xb210, 0xb210, + 0xb210, 0x3210, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, - 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb200, + 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, - 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0xb200, + 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0xb210, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302,

1 0

Aric Stewart : libwine: There are a few supercript characters (No, Lm types ) that Windows marks as being either digit or as a letter.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 46a5b46710a4b8a886674a13b401c01db3d09bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a5b46710a4b8a886674a13b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:43 2010 -0500 libwine: There are a few supercript characters (No, Lm types) that Windows marks as being either digit or as a letter. --- libs/wine/cpmap.pl | 4 +++- libs/wine/wctype.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index 7a02ee6..79f5fd5 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -161,7 +161,9 @@ my %special_categories = 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, 0xfff9, 0xfffa, 0xfffb ], "punct" => [ 0x24, 0x2b, 0x3c..0x3e, 0x5e, 0x60, 0x7c, 0x7e, 0xa2..0xbe, - 0xd7, 0xf7 ] + 0xd7, 0xf7 ], + "digit" => [ 0xb2, 0xb3, 0xb9 ], + "lower" => [ 0x2071, 0x207f ] ); my %directions = diff --git a/libs/wine/wctype.c b/libs/wine/wctype.c index 071a7b4..5b5100e 100644 --- a/libs/wine/wctype.c +++ b/libs/wine/wctype.c @@ -61,8 +61,8 @@ const unsigned short wine_wctype_table[17152] = 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x7248, 0xb210, 0x5210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1312, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, - 0x5210, 0x5210, 0x3210, 0x3210, 0xb210, 0x1312, 0xb210, 0xb210, - 0xb210, 0x3210, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, + 0x5210, 0x5210, 0x3214, 0x3214, 0xb210, 0x1312, 0xb210, 0xb210, + 0xb210, 0x3214, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb210, @@ -1045,8 +1045,8 @@ const unsigned short wine_wctype_table[17152] = 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xa208, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, - 0x3200, 0x1300, 0x0000, 0x0000, 0x3200, 0x3200, 0x3200, 0x3200, - 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x1300, + 0x3200, 0x1302, 0x0000, 0x0000, 0x3200, 0x3200, 0x3200, 0x3200, + 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x1302, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x3200, 0x4200, 0x4200, 0xb200, 0xb210, 0xb210, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000,

1 0

Aric Stewart : kernel32/tests: Add test for CT_TYPE1 of GetStringTypeW.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6c970e7e665745c587b5f9afb72435f21d3c0c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c970e7e665745c587b5f9afb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 19 13:52:57 2010 -0500 kernel32/tests: Add test for CT_TYPE1 of GetStringTypeW. --- dlls/kernel32/tests/locale.c | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f37d503..9d6f7e4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2656,6 +2656,131 @@ static void test_GetCPInfo(void) } } +/* + * The CT_TYPE1 has varied over windows version. + * The current target for correct behavior is windows 7. + * There was a big shift between windows 2000 (first introduced) and windows Xp + * Most of the old values below are from windows 2000. + * A smaller subset of changes happened between windows Xp and Window vista/7 + */ +static void test_GetStringTypeW(void) +{ + static const WCHAR blanks[] = {0x9, 0x20, 0xa0, 0x3000, 0xfeff}; + static const WORD blanks_new[] = {C1_SPACE | C1_CNTRL | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_SPACE | C1_BLANK | C1_DEFINED, + C1_CNTRL | C1_BLANK | C1_DEFINED}; + static const WORD blanks_old[] ={C1_SPACE | C1_CNTRL | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK, + C1_SPACE | C1_BLANK}; + + static const WCHAR undefined[] = {0x378, 0x379, 0x65f, 0xfff8, 0xfffe}; + + /* Lu, Ll, Lt */ + static const WCHAR alpha[] = {0x47, 0x67, 0x1c5}; + static const WORD alpha_old[] = {C1_UPPER | C1_ALPHA, + C1_LOWER | C1_ALPHA, + C1_UPPER | C1_LOWER | C1_ALPHA, + C1_ALPHA}; + + /* Sk, Sk, Mn, So, Me */ + static const WCHAR oldpunc[] = { 0x2c2, 0x2e5, 0x322, 0x482, 0x6de, + /* Sc, Sm, No,*/ + 0xffe0, 0xffe9, 0x2153}; + + /* Lm, Nl, Cf, 0xad(Cf), 0x1f88 (Lt), Lo, Mc */ + static const WCHAR changed[] = {0x2b0, 0x2160, 0x600, 0xad, 0x1f88, 0x294, 0x903}; + static const WORD changed_old[] = { C1_PUNCT, C1_PUNCT, 0, C1_PUNCT, C1_UPPER | C1_ALPHA, C1_ALPHA, C1_PUNCT }; + static const WORD changed_xp[] = {C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_CNTRL | C1_DEFINED, + C1_PUNCT | C1_DEFINED, + C1_UPPER | C1_LOWER | C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_LOWER | C1_DEFINED, + C1_ALPHA | C1_DEFINED }; + static const WORD changed_new[] = { C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_CNTRL | C1_DEFINED, + C1_PUNCT | C1_CNTRL | C1_DEFINED, + C1_UPPER | C1_LOWER | C1_ALPHA | C1_DEFINED, + C1_ALPHA | C1_DEFINED, + C1_DEFINED + }; + /* Pc, Pd, Ps, Pe, Pi, Pf, Po*/ + static const WCHAR punct[] = { 0x5f, 0x2d, 0x28, 0x29, 0xab, 0xbb, 0x21 }; + + static const WCHAR punct_special[] = {0x24, 0x2b, 0x3c, 0x3e, 0x5e, 0x60, + 0x7c, 0x7e, 0xa2, 0xbe, 0xd7, 0xf7}; + static const WCHAR digit_special[] = {0xb2, 0xb3, 0xb9}; + static const WCHAR lower_special[] = {0x2071, 0x207f}; + static const WCHAR cntrl_special[] = {0x070f, 0x200c, 0x200d, + 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, + 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff, + 0xfff9, 0xfffa, 0xfffb}; + static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; + + WORD types[20]; + int i; + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, blanks, 5, types); + for (i = 0; i < 5; i++) + ok(types[i] == blanks_new[i] || broken(types[i] == blanks_old[i] || broken(types[i] == 0)), "incorrect type1 returned for %x -> (%x != %x)\n",blanks[i],types[i],blanks_new[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, alpha, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] == (C1_DEFINED | alpha_old[i]) || broken(types[i] == alpha_old[i]) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",alpha[i], types[i],(C1_DEFINED | alpha_old[i])); + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, undefined, 5, types); + for (i = 0; i < 5; i++) + ok(types[i] == 0, "incorrect types returned for %x -> (%x != 0)\n",undefined[i], types[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, oldpunc, 8, types); + for (i = 0; i < 8; i++) + ok(types[i] == C1_DEFINED || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",oldpunc[i], types[i], C1_DEFINED); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, changed, 7, types); + for (i = 0; i < 7; i++) + ok(types[i] == changed_new[i] || broken(types[i] == changed_old[i]) || broken(types[i] == changed_xp[i]) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",changed[i], types[i], changed_new[i]); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, punct, 7, types); + for (i = 0; i < 7; i++) + ok(types[i] == (C1_PUNCT | C1_DEFINED) || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x != %x)\n",punct[i], types[i], (C1_PUNCT | C1_DEFINED)); + + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, punct_special, 12, types); + for (i = 0; i < 12; i++) + ok(types[i] & C1_PUNCT || broken(types[i] == 0), "incorrect types returned for %x -> (%x doest not have %x)\n",punct_special[i], types[i], C1_PUNCT); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, digit_special, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] & C1_DIGIT || broken(types[i] == 0), "incorrect types returned for %x -> (%x doest not have = %x)\n",digit_special[i], types[i], C1_DIGIT); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, lower_special, 2, types); + for (i = 0; i < 2; i++) + ok(types[i] & C1_LOWER || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",lower_special[i], types[i], C1_LOWER); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, cntrl_special, 20, types); + for (i = 0; i < 20; i++) + ok(types[i] & C1_CNTRL || broken(types[i] == (C1_BLANK|C1_SPACE)) || broken(types[i] == C1_PUNCT) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",cntrl_special[i], types[i], C1_CNTRL); + + memset(types,0,sizeof(types)); + GetStringTypeW(CT_CTYPE1, space_special, 3, types); + for (i = 0; i < 3; i++) + ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -2680,6 +2805,7 @@ START_TEST(locale) test_SetLocaleInfoA(); test_EnumUILanguageA(); test_GetCPInfo(); + test_GetStringTypeW(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Andrey Turkin : kernel32: Enhance EndUpdateResource.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: a610fc17d8dd215651d272eb1787e011b2c5549a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a610fc17d8dd215651d272eb1… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jul 21 17:57:37 2010 +0400 kernel32: Enhance EndUpdateResource. --- dlls/kernel32/resource.c | 116 +++++++++++---- dlls/kernel32/tests/resource.c | 323 ++++++++++++++++++++++++++++++++-------- 2 files changed, 344 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a610fc17d8dd215651d27…

1 0

Hans Leidekker : winhttp: Add a partial implementation of WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT .
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: be370380901c506bafe33e0fafd0592ebd73eea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be370380901c506bafe33e0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 20 14:49:52 2010 +0200 winhttp: Add a partial implementation of WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT. --- dlls/winhttp/session.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 12 ++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 490da05..e0c1c2f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -559,6 +559,18 @@ static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) *buflen = len * sizeof(WCHAR); } +static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) +{ + WCHAR *ret; + DWORD size, format = CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG; + + size = CertNameToStrW( encoding, blob, format, NULL, 0 ); + if ((ret = LocalAlloc( 0, size * sizeof(WCHAR) ))) + CertNameToStrW( encoding, blob, format, ret, size ); + + return ret; +} + static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { request_t *request = (request_t *)hdr; @@ -598,6 +610,34 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(cert); return TRUE; } + case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: + { + const CERT_CONTEXT *cert; + WINHTTP_CERTIFICATE_INFO *ci = buffer; + + FIXME("partial stub\n"); + + if (!buffer || *buflen < sizeof(*ci)) + { + *buflen = sizeof(*ci); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!(cert = netconn_get_certificate( &request->netconn ))) return FALSE; + + ci->ftExpiry = cert->pCertInfo->NotAfter; + ci->ftStart = cert->pCertInfo->NotBefore; + ci->lpszSubjectInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Subject ); + ci->lpszIssuerInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Issuer ); + ci->lpszProtocolName = NULL; + ci->lpszSignatureAlgName = NULL; + ci->lpszEncryptionAlgName = NULL; + ci->dwKeySize = 128; + + CertFreeCertificateContext( cert ); + *buflen = sizeof(*ci); + return TRUE; + } case WINHTTP_OPTION_SECURITY_KEY_BITNESS: { if (!buffer || *buflen < sizeof(DWORD)) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05c548c..21cc501 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -770,6 +770,7 @@ static void test_secure_connection(void) DWORD size, status, policy, bitness; BOOL ret; CERT_CONTEXT *cert; + WINHTTP_CERTIFICATE_INFO info; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -823,6 +824,17 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + size = sizeof(info); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); + ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); + + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Hans Leidekker : winhttp: Handle errors from SSL_read.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 5fc17a280046346627661e17903d2cea473e7139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc17a280046346627661e179… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 20 14:50:19 2010 +0200 winhttp: Handle errors from SSL_read. --- dlls/winhttp/net.c | 24 +++++++++++++++++++----- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index ab7a4a7..e60bd16 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -111,6 +111,7 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); MAKE_FUNCPTR( SSL_set_ex_data ); @@ -440,6 +441,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_set_ex_data ); @@ -713,6 +715,8 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) { + int ret; + *recvd = 0; if (!netconn_connected( conn )) return FALSE; if (!len) return TRUE; @@ -751,19 +755,29 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd /* check if we have enough data from the peek buffer */ if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; } - *recvd += pSSL_read( conn->ssl_conn, (char *)buf + *recvd, len - *recvd ); + ret = pSSL_read( conn->ssl_conn, (char *)buf + *recvd, len - *recvd ); + if (ret < 0) + return FALSE; + + /* check if EOF was received */ + if (!ret && (pSSL_get_error( conn->ssl_conn, ret ) == SSL_ERROR_ZERO_RETURN || + pSSL_get_error( conn->ssl_conn, ret ) == SSL_ERROR_SYSCALL )) + { + netconn_close( conn ); + return TRUE; + } if (flags & MSG_PEEK) /* must copy into buffer */ { - conn->peek_len = *recvd; - if (!*recvd) + conn->peek_len = ret; + if (!ret) { heap_free( conn->peek_msg_mem ); conn->peek_msg_mem = NULL; conn->peek_msg = NULL; } - else memcpy( conn->peek_msg, buf, *recvd ); + else memcpy( conn->peek_msg, buf, ret ); } - if (*recvd < 1) return FALSE; + *recvd = ret; return TRUE; #else return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 21cc501..3c725cf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -771,6 +771,7 @@ static void test_secure_connection(void) BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; + char buffer[32]; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -847,6 +848,13 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); + for (;;) + { + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + if (!size) break; + } + cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con);

1 0

Dylan Smith : user32/tests: Minimized windows shouldn't be resizable.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: f35dabad99cf8fbaec458a67c96ea1aededd4651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35dabad99cf8fbaec458a67c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:53:15 2010 -0400 user32/tests: Minimized windows shouldn't be resizable. --- dlls/user32/tests/win.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eadad3a..522a0f5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4872,7 +4872,7 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc; + RECT rcMain, rc, rcMinimized; LPARAM ret; SetRect(&rcMain, 120, 120, 210, 210); @@ -4914,8 +4914,16 @@ static void test_ShowWindow(void) ok(style & WS_VISIBLE, "window should be visible\n"); ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rcMinimized); + ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); + /* shouldn't be able to resize minized windows */ + ret = SetWindowPos(hwnd, 0, 0, 0, + (rcMinimized.right - rcMinimized.left) * 2, + (rcMinimized.bottom - rcMinimized.top) * 2, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret);

1 0