December 2011 - Wine-commits

Kusanagi Kouichi : gdi32: Don't use preferred family name.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: bf8a10063924a826766af2e478e248bb6ea061e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8a10063924a826766af2e47… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:16 2011 +0900 gdi32: Don't use preferred family name. --- dlls/gdi32/freetype.c | 24 ++++++++++++++++-------- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 959f4aa..615a01a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1487,8 +1487,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { - char *family_name = fake_family; - if (file) { TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); @@ -1571,9 +1569,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ HeapFree(GetProcessHeap(), 0, localised_family); } - if(!family_name) - family_name = ft_face->family_name; - bitmap_num = 0; do { My_FT_Bitmap_Size *size = NULL; @@ -1582,9 +1577,22 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - len = MultiByteToWideChar(CP_ACP, 0, family_name, -1, NULL, 0); - english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, family_name, -1, english_family, len); + if(fake_family) + { + len = MultiByteToWideChar(CP_ACP, 0, fake_family, -1, NULL, 0); + english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, fake_family, -1, english_family, len); + } + else + { + english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); + if(!english_family) + { + len = MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, NULL, 0); + english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, english_family, len); + } + } localised_family = NULL; if(!fake_family) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0a202dd..ed629ce 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4125,8 +4125,6 @@ static void test_vertical_font(void) ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); check_vertical_font("@WineTestVertical", &installed, &selected, &gm); - /* This test fails on wine if locale is not en-US. Disable for now. */ - if (0) ok(installed, "@WineTestVertical is not installed\n"); todo_wine ok(selected, "@WineTestVertical is not selected\n");

1 0

