December 2011 - Wine-Commits

Aric Stewart : usp10: Add Hangul script.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

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

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

Dec. 13, 2011

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

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

Dec. 13, 2011

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

Aric Stewart : usp10: Add CKJ Han and Ideographic scripts.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: df2e40bc34895053d3a007c6c9d249577d457b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2e40bc34895053d3a007c6c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 14:50:12 2011 -0600 usp10: Add CKJ Han and Ideographic scripts. --- dlls/usp10/shape.c | 5 ++++ dlls/usp10/tests/usp10.c | 18 +++++++++++++++ dlls/usp10/usp10.c | 49 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10_internal.h | 3 ++ 4 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 11c3658..da04361 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -570,6 +570,9 @@ static const char* required_khmer_features[] = NULL }; +static OPENTYPE_FEATURE_RECORD no_features[] = +{ }; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; const char** requiredFeatures; @@ -636,6 +639,8 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "talu", "", NULL, NULL}, {{ khmer_features, 5}, required_khmer_features, "khmr", "", ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, {{ khmer_features, 5}, required_khmer_features, "khmr", "", ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, + {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, + {{ no_features, 0}, NULL, "hani", "", 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 a0985d6..d17325d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -153,6 +153,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define tale_tag MS_MAKE_TAG('t','a','l','e') #define talu_tag MS_MAKE_TAG('t','a','l','u') #define khmr_tag MS_MAKE_TAG('k','h','m','r') +#define hani_tag MS_MAKE_TAG('h','a','n','i') static void test_ScriptItemize( void ) { @@ -322,6 +323,15 @@ static void test_ScriptItemize( void ) static const itemTest t271[2] = {{{0,0,0,0,0},0,0,0,0,khmr_tag,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; static const itemTest t272[2] = {{{0,0,0,0,0},0,0,0,2,khmr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + /* CJK Han */ + static const WCHAR test28[] = {0x8bed,0x7d20,0x6587,0x5b57}; + static const itemTest t281[2] = {{{0,0,0,0,0},0,0,0,0,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + static const itemTest t282[2] = {{{0,0,0,0,0},0,0,0,2,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + + /* Ideographic */ + static const WCHAR test29[] = {0x2ff0,0x2ff3,0x2ffb,0x2ff0,0x65e5,0x65e5,0x5de5,0x7f51,0x4e02,0x4e5e}; + static const itemTest t291[3] = {{{0,0,0,0,0},0,0,0,0,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,0,hani_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + static const itemTest t292[3] = {{{0,0,0,0,0},0,1,1,1,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,2,hani_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -383,6 +393,8 @@ static void test_ScriptItemize( void ) test_items_ok(test25,10,NULL,NULL,1,t251,FALSE,0); test_items_ok(test26,2,NULL,NULL,1,t261,FALSE,0); test_items_ok(test27,8,NULL,NULL,1,t271,FALSE,0); + test_items_ok(test28,4,NULL,NULL,1,t281,FALSE,0); + test_items_ok(test29,10,NULL,NULL,2,t291,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -417,6 +429,8 @@ static void test_ScriptItemize( void ) test_items_ok(test25,10,&Control,&State,1,t251,FALSE,0); test_items_ok(test26,2,&Control,&State,1,t261,FALSE,0); test_items_ok(test27,8,&Control,&State,1,t271,FALSE,0); + test_items_ok(test28,4,&Control,&State,1,t281,FALSE,0); + test_items_ok(test29,10,&Control,&State,2,t291,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -451,6 +465,8 @@ static void test_ScriptItemize( void ) test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); test_items_ok(test26,2,&Control,&State,1,t262,FALSE,0); test_items_ok(test27,8,&Control,&State,1,t272,FALSE,0); + test_items_ok(test28,4,&Control,&State,1,t282,FALSE,0); + test_items_ok(test29,10,&Control,&State,2,t292,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -486,6 +502,8 @@ static void test_ScriptItemize( void ) test_items_ok(test25,10,&Control,&State,1,t252,FALSE,0); test_items_ok(test26,2,&Control,&State,1,t262,FALSE,0); test_items_ok(test27,8,&Control,&State,1,t272,FALSE,0); + test_items_ok(test28,4,&Control,&State,1,t282,FALSE,0); + test_items_ok(test29,10,&Control,&State,2,t292,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 ff3ae2e..2c860cf 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -166,6 +166,34 @@ static const scriptRange scriptRanges[] = { { Script_Georgian, 0x2d00, 0x2d2f, 0, 0}, /* Cyrillic Extended-A: U+2DE0–U+2DFF */ { Script_Cyrillic, 0x2de0, 0x2dff, 0, 0}, + /* CJK Radicals Supplement: U+2E80–U+2EFF */ + /* Kangxi Radicals: U+2F00–U+2FDF */ + { Script_CJK_Han, 0x2e80, 0x2fdf, 0, 0}, + /* Ideographic Description Characters: U+2FF0–U+2FFF */ + { Script_Ideograph ,0x2ff0, 0x2fff, 0, 0}, + /* CJK Symbols and Punctuation: U+3000–U+303F */ + { Script_Ideograph ,0x3000, 0x3004, 0, 0}, + { Script_CJK_Han ,0x3005, 0x3005, 0, 0}, + { Script_Ideograph ,0x3006, 0x3006, 0, 0}, + { Script_CJK_Han ,0x3007, 0x3007, 0, 0}, + { Script_Ideograph ,0x3008, 0x3020, 0, 0}, + { Script_CJK_Han ,0x3021, 0x3029, 0, 0}, + { Script_Ideograph ,0x302a, 0x3030, 0, 0}, + { Script_Ideograph ,0x3036, 0x3037, 0, 0}, + { Script_CJK_Han ,0x3038, 0x303b, 0, 0}, + { Script_Ideograph ,0x303c, 0x303f, 0, 0}, + /* Kanbun: U+3190–U+319F */ + { Script_Ideograph ,0x3190, 0x319f, 0, 0}, + /* CJK Strokes: U+31C0–U+31EF */ + { Script_Ideograph ,0x31c0, 0x31ef, 0, 0}, + /* Enclosed CJK Letters and Months: U+3200–U+32FF */ + { Script_Ideograph ,0x3220, 0x32ff, 0, 0}, + /* CJK Compatibility: U+3300–U+33FF*/ + { Script_Ideograph ,0x3300, 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 */ + { Script_CJK_Han ,0x4e00, 0x9fff, 0, 0}, /* Cyrillic Extended-B: U+A640–U+A69F */ { Script_Cyrillic, 0xa640, 0xa69f, 0, 0}, /* Modifier Tone Letters: U+A700–U+A71F */ @@ -177,6 +205,8 @@ 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}, + /* CJK Compatibility Ideographs: U+F900–U+FAFF */ + { Script_CJK_Han ,0xf900, 0xfaff, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ { Script_Latin, 0xfb00, 0xfb06, 0, 0}, /* Armenian ligatures U+FB13..U+FB17 */ @@ -185,8 +215,16 @@ static const scriptRange scriptRanges[] = { { Script_Hebrew, 0xfb1d, 0xfb4f, 0, 0}, /* Arabic Presentation Forms-A: U+FB50–U+FDFF*/ { Script_Arabic, 0xfb50, 0xfdff, 0, 0}, + /* Vertical Forms: U+FE10–U+FE1F */ + /* Combining Half Marks: U+FE20–U+FE2F */ + /* CJK Compatibility Forms: U+FE30–U+FE4F */ + /* Small Form Variants: U+FE50–U+FE6F */ + { Script_Ideograph ,0xfe10, 0xfe6f, 0, 0}, /* Arabic Presentation Forms-B: U+FE70–U+FEFF*/ { Script_Arabic, 0xfe70, 0xfeff, 0, 0}, + /* Halfwidth and Fullwidth Forms: U+FF00–FFEF */ + { Script_Ideograph ,0xff00, 0xff64, Script_Numeric2, 0}, + { Script_Ideograph ,0xffe0, 0xffef, 0, 0}, /* END */ { SCRIPT_UNDEFINED, 0, 0, 0} }; @@ -417,6 +455,14 @@ static const scriptData scriptInformation[] = { {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}}, + {{Script_CJK_Han, 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('h','a','n','i'), + {0}}, + {{Script_Ideograph, 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('h','a','n','i'), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -447,7 +493,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[46].props, &scriptInformation[47].props, &scriptInformation[48].props, &scriptInformation[49].props, &scriptInformation[50].props, &scriptInformation[51].props, - &scriptInformation[52].props, &scriptInformation[53].props + &scriptInformation[52].props, &scriptInformation[53].props, + &scriptInformation[54].props, &scriptInformation[55].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b9c9fa0..b6633f0 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -83,6 +83,9 @@ #define Script_New_Tai_Lue_Numeric 51 #define Script_Khmer 52 #define Script_Khmer_Numeric 53 +/* Unicode Chapter 12 */ +#define Script_CJK_Han 54 +#define Script_Ideograph 55 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDEVTYPE typedef.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 67bca436ee81a2caa98a311c339b411c6db5a727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bca436ee81a2caa98a311c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:59 2011 +0100 wined3d: Get rid of the WINED3DDEVTYPE typedef. --- dlls/ddraw/ddraw.c | 18 +++++++++--------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 10 +++++----- dlls/dxgi/device.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 19 ++++++++++--------- dlls/wined3d/utils.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 31 +++++++++++++++---------------- 10 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67bca436ee81a2caa98a3…

1 0

Aric Stewart : usp10: Add Bopomofo script.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 513a8c5020c1c683bf14caa6ac8d548874f1a56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=513a8c5020c1c683bf14caa6a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 14:50:20 2011 -0600 usp10: Add Bopomofo script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 11 ++++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index da04361..e225041 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -641,6 +641,7 @@ static const ScriptShapeData ShapingData[] = {{ khmer_features, 5}, required_khmer_features, "khmr", "", ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, {{ no_features, 0}, NULL, "hani", "", NULL, NULL}, + {{ no_features, 0}, NULL, "bopo", "", 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 d17325d..77c5d5e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -154,6 +154,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define talu_tag MS_MAKE_TAG('t','a','l','u') #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') static void test_ScriptItemize( void ) { @@ -333,6 +334,11 @@ static void test_ScriptItemize( void ) static const itemTest t291[3] = {{{0,0,0,0,0},0,0,0,0,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,0,hani_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; static const itemTest t292[3] = {{{0,0,0,0,0},0,1,1,1,hani_tag,FALSE},{{0,0,0,0,0},4,0,0,2,hani_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + /* Bopomofo */ + static const WCHAR test30[] = {0x3113,0x3128,0x3127,0x3123,0x3108,0x3128,0x310f,0x3120}; + 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}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -395,6 +401,7 @@ static void test_ScriptItemize( void ) test_items_ok(test27,8,NULL,NULL,1,t271,FALSE,0); 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); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -431,6 +438,7 @@ static void test_ScriptItemize( void ) test_items_ok(test27,8,&Control,&State,1,t271,FALSE,0); 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); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -467,6 +475,7 @@ static void test_ScriptItemize( void ) test_items_ok(test27,8,&Control,&State,1,t272,FALSE,0); 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); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -504,6 +513,7 @@ static void test_ScriptItemize( void ) test_items_ok(test27,8,&Control,&State,1,t272,FALSE,0); 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); } 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 2c860cf..c02a10e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -182,8 +182,12 @@ static const scriptRange scriptRanges[] = { { Script_Ideograph ,0x3036, 0x3037, 0, 0}, { Script_CJK_Han ,0x3038, 0x303b, 0, 0}, { Script_Ideograph ,0x303c, 0x303f, 0, 0}, + /* Bopomofo: U+3100–U+312F */ + { Script_Bopomofo ,0x3100, 0x312f, 0, 0}, /* Kanbun: U+3190–U+319F */ { Script_Ideograph ,0x3190, 0x319f, 0, 0}, + /* Bopomofo Extended: U+31A0–U+31BF */ + { Script_Bopomofo ,0x31a0, 0x31bf, 0, 0}, /* CJK Strokes: U+31C0–U+31EF */ { Script_Ideograph ,0x31c0, 0x31ef, 0, 0}, /* Enclosed CJK Letters and Months: U+3200–U+32FF */ @@ -463,6 +467,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('h','a','n','i'), {0}}, + {{Script_Bopomofo, 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('b','o','p','o'), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -494,7 +502,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[48].props, &scriptInformation[49].props, &scriptInformation[50].props, &scriptInformation[51].props, &scriptInformation[52].props, &scriptInformation[53].props, - &scriptInformation[54].props, &scriptInformation[55].props + &scriptInformation[54].props, &scriptInformation[55].props, + &scriptInformation[56].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b6633f0..deaf4df 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -86,6 +86,7 @@ /* Unicode Chapter 12 */ #define Script_CJK_Han 54 #define Script_Ideograph 55 +#define Script_Bopomofo 56 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Henri Verbeet : wined3d: Get rid of the WINEDDCAPS typedef.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: ebb85da5f7b1457e20555d97ea615c57578b0db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb85da5f7b1457e20555d97e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:58 2011 +0100 wined3d: Get rid of the WINEDDCAPS typedef. --- dlls/ddraw/ddraw.c | 35 ++++++++++++++++++----------------- dlls/wined3d/directx.c | 44 ++++++++++++++++++++++---------------------- include/wine/wined3d.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7ff9a73..854ab9e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1197,21 +1197,21 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD return hr; } - caps.dwCaps = winecaps.DirectDrawCaps.Caps; - caps.dwCaps2 = winecaps.DirectDrawCaps.Caps2; - caps.dwCKeyCaps = winecaps.DirectDrawCaps.CKeyCaps; - caps.dwFXCaps = winecaps.DirectDrawCaps.FXCaps; - caps.dwPalCaps = winecaps.DirectDrawCaps.PalCaps; - caps.ddsCaps.dwCaps = winecaps.DirectDrawCaps.ddsCaps; - caps.dwSVBCaps = winecaps.DirectDrawCaps.SVBCaps; - caps.dwSVBCKeyCaps = winecaps.DirectDrawCaps.SVBCKeyCaps; - caps.dwSVBFXCaps = winecaps.DirectDrawCaps.SVBFXCaps; - caps.dwVSBCaps = winecaps.DirectDrawCaps.VSBCaps; - caps.dwVSBCKeyCaps = winecaps.DirectDrawCaps.VSBCKeyCaps; - caps.dwVSBFXCaps = winecaps.DirectDrawCaps.VSBFXCaps; - caps.dwSSBCaps = winecaps.DirectDrawCaps.SSBCaps; - caps.dwSSBCKeyCaps = winecaps.DirectDrawCaps.SSBCKeyCaps; - caps.dwSSBFXCaps = winecaps.DirectDrawCaps.SSBFXCaps; + caps.dwCaps = winecaps.ddraw_caps.caps; + caps.dwCaps2 = winecaps.ddraw_caps.caps2; + caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; + caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; + caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; + caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; + caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; + caps.dwSVBFXCaps = winecaps.ddraw_caps.svb_fx_caps; + caps.dwVSBCaps = winecaps.ddraw_caps.vsb_caps; + caps.dwVSBCKeyCaps = winecaps.ddraw_caps.vsb_color_key_caps; + caps.dwVSBFXCaps = winecaps.ddraw_caps.vsb_fx_caps; + caps.dwSSBCaps = winecaps.ddraw_caps.ssb_caps; + caps.dwSSBCKeyCaps = winecaps.ddraw_caps.ssb_color_key_caps; + caps.dwSSBFXCaps = winecaps.ddraw_caps.ssb_fx_caps; /* Even if WineD3D supports 3D rendering, remove the cap if ddraw is configured * not to use it @@ -1220,9 +1220,10 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps &= ~DDCAPS_3D; caps.ddsCaps.dwCaps &= ~(DDSCAPS_3DDEVICE | DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_ZBUFFER); } - if(winecaps.DirectDrawCaps.StrideAlign != 0) { + if (winecaps.ddraw_caps.stride_align) + { caps.dwCaps |= DDCAPS_ALIGNSTRIDE; - caps.dwAlignStrideAlign = winecaps.DirectDrawCaps.StrideAlign; + caps.dwAlignStrideAlign = winecaps.ddraw_caps.stride_align; } if(DriverCaps) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fe77b88..a0f716b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4899,28 +4899,28 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ - caps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | + caps->ddraw_caps.caps = WINEDDCAPS_GDI | WINEDDCAPS_PALETTE | blit_caps; - caps->DirectDrawCaps.Caps2 = WINEDDCAPS2_CERTIFIED | - WINEDDCAPS2_NOPAGELOCKREQUIRED | - WINEDDCAPS2_PRIMARYGAMMA | - WINEDDCAPS2_WIDESURFACES | + caps->ddraw_caps.caps2 = WINEDDCAPS2_CERTIFIED | + WINEDDCAPS2_NOPAGELOCKREQUIRED | + WINEDDCAPS2_PRIMARYGAMMA | + WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; - caps->DirectDrawCaps.CKeyCaps = ckey_caps; - caps->DirectDrawCaps.FXCaps = fx_caps; - caps->DirectDrawCaps.PalCaps = pal_caps; - caps->DirectDrawCaps.SVBCaps = blit_caps; - caps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SVBFXCaps = fx_caps; - caps->DirectDrawCaps.VSBCaps = blit_caps; - caps->DirectDrawCaps.VSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.VSBFXCaps = fx_caps; - caps->DirectDrawCaps.SSBCaps = blit_caps; - caps->DirectDrawCaps.SSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SSBFXCaps = fx_caps; - - caps->DirectDrawCaps.ddsCaps = WINEDDSCAPS_ALPHA | + caps->ddraw_caps.color_key_caps = ckey_caps; + caps->ddraw_caps.fx_caps = fx_caps; + caps->ddraw_caps.pal_caps = pal_caps; + caps->ddraw_caps.svb_caps = blit_caps; + caps->ddraw_caps.svb_color_key_caps = ckey_caps; + caps->ddraw_caps.svb_fx_caps = fx_caps; + caps->ddraw_caps.vsb_caps = blit_caps; + caps->ddraw_caps.vsb_color_key_caps = ckey_caps; + caps->ddraw_caps.vsb_fx_caps = fx_caps; + caps->ddraw_caps.ssb_caps = blit_caps; + caps->ddraw_caps.ssb_color_key_caps = ckey_caps; + caps->ddraw_caps.ssb_fx_caps = fx_caps; + + caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_FLIP | WINEDDSCAPS_FRONTBUFFER | @@ -4930,16 +4930,16 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - caps->DirectDrawCaps.StrideAlign = DDRAW_PITCH_ALIGNMENT; + caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; /* Set D3D caps if OpenGL is available. */ if (adapter->opengl) { - caps->DirectDrawCaps.ddsCaps |= WINEDDSCAPS_3DDEVICE | + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | WINEDDSCAPS_TEXTURE | WINEDDSCAPS_ZBUFFER; - caps->DirectDrawCaps.Caps |= WINEDDCAPS_3D; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; } return WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cffb206..6598439 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1757,27 +1757,27 @@ struct wined3d_pixel_shader_caps INT instruction_slot_count; }; -typedef struct _WINEDDCAPS +struct wined3d_ddraw_caps { - DWORD Caps; - DWORD Caps2; - DWORD CKeyCaps; - DWORD FXCaps; - DWORD FXAlphaCaps; - DWORD PalCaps; - DWORD SVCaps; - DWORD SVBCaps; - DWORD SVBCKeyCaps; - DWORD SVBFXCaps; - DWORD VSBCaps; - DWORD VSBCKeyCaps; - DWORD VSBFXCaps; - DWORD SSBCaps; - DWORD SSBCKeyCaps; - DWORD SSBFXCaps; - DWORD ddsCaps; - DWORD StrideAlign; -} WINEDDCAPS; + DWORD caps; + DWORD caps2; + DWORD color_key_caps; + DWORD fx_caps; + DWORD fx_alpha_caps; + DWORD pal_caps; + DWORD sv_caps; + DWORD svb_caps; + DWORD svb_color_key_caps; + DWORD svb_fx_caps; + DWORD vsb_caps; + DWORD vsb_color_key_caps; + DWORD vsb_fx_caps; + DWORD ssb_caps; + DWORD ssb_color_key_caps; + DWORD ssb_fx_caps; + DWORD dds_caps; + DWORD stride_align; +}; typedef struct _WINED3DCAPS { @@ -1868,7 +1868,7 @@ typedef struct _WINED3DCAPS DWORD Reserved2; /* Not in the microsoft headers but documented */ DWORD Reserved3; - WINEDDCAPS DirectDrawCaps; + struct wined3d_ddraw_caps ddraw_caps; } WINED3DCAPS; struct wined3d_color_key

1 0

Henri Verbeet : wined3d: Use the correct source pitch and byte_count for uploading converted surfaces .
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 943fcb0fc42c1f65f54a1c41267ba7fa01109c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=943fcb0fc42c1f65f54a1c412… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:57 2011 +0100 wined3d: Use the correct source pitch and byte_count for uploading converted surfaces. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0457ac6..bd45ae3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6038,6 +6038,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return E_OUTOFMEMORY; } format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height); + format.byte_count = format.conv_byte_count; + src_pitch = dst_pitch; } else if (convert != NO_CONVERSION && surface->resource.allocatedMemory) { @@ -6056,6 +6058,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch, width, height, dst_pitch, convert, surface); + format.byte_count = format.conv_byte_count; + src_pitch = dst_pitch; } else {

1 0

Matteo Bruni : wined3d: Ignore invalid texture transform flags.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 68e0cd430f2e57e55278acd2422127330628eb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e0cd430f2e57e55278acd24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 12 20:25:17 2011 +0100 wined3d: Ignore invalid texture transform flags. --- dlls/wined3d/shader.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 11be333..4823750 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1911,9 +1911,28 @@ void find_ps_compile_args(const struct wined3d_state *state, for (i = 0; i < 4; ++i) { DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - DWORD tex_transform = flags & ~WINED3DTTFF_PROJECTED; + DWORD count, tex_transform; + + /* Filter some invalid flags */ + count = flags & ~WINED3DTTFF_PROJECTED; + if (count > WINED3DTTFF_COUNT4) + { + WARN("The application set an invalid TEXTURETRANSFORMFLAGS value.\n"); + flags = count = 0; + } + + tex_transform = count; if (flags & WINED3DTTFF_PROJECTED) - tex_transform |= WINED3D_PSARGS_PROJECTED; + { + enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + + if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1) + || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2) + || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3DTTFF_COUNT3)) + tex_transform |= WINED3D_PSARGS_PROJECTED; + else + WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + } args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } }

1 0

Alexandre Julliard : gdi32/tests: Fix some test failures on old Windows versions.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 38766d4d19f5696e503e0d4f6b2cffec5058f0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=38766d4d19f5696e503e0d4f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 12:24:33 2011 +0100 gdi32/tests: Fix some test failures on old Windows versions. --- dlls/gdi32/tests/bitmap.c | 3 ++- dlls/gdi32/tests/dib.c | 3 ++- dlls/gdi32/tests/palette.c | 41 +++++++++++++++++++++++++---------------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6e8e1d4..ba8ad84 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4998,7 +4998,8 @@ static void test_SetDIBitsToDevice(void) int ent = (255 - idx) % pal->palNumEntries; DWORD expect = idx >= info->bmiHeader.biClrUsed ? 0 : (palent[ent].peRed << 16 | palent[ent].peGreen << 8 | palent[ent].peBlue); - ok( dib_bits[i] == expect, "%d: got %08x instead of %08x\n", i, dib_bits[i], expect ); + ok( dib_bits[i] == expect || broken(dib_bits[i] == 0), + "%d: got %08x instead of %08x\n", i, dib_bits[i], expect ); } memset( dib_bits, 0xaa, 64 * 4 ); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 5d1eb8b..c39463b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -953,6 +953,7 @@ static const char *sha1_graphics_1[] = "c14832e69ec3585c15987b3d69d5007236fa9814", "e44ea620b0c47125a34193537ab9d219a52ad028", "ef2db9fb75a672f69bab88e5d08fe64f50ec2bc4", + "df81db2a9b3942a82e0dc5e57247b642f9b42702", "8819bf7a43295161fe045a42936000b3a51fe200", "e08dbc26469c229f75ccbf1a38a133401f270b84", "d1e6091caa4482d3142df3b958606c41ebf4698e", @@ -1647,7 +1648,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh } } - compare_hash_broken_todo(bmi, bits, sha1, "1 bpp ddb brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "1 bpp ddb brush patblt", dib_is_1bpp ? 3 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); DeleteObject(bmp); diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 4f14d7a..ebdc4e4 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -159,25 +159,34 @@ static void test_halftone_palette(void) pal = CreateHalftonePalette( hdc ); count = GetPaletteEntries( pal, 0, 256, entries ); - ok( count == 256 || broken(count == 20), /* nt 4 */ + ok( count == 256 || broken(count <= 20), /* nt 4 */ "wrong size %u\n", count ); /* first and last 10 match the default palette */ - for (i = 0; i < 10; i++) - ok( entries[i].peRed == defpal[i].peRed && - entries[i].peGreen == defpal[i].peGreen && - entries[i].peBlue == defpal[i].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); - for (i = count - 10; i < count; i++) - ok( entries[i].peRed == defpal[i - count + 20].peRed && - entries[i].peGreen == defpal[i - count + 20].peGreen && - entries[i].peBlue == defpal[i - count + 20].peBlue && - !entries[i].peFlags, - "%u: wrong color %02x,%02x,%02x,%02x\n", i, - entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); - + if (count >= 20) + { + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + for (i = count - 10; i < count; i++) + { + int idx = i - count + 20; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + } DeleteObject( pal ); ReleaseDC( 0, hdc ); }

1 0