Kusanagi Kouichi : gdi32: Don't remove leading '@' from face name.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: b5446ddb45d13b965e385ff76bbd5be69f4e7207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5446ddb45d13b965e385ff76… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:26 2011 +0900 gdi32: Don't remove leading '@' from face name. --- dlls/gdi32/freetype.c | 8 -------- dlls/gdi32/tests/font.c | 1 - 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 615a01a..9762230 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3940,14 +3940,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) CHILD_FONT *font_link_entry; LPWSTR FaceName = lf.lfFaceName; - /* - * Check for a leading '@' this signals that the font is being - * requested in tategaki mode (vertical writing substitution) but - * does not affect the fontface that is to be selected. - */ - if (lf.lfFaceName[0]=='@') - FaceName = &lf.lfFaceName[1]; - psub = get_font_subst(&font_subst_list, FaceName, lf.lfCharSet); if(psub) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ed629ce..98c61a0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4126,7 +4126,6 @@ static void test_vertical_font(void) check_vertical_font("@WineTestVertical", &installed, &selected, &gm); ok(installed, "@WineTestVertical is not installed\n"); - todo_wine ok(selected, "@WineTestVertical is not selected\n"); todo_wine ok(gm.gmBlackBoxX > gm.gmBlackBoxY,

1 0

Aric Stewart : usp10: Add Kana script.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 30dc47557a5f864e31b9bb5886dfbcc8c3eebc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30dc47557a5f864e31b9bb588… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 14:50:29 2011 -0600 usp10: Add Kana script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 20 +++++++++++++++++--- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e225041..7ff8070 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -642,6 +642,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, {{ no_features, 0}, NULL, "bopo", "", NULL, NULL}, + {{ no_features, 0}, NULL, "kana", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 77c5d5e..a726b68 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -155,6 +155,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define khmr_tag MS_MAKE_TAG('k','h','m','r') #define hani_tag MS_MAKE_TAG('h','a','n','i') #define bopo_tag MS_MAKE_TAG('b','o','p','o') +#define kana_tag MS_MAKE_TAG('k','a','n','a') static void test_ScriptItemize( void ) { @@ -339,6 +340,11 @@ static void test_ScriptItemize( void ) static const itemTest t301[2] = {{{0,0,0,0,0},0,0,0,0,bopo_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; static const itemTest t302[2] = {{{0,0,0,0,0},0,0,0,2,bopo_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + /* Kana */ + static const WCHAR test31[] = {0x3072,0x3089,0x304b,0x306a,0x30ab,0x30bf,0x30ab,0x30ca}; + static const itemTest t311[2] = {{{0,0,0,0,0},0,0,0,0,kana_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + static const itemTest t312[2] = {{{0,0,0,0,0},0,0,0,2,kana_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -402,6 +408,7 @@ static void test_ScriptItemize( void ) test_items_ok(test28,4,NULL,NULL,1,t281,FALSE,0); test_items_ok(test29,10,NULL,NULL,2,t291,FALSE,0); test_items_ok(test30,8,NULL,NULL,1,t301,FALSE,0); + test_items_ok(test31,8,NULL,NULL,1,t311,FALSE,2); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -439,6 +446,7 @@ static void test_ScriptItemize( void ) test_items_ok(test28,4,&Control,&State,1,t281,FALSE,0); test_items_ok(test29,10,&Control,&State,2,t291,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t301,FALSE,0); + test_items_ok(test31,8,&Control,&State,1,t311,FALSE,2); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -476,6 +484,7 @@ static void test_ScriptItemize( void ) test_items_ok(test28,4,&Control,&State,1,t282,FALSE,0); test_items_ok(test29,10,&Control,&State,2,t292,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); + test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -514,6 +523,7 @@ static void test_ScriptItemize( void ) test_items_ok(test28,4,&Control,&State,1,t282,FALSE,0); test_items_ok(test29,10,&Control,&State,2,t292,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); + test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c02a10e..4ebbd93 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -179,9 +179,14 @@ static const scriptRange scriptRanges[] = { { Script_Ideograph ,0x3008, 0x3020, 0, 0}, { Script_CJK_Han ,0x3021, 0x3029, 0, 0}, { Script_Ideograph ,0x302a, 0x3030, 0, 0}, + /* Kana Marks: */ + { Script_Kana ,0x3031, 0x3035, 0, 0}, { Script_Ideograph ,0x3036, 0x3037, 0, 0}, { Script_CJK_Han ,0x3038, 0x303b, 0, 0}, { Script_Ideograph ,0x303c, 0x303f, 0, 0}, + /* Hiragana: U+3040–U+309F */ + /* Katakana: U+30A0–U+30FF */ + { Script_Kana ,0x3040, 0x30ff, 0, 0}, /* Bopomofo: U+3100–U+312F */ { Script_Bopomofo ,0x3100, 0x312f, 0, 0}, /* Kanbun: U+3190–U+319F */ @@ -190,10 +195,14 @@ static const scriptRange scriptRanges[] = { { Script_Bopomofo ,0x31a0, 0x31bf, 0, 0}, /* CJK Strokes: U+31C0–U+31EF */ { Script_Ideograph ,0x31c0, 0x31ef, 0, 0}, + /* Katakana Phonetic Extensions: U+31F0–U+31FF */ + { Script_Kana ,0x31f0, 0x31ff, 0, 0}, /* Enclosed CJK Letters and Months: U+3200–U+32FF */ - { Script_Ideograph ,0x3220, 0x32ff, 0, 0}, + { Script_Ideograph ,0x3220, 0x32ef, 0, 0}, + { Script_Kana ,0x32d0, 0x31ff, 0, 0}, /* CJK Compatibility: U+3300–U+33FF*/ - { Script_Ideograph ,0x3300, 0x33ff, 0, 0}, + { Script_Kana ,0x3300, 0x3357, 0, 0}, + { Script_Ideograph ,0x3358, 0x33ff, 0, 0}, /* CJK Unified Ideographs Extension A: U+3400–U+4DBF */ { Script_CJK_Han ,0x3400, 0x4dbf, 0, 0}, /* CJK Unified Ideographs: U+4E00–U+9FFF */ @@ -228,6 +237,7 @@ static const scriptRange scriptRanges[] = { { Script_Arabic, 0xfe70, 0xfeff, 0, 0}, /* Halfwidth and Fullwidth Forms: U+FF00–FFEF */ { Script_Ideograph ,0xff00, 0xff64, Script_Numeric2, 0}, + { Script_Kana ,0xff65, 0xff9f, 0, 0}, { Script_Ideograph ,0xffe0, 0xffef, 0, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} @@ -471,6 +481,10 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('b','o','p','o'), {0}}, + {{Script_Kana, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + MS_MAKE_TAG('k','a','n','a'), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -503,7 +517,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[50].props, &scriptInformation[51].props, &scriptInformation[52].props, &scriptInformation[53].props, &scriptInformation[54].props, &scriptInformation[55].props, - &scriptInformation[56].props + &scriptInformation[56].props, &scriptInformation[57].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index deaf4df..b287ed5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -87,6 +87,7 @@ #define Script_CJK_Han 54 #define Script_Ideograph 55 #define Script_Bopomofo 56 +#define Script_Kana 57 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Hangul script.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 345102ed135ffe9010876116be92942f376902e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=345102ed135ffe9010876116b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 14:50:34 2011 -0600 usp10: Add Hangul script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 23 +++++++++++++++++++++-- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7ff8070..bc53bba 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -643,6 +643,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, {{ no_features, 0}, NULL, "bopo", "", NULL, NULL}, {{ no_features, 0}, NULL, "kana", "", NULL, NULL}, + {{ no_features, 0}, NULL, "hang", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a726b68..83ea749 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -156,6 +156,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define hani_tag MS_MAKE_TAG('h','a','n','i') #define bopo_tag MS_MAKE_TAG('b','o','p','o') #define kana_tag MS_MAKE_TAG('k','a','n','a') +#define hang_tag MS_MAKE_TAG('h','a','n','g') static void test_ScriptItemize( void ) { @@ -345,6 +346,11 @@ static void test_ScriptItemize( void ) static const itemTest t311[2] = {{{0,0,0,0,0},0,0,0,0,kana_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; static const itemTest t312[2] = {{{0,0,0,0,0},0,0,0,2,kana_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + /* Hangul */ + static const WCHAR test32[] = {0xd55c,0xad6d,0xc5b4}; + static const itemTest t321[2] = {{{0,0,0,0,0},0,0,0,0,hang_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + static const itemTest t322[2] = {{{0,0,0,0,0},0,0,0,2,hang_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -409,6 +415,7 @@ static void test_ScriptItemize( void ) test_items_ok(test29,10,NULL,NULL,2,t291,FALSE,0); test_items_ok(test30,8,NULL,NULL,1,t301,FALSE,0); test_items_ok(test31,8,NULL,NULL,1,t311,FALSE,2); + test_items_ok(test32,3,NULL,NULL,1,t321,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -447,6 +454,7 @@ static void test_ScriptItemize( void ) test_items_ok(test29,10,&Control,&State,2,t291,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t301,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t311,FALSE,2); + test_items_ok(test32,3,&Control,&State,1,t321,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -485,6 +493,7 @@ static void test_ScriptItemize( void ) test_items_ok(test29,10,&Control,&State,2,t292,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); + test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -524,6 +533,7 @@ static void test_ScriptItemize( void ) test_items_ok(test29,10,&Control,&State,2,t292,FALSE,0); test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); + test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4ebbd93..dcd4477 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -111,6 +111,8 @@ static const scriptRange scriptRanges[] = { { Script_Myanmar, 0x1000, 0x109f, Script_Myanmar_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, + /* Hangul Jamo: U+1100–U+11FF */ + { Script_Hangul, 0x1100, 0x11ff, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Tai Le: U+1950–U+197F */ @@ -189,6 +191,8 @@ static const scriptRange scriptRanges[] = { { Script_Kana ,0x3040, 0x30ff, 0, 0}, /* Bopomofo: U+3100–U+312F */ { Script_Bopomofo ,0x3100, 0x312f, 0, 0}, + /* Hangul Compatibility Jamo: U+3130–U+318F */ + { Script_Hangul ,0x3130, 0x318f, 0, 0}, /* Kanbun: U+3190–U+319F */ { Script_Ideograph ,0x3190, 0x319f, 0, 0}, /* Bopomofo Extended: U+31A0–U+31BF */ @@ -198,7 +202,10 @@ static const scriptRange scriptRanges[] = { /* Katakana Phonetic Extensions: U+31F0–U+31FF */ { Script_Kana ,0x31f0, 0x31ff, 0, 0}, /* Enclosed CJK Letters and Months: U+3200–U+32FF */ - { Script_Ideograph ,0x3220, 0x32ef, 0, 0}, + { Script_Hangul ,0x3200, 0x321f, 0, 0}, + { Script_Ideograph ,0x3220, 0x325f, 0, 0}, + { Script_Hangul ,0x3260, 0x327f, 0, 0}, + { Script_Ideograph ,0x3280, 0x32ef, 0, 0}, { Script_Kana ,0x32d0, 0x31ff, 0, 0}, /* CJK Compatibility: U+3300–U+33FF*/ { Script_Kana ,0x3300, 0x3357, 0, 0}, @@ -218,6 +225,12 @@ static const scriptRange scriptRanges[] = { { Script_Devanagari, 0xa8e0, 0xa8ff, Script_Devanagari_Numeric, 0}, /* Myanmar Extended-A: U+AA60–U+AA7F */ { Script_Myanmar, 0xaa60, 0xaa7f, Script_Myanmar_Numeric, 0}, + /* Hangul Jamo Extended-A: U+A960–U+A97F */ + { Script_Hangul, 0xa960, 0xa97f, 0, 0}, + /* Hangul Syllables: U+AC00–U+D7A3 */ + { Script_Hangul, 0xac00, 0xd7a3, 0, 0}, + /* Hangul Jamo Extended-B: U+D7B0–U+D7FF */ + { Script_Hangul, 0xd7b0, 0xd7ff, 0, 0}, /* CJK Compatibility Ideographs: U+F900–U+FAFF */ { Script_CJK_Han ,0xf900, 0xfaff, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ @@ -238,6 +251,7 @@ static const scriptRange scriptRanges[] = { /* Halfwidth and Fullwidth Forms: U+FF00–FFEF */ { Script_Ideograph ,0xff00, 0xff64, Script_Numeric2, 0}, { Script_Kana ,0xff65, 0xff9f, 0, 0}, + { Script_Hangul ,0xffa0, 0xffdf, 0, 0}, { Script_Ideograph ,0xffe0, 0xffef, 0, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} @@ -485,6 +499,10 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('k','a','n','a'), {0}}, + {{Script_Hangul, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_KOREAN, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + MS_MAKE_TAG('h','a','n','g'), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -517,7 +535,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[50].props, &scriptInformation[51].props, &scriptInformation[52].props, &scriptInformation[53].props, &scriptInformation[54].props, &scriptInformation[55].props, - &scriptInformation[56].props, &scriptInformation[57].props + &scriptInformation[56].props, &scriptInformation[57].props, + &scriptInformation[58].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b287ed5..3ee06cb 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -88,6 +88,7 @@ #define Script_Ideograph 55 #define Script_Bopomofo 56 #define Script_Kana 57 +#define Script_Hangul 58 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Yi script.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 4d34ea52adfaea2d0ae101ed494c3f0011467bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d34ea52adfaea2d0ae101ed4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 14:50:40 2011 -0600 usp10: Add Yi script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 8 +++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bc53bba..4b399d7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -644,6 +644,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "bopo", "", NULL, NULL}, {{ no_features, 0}, NULL, "kana", "", NULL, NULL}, {{ no_features, 0}, NULL, "hang", "", NULL, NULL}, + {{ no_features, 0}, NULL, "yi ", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 83ea749..b2538f8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -157,6 +157,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define bopo_tag MS_MAKE_TAG('b','o','p','o') #define kana_tag MS_MAKE_TAG('k','a','n','a') #define hang_tag MS_MAKE_TAG('h','a','n','g') +#define yi_tag MS_MAKE_TAG('y','i',' ',' ') static void test_ScriptItemize( void ) { @@ -351,6 +352,11 @@ static void test_ScriptItemize( void ) static const itemTest t321[2] = {{{0,0,0,0,0},0,0,0,0,hang_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; static const itemTest t322[2] = {{{0,0,0,0,0},0,0,0,2,hang_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + /* Yi */ + static const WCHAR test33[] = {0xa188,0xa320,0xa071,0xa0b7}; + static const itemTest t331[2] = {{{0,0,0,0,0},0,0,0,0,yi_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + static const itemTest t332[2] = {{{0,0,0,0,0},0,0,0,2,yi_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -416,6 +422,7 @@ static void test_ScriptItemize( void ) test_items_ok(test30,8,NULL,NULL,1,t301,FALSE,0); test_items_ok(test31,8,NULL,NULL,1,t311,FALSE,2); test_items_ok(test32,3,NULL,NULL,1,t321,FALSE,0); + test_items_ok(test33,4,NULL,NULL,1,t331,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -455,6 +462,7 @@ static void test_ScriptItemize( void ) test_items_ok(test30,8,&Control,&State,1,t301,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t311,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t321,FALSE,0); + test_items_ok(test33,4,&Control,&State,1,t331,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -494,6 +502,7 @@ static void test_ScriptItemize( void ) test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); + test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -534,6 +543,7 @@ static void test_ScriptItemize( void ) test_items_ok(test30,8,&Control,&State,1,t302,FALSE,0); test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); + test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index dcd4477..71888db 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -214,6 +214,8 @@ static const scriptRange scriptRanges[] = { { Script_CJK_Han ,0x3400, 0x4dbf, 0, 0}, /* CJK Unified Ideographs: U+4E00–U+9FFF */ { Script_CJK_Han ,0x4e00, 0x9fff, 0, 0}, + /* Yi: U+A000–U+A4CF */ + { Script_Yi ,0xa000, 0xa4cf, 0, 0}, /* Cyrillic Extended-B: U+A640–U+A69F */ { Script_Cyrillic, 0xa640, 0xa69f, 0, 0}, /* Modifier Tone Letters: U+A700–U+A71F */ @@ -503,6 +505,10 @@ static const scriptData scriptInformation[] = { {LANG_KOREAN, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','g'), {0}}, + {{Script_Yi, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + MS_MAKE_TAG('y','i',' ',' '), + {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -536,7 +542,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[52].props, &scriptInformation[53].props, &scriptInformation[54].props, &scriptInformation[55].props, &scriptInformation[56].props, &scriptInformation[57].props, - &scriptInformation[58].props + &scriptInformation[58].props, &scriptInformation[59].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 3ee06cb..563323e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -89,6 +89,7 @@ #define Script_Bopomofo 56 #define Script_Kana 57 #define Script_Hangul 58 +#define Script_Yi 59 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Nikolay Sivov : ole32: COM cleanup of IStream based on HGLOBAL.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 5f5d5e0c6573ba46728208e7b4fb46c9eab21b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5d5e0c6573ba46728208e7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 00:22:03 2011 +0300 ole32: COM cleanup of IStream based on HGLOBAL. --- dlls/ole32/hglobalstream.c | 114 ++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 68 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index b0055e2..860fd03 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -51,39 +51,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); * This class implements the IStream interface and represents a stream * supported by an HGLOBAL pointer. */ -struct HGLOBALStreamImpl +typedef struct { - const IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct - * since we want to cast this in an IStream pointer */ + IStream IStream_iface; + LONG ref; - /* - * Reference count - */ - LONG ref; - - /* - * Support for the stream - */ + /* support for the stream */ HGLOBAL supportHandle; - /* - * This flag is TRUE if the HGLOBAL is destroyed when the stream - * is finally released. - */ - BOOL deleteOnRelease; + /* if TRUE the HGLOBAL is destroyed when the stream is finally released */ + BOOL deleteOnRelease; - /* - * Helper variable that contains the size of the stream - */ - ULARGE_INTEGER streamSize; + /* size of the stream */ + ULARGE_INTEGER streamSize; - /* - * This is the current position of the cursor in the stream - */ - ULARGE_INTEGER currentPosition; -}; + /* current position of the cursor */ + ULARGE_INTEGER currentPosition; +} HGLOBALStreamImpl; -typedef struct HGLOBALStreamImpl HGLOBALStreamImpl; +static inline HGLOBALStreamImpl *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, HGLOBALStreamImpl, IStream_iface); +} /*** * This is the destructor of the HGLOBALStreamImpl class. @@ -115,10 +104,9 @@ static void HGLOBALStreamImpl_Destroy(HGLOBALStreamImpl* This) * This implements the IUnknown method AddRef for this * class */ -static ULONG WINAPI HGLOBALStreamImpl_AddRef( - IStream* iface) +static ULONG WINAPI HGLOBALStreamImpl_AddRef(IStream* iface) { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); return InterlockedIncrement(&This->ref); } @@ -131,7 +119,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( REFIID riid, /* [in] */ void** ppvObject) /* [iid_is][out] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); /* * Perform a sanity check on the parameters. @@ -176,20 +164,13 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( static ULONG WINAPI HGLOBALStreamImpl_Release( IStream* iface) { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; - ULONG newRef; - - newRef = InterlockedDecrement(&This->ref); + HGLOBALStreamImpl* This= impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); - /* - * If the reference count goes down to 0, perform suicide. - */ - if (newRef==0) - { + if (!ref) HGLOBALStreamImpl_Destroy(This); - } - return newRef; + return ref; } /*** @@ -207,7 +188,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); void* supportBuffer; ULONG bytesReadBuffer; @@ -281,7 +262,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); void* supportBuffer; ULARGE_INTEGER newSize; @@ -363,7 +344,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( DWORD dwOrigin, /* [in] */ ULARGE_INTEGER* plibNewPosition) /* [out] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); ULARGE_INTEGER newPosition = This->currentPosition; HRESULT hr = S_OK; @@ -428,7 +409,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_SetSize( IStream* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); HGLOBAL supportHandle; TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart); @@ -593,7 +574,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Stat( STATSTG* pstatstg, /* [out] */ DWORD grfStatFlag) /* [in] */ { - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + HGLOBALStreamImpl* This = impl_from_IStream(iface); memset(pstatstg, 0, sizeof(STATSTG)); @@ -608,12 +589,13 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( IStream* iface, IStream** ppstm) /* [out] */ { + HGLOBALStreamImpl* This = impl_from_IStream(iface); ULARGE_INTEGER dummy; LARGE_INTEGER offset; HRESULT hr; - HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; + TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->deleteOnRelease,(long)This->currentPosition.QuadPart); - hr=CreateStreamOnHGlobal(This->supportHandle, FALSE, ppstm); + hr = CreateStreamOnHGlobal(This->supportHandle, FALSE, ppstm); if(FAILED(hr)) return hr; offset.QuadPart=(LONGLONG)This->currentPosition.QuadPart; @@ -624,7 +606,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( /* * Virtual function table for the HGLOBALStreamImpl class. */ -static const IStreamVtbl HGLOBALStreamImpl_Vtbl = +static const IStreamVtbl HGLOBALStreamImplVtbl = { HGLOBALStreamImpl_QueryInterface, HGLOBALStreamImpl_AddRef, @@ -658,47 +640,43 @@ static HGLOBALStreamImpl* HGLOBALStreamImpl_Construct( HGLOBAL hGlobal, BOOL fDeleteOnRelease) { - HGLOBALStreamImpl* newStream; + HGLOBALStreamImpl* This; - newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); - - if (newStream!=0) + This = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); + if (This) { - /* - * Set-up the virtual function table and reference count. - */ - newStream->lpVtbl = &HGLOBALStreamImpl_Vtbl; - newStream->ref = 0; + This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; + This->ref = 0; /* * Initialize the support. */ - newStream->supportHandle = hGlobal; - newStream->deleteOnRelease = fDeleteOnRelease; + This->supportHandle = hGlobal; + This->deleteOnRelease = fDeleteOnRelease; /* * This method will allocate a handle if one is not supplied. */ - if (!newStream->supportHandle) + if (!This->supportHandle) { - newStream->supportHandle = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | + This->supportHandle = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_SHARE, 0); } /* * Start the stream at the beginning. */ - newStream->currentPosition.u.HighPart = 0; - newStream->currentPosition.u.LowPart = 0; + This->currentPosition.u.HighPart = 0; + This->currentPosition.u.LowPart = 0; /* * Initialize the size of the stream to the size of the handle. */ - newStream->streamSize.u.HighPart = 0; - newStream->streamSize.u.LowPart = GlobalSize(newStream->supportHandle); + This->streamSize.u.HighPart = 0; + This->streamSize.u.LowPart = GlobalSize(This->supportHandle); } - return newStream; + return This; } @@ -743,7 +721,7 @@ HRESULT WINAPI GetHGlobalFromStream(IStream* pstm, HGLOBAL* phglobal) /* * Verify that the stream object was created with CreateStreamOnHGlobal. */ - if (pStream->lpVtbl == &HGLOBALStreamImpl_Vtbl) + if (pStream->IStream_iface.lpVtbl == &HGLOBALStreamImplVtbl) *phglobal = pStream->supportHandle; else {

1 0

Nikolay Sivov : ole32: Simplify stream creation, remove redundant comments.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 5b533d82d2de543a1624ecbda77e2d1a7ea370dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b533d82d2de543a1624ecbda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 00:43:24 2011 +0300 ole32: Simplify stream creation, remove redundant comments. --- dlls/ole32/hglobalstream.c | 175 +++++++++++--------------------------------- 1 files changed, 42 insertions(+), 133 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 860fd03..ce0f34c 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -74,46 +74,6 @@ static inline HGLOBALStreamImpl *impl_from_IStream(IStream *iface) return CONTAINING_RECORD(iface, HGLOBALStreamImpl, IStream_iface); } -/*** - * This is the destructor of the HGLOBALStreamImpl class. - * - * This method will clean-up all the resources used-up by the given HGLOBALStreamImpl - * class. The pointer passed-in to this function will be freed and will not - * be valid anymore. - */ -static void HGLOBALStreamImpl_Destroy(HGLOBALStreamImpl* This) -{ - TRACE("(%p)\n", This); - - /* - * Release the HGlobal if the constructor asked for that. - */ - if (This->deleteOnRelease) - { - GlobalFree(This->supportHandle); - This->supportHandle=0; - } - - /* - * Finally, free the memory used-up by the class. - */ - HeapFree(GetProcessHeap(), 0, This); -} - -/*** - * This implements the IUnknown method AddRef for this - * class - */ -static ULONG WINAPI HGLOBALStreamImpl_AddRef(IStream* iface) -{ - HGLOBALStreamImpl* This = impl_from_IStream(iface); - return InterlockedIncrement(&This->ref); -} - -/*** - * This implements the IUnknown method QueryInterface for this - * class - */ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( IStream* iface, REFIID riid, /* [in] */ @@ -121,20 +81,11 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( { HGLOBALStreamImpl* This = impl_from_IStream(iface); - /* - * Perform a sanity check on the parameters. - */ if (ppvObject==0) return E_INVALIDARG; - /* - * Initialize the return parameter. - */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_ISequentialStream, riid) || IsEqualIID(&IID_IStream, riid)) @@ -142,25 +93,20 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( *ppvObject = This; } - /* - * Check that we obtained an interface. - */ if ((*ppvObject)==0) return E_NOINTERFACE; - /* - * Query Interface always increases the reference count by one when it is - * successful - */ - HGLOBALStreamImpl_AddRef(iface); + IStream_AddRef(iface); return S_OK; } -/*** - * This implements the IUnknown method Release for this - * class - */ +static ULONG WINAPI HGLOBALStreamImpl_AddRef(IStream* iface) +{ + HGLOBALStreamImpl* This = impl_from_IStream(iface); + return InterlockedIncrement(&This->ref); +} + static ULONG WINAPI HGLOBALStreamImpl_Release( IStream* iface) { @@ -168,7 +114,15 @@ static ULONG WINAPI HGLOBALStreamImpl_Release( ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - HGLOBALStreamImpl_Destroy(This); + { + if (This->deleteOnRelease) + { + GlobalFree(This->supportHandle); + This->supportHandle = NULL; + } + + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -598,14 +552,11 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( hr = CreateStreamOnHGlobal(This->supportHandle, FALSE, ppstm); if(FAILED(hr)) return hr; - offset.QuadPart=(LONGLONG)This->currentPosition.QuadPart; - HGLOBALStreamImpl_Seek(*ppstm,offset,STREAM_SEEK_SET,&dummy); + offset.QuadPart = (LONGLONG)This->currentPosition.QuadPart; + IStream_Seek(*ppstm, offset, STREAM_SEEK_SET, &dummy); return S_OK; } -/* - * Virtual function table for the HGLOBALStreamImpl class. - */ static const IStreamVtbl HGLOBALStreamImplVtbl = { HGLOBALStreamImpl_QueryInterface, @@ -624,62 +575,6 @@ static const IStreamVtbl HGLOBALStreamImplVtbl = HGLOBALStreamImpl_Clone }; -/****************************************************************************** -** HGLOBALStreamImpl implementation -*/ - -/*** - * This is the constructor for the HGLOBALStreamImpl class. - * - * Params: - * hGlobal - Handle that will support the stream. can be NULL. - * fDeleteOnRelease - Flag set to TRUE if the HGLOBAL will be released - * when the IStream object is destroyed. - */ -static HGLOBALStreamImpl* HGLOBALStreamImpl_Construct( - HGLOBAL hGlobal, - BOOL fDeleteOnRelease) -{ - HGLOBALStreamImpl* This; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); - if (This) - { - This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; - This->ref = 0; - - /* - * Initialize the support. - */ - This->supportHandle = hGlobal; - This->deleteOnRelease = fDeleteOnRelease; - - /* - * This method will allocate a handle if one is not supplied. - */ - if (!This->supportHandle) - { - This->supportHandle = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | - GMEM_SHARE, 0); - } - - /* - * Start the stream at the beginning. - */ - This->currentPosition.u.HighPart = 0; - This->currentPosition.u.LowPart = 0; - - /* - * Initialize the size of the stream to the size of the handle. - */ - This->streamSize.u.HighPart = 0; - This->streamSize.u.LowPart = GlobalSize(This->supportHandle); - } - - return This; -} - - /*********************************************************************** * CreateStreamOnHGlobal [OLE32.@] */ @@ -688,22 +583,36 @@ HRESULT WINAPI CreateStreamOnHGlobal( BOOL fDeleteOnRelease, LPSTREAM* ppstm) { - HGLOBALStreamImpl* newStream; + HGLOBALStreamImpl* This; if (!ppstm) return E_INVALIDARG; - newStream = HGLOBALStreamImpl_Construct(hGlobal, - fDeleteOnRelease); + This = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); + if (!This) return E_OUTOFMEMORY; - if (newStream!=NULL) - { - return IUnknown_QueryInterface((IUnknown*)newStream, - &IID_IStream, - (void**)ppstm); - } + This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; + This->ref = 1; + + /* initialize the support */ + This->supportHandle = hGlobal; + This->deleteOnRelease = fDeleteOnRelease; + + /* allocate a handle if one is not supplied */ + if (!This->supportHandle) + This->supportHandle = GlobalAlloc(GMEM_MOVEABLE|GMEM_NODISCARD|GMEM_SHARE, 0); - return E_OUTOFMEMORY; + /* start at the beginning */ + This->currentPosition.u.HighPart = 0; + This->currentPosition.u.LowPart = 0; + + /* initialize the size of the stream to the size of the handle */ + This->streamSize.u.HighPart = 0; + This->streamSize.u.LowPart = GlobalSize(This->supportHandle); + + *ppstm = &This->IStream_iface; + + return S_OK; } /***********************************************************************

1 0

Nikolay Sivov : msxml3/tests: Test switching encoding after document is started already.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 302aad9cf978694eb1c0bce99875f9bd303c0f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=302aad9cf978694eb1c0bce99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 01:00:44 2011 +0300 msxml3/tests: Test switching encoding after document is started already. --- dlls/msxml3/tests/saxreader.c | 59 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 7b3feea..fab4cd1 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2600,26 +2600,30 @@ static void test_mxwriter_stream(void) static void test_mxwriter_encoding(void) { - IMXWriter *writer; ISAXContentHandler *content; - HRESULT hr; + IMXWriter *writer; + IStream *stream; VARIANT dest; + HRESULT hr; + HGLOBAL g; + char *ptr; + BSTR s; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); - ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); - ok(hr == S_OK, "put_encoding failed: %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = ISAXContentHandler_startDocument(content); - ok(hr == S_OK, "startDocument failed: %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = ISAXContentHandler_endDocument(content); - ok(hr == S_OK, "endDocument failed: %08x\n", hr); + EXPECT_HR(hr, S_OK); /* The content is always re-encoded to UTF-16 when the output is * retrieved as a BSTR. @@ -2632,6 +2636,47 @@ static void test_mxwriter_encoding(void) "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* switch encoding when something is written already */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); + EXPECT_HR(hr, S_OK); + + /* write empty element */ + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1, NULL); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1); + EXPECT_HR(hr, S_OK); + + /* switch */ + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-16")); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_flush(writer); + EXPECT_HR(hr, S_OK); + + hr = GetHGlobalFromStream(stream, &g); + EXPECT_HR(hr, S_OK); + + ptr = GlobalLock(g); + ok(!strncmp(ptr, "<a/>", 4), "got %c%c%c%c\n", ptr[0],ptr[1],ptr[2],ptr[3]); + GlobalUnlock(g); + + /* so output is unaffected, encoding name is stored however */ + hr = IMXWriter_get_encoding(writer, &s); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(s, _bstr_("UTF-16")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + IStream_Release(stream); + ISAXContentHandler_Release(content); IMXWriter_Release(writer);

1 0

Francois Gouget : include: Add a missing wincrypt. h include directive to mprapi.h.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 644cd0ae174e439b38be883473e4f9e11b098f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644cd0ae174e439b38be88347… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 12 23:53:07 2011 +0100 include: Add a missing wincrypt.h include directive to mprapi.h. Also add the USE_WC_PREFIX macro so one can cleanly deal with the CMSG_DATA conflict with sys/socket.h. --- dlls/ws2_32/socket.c | 1 + include/mprapi.h | 1 + include/wincrypt.h | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4650f64..0d44e68 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -146,6 +146,7 @@ #include "mstcpip.h" #include "af_irda.h" #include "winnt.h" +#define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/include/mprapi.h b/include/mprapi.h index 1860f98..4e67ff0 100644 --- a/include/mprapi.h +++ b/include/mprapi.h @@ -22,6 +22,7 @@ #include <lmcons.h> #include <ras.h> #include <in6addr.h> +#include <wincrypt.h> #define MAX_DEVICE_NAME 128 #define MAX_DEVICETYPE_NAME 16 diff --git a/include/wincrypt.h b/include/wincrypt.h index ae5aa05..1311f31 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3432,6 +3432,7 @@ typedef struct _CERT_ID #define CERT_ID_KEY_IDENTIFIER 2 #define CERT_ID_SHA1_HASH 3 +#ifndef USE_WC_PREFIX #undef CMSG_DATA /* may be defined by sys/socket.h */ #define CMSG_DATA 1 #define CMSG_SIGNED 2 @@ -3446,6 +3447,21 @@ typedef struct _CERT_ID #define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED) #define CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << CMSG_SIGNED_AND_ENVELOPED) #define CMSG_ENCRYPTED_FLAG (1 << CMSG_ENCRYPTED) +#else +#define WC_CMSG_DATA 1 +#define WC_CMSG_SIGNED 2 +#define WC_CMSG_ENVELOPED 3 +#define WC_CMSG_SIGNED_AND_ENVELOPED 4 +#define WC_CMSG_HASHED 5 +#define WC_CMSG_ENCRYPTED 6 + +#define WC_CMSG_ALL_FLAGS ~0U +#define WC_CMSG_DATA_FLAG (1 << WC_CMSG_DATA) +#define WC_CMSG_SIGNED_FLAG (1 << WC_CMSG_SIGNED) +#define WC_CMSG_ENVELOPED_FLAG (1 << WC_CMSG_ENVELOPED) +#define WC_CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << WC_CMSG_SIGNED_AND_ENVELOPED) +#define WC_CMSG_ENCRYPTED_FLAG (1 << WC_CMSG_ENCRYPTED) +#endif typedef struct _CMSG_SIGNER_ENCODE_INFO {

1 0

Francois Gouget : userenv: Add a missing include directive to userenv.h.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 48515313fd60e34bf440b9cd1fd4a42201b34d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48515313fd60e34bf440b9cd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 12 23:54:12 2011 +0100 userenv: Add a missing include directive to userenv.h. --- dlls/userenv/userenv_main.c | 1 + include/userenv.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 89fedab..f0184e5 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "winnls.h" #include "sddl.h" +#include "objbase.h" #include "userenv.h" #include "wine/debug.h" diff --git a/include/userenv.h b/include/userenv.h index de8bbe0..136c7f6 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -19,7 +19,7 @@ #ifndef __WINE_USERENV_H #define __WINE_USERENV_H -/* FIXME: #include <wbemcli.h> */ +#include <wbemcli.h> #include <profinfo.h> #define PT_TEMPORARY 0x00000001

1 0