December 2011 - Wine-commits

Francois Gouget : include: Protect mstcpip.h against multiple inclusion.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: c258dc850098cbad43451ef0bbce181aea66c478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c258dc850098cbad43451ef0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 12 23:54:21 2011 +0100 include: Protect mstcpip.h against multiple inclusion. --- include/mstcpip.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/mstcpip.h b/include/mstcpip.h index 55fa542..147e135 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_MSTCPIP_H +#define __WINE_MSTCPIP_H struct tcp_keepalive { @@ -60,3 +62,5 @@ struct tcp_keepalive #define WS_RCVALL_SOCKETLEVELONLY 2 #endif /* USE_WS_PREFIX */ + +#endif /* __WINE_MSTCPIP_H */

1 0

Francois Gouget : include: Include ipifcons.h from ifdef.h.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 07e1e0d29b9def1fe219e76249ae712c4540816b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e1e0d29b9def1fe219e7624… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 12 23:55:43 2011 +0100 include: Include ipifcons.h from ifdef.h. --- include/ifdef.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index 80ab755..bdda8a2 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -18,6 +18,8 @@ #ifndef WINE_IFDEF_H #define WINE_IFDEF_H +#include <ipifcons.h> + typedef ULONG32 NET_IF_OBJECT_ID, *PNET_IF_OBJECT_ID; typedef UINT32 NET_IF_COMPARTMENT_ID, *PNET_IF_COMPARTMENT_ID; typedef GUID NET_IF_NETWORK_GUID, *PNET_IF_NETWORK_GUID;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 36072b8243f1ab02768c1cf71baba8c2e16300fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=36072b8243f1ab02768c1cf71… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 72 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/po/lt.po b/po/lt.po index c80b804..99c238b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-02 19:05+0300\n" +"PO-Revision-Date: 2011-12-12 21:39+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2211,7 +2211,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "Sveiki atvėrę liudijimo importo vediklį" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2223,10 +2222,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Šis vediklis padeda jums importuoti liudijimus, atšauktų liudijimų sąrašus " +"ir patikintų liudijimų sąrašus iš failo į liudijimų saugyklą.\n" +"\n" "Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo " -"esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas pranešimų " -"pasirašymui. Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų " -"sąrašai ir patikintų liudijimų sąrašai." +"esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo " +"nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, " +"atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n" +"\n" +"Jei norite tęsti, spauskite Kitas." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2343,7 +2347,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "Sveiki atvėrę liudijimo eksporto vediklį" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2355,10 +2358,15 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Šis vediklis padeda jums eksportuoti liudijimus, atšauktų liudijimų sąrašus " +"ir patikintų liudijimų sąrašus iš liudijimų saugyklos į failą.\n" +"\n" "Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo " -"esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas pranešimų " -"pasirašymui. Liudijimų saugyklos yra liudijimų rinkiniai, atšauktų liudijimų " -"sąrašai ir patikintų liudijimų sąrašai." +"esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo " +"nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, " +"atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n" +"\n" +"Jei norite tęsti, spauskite Kitas." #: cryptui.rc:381 msgid "" @@ -3005,9 +3013,8 @@ msgid "Mapping" msgstr "Susiejimas" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "Rikiuoti priskirtus" +msgstr "Iš pradžių rodyti priskirtus" #: dinput.rc:34 msgid "Action" @@ -3471,9 +3478,8 @@ msgid "Subscript out of range" msgstr "Indeksas nepatenka į rėžius" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Tikėtasi objekto" +msgstr "Reikalingas objektas" #: jscript.rc:29 msgid "Automation server can't create object" @@ -8344,7 +8350,7 @@ msgstr "Yra nesklandumų su šios svetainės liudijimu." #: wininet.rc:79 msgid "Do you want to continue anyway?" -msgstr "Ar vistiek norite tęsti?" +msgstr "Ar vis tiek norite tęsti?" #: wininet.rc:25 msgid "LAN Connection" @@ -9896,19 +9902,16 @@ msgid "N" msgstr "N" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "Trūksta failo susiejimo prievardžiui %s\n" +msgstr "Trūksta failo susiejimo prievardžiui %1\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "Jokia atvėrimo komanda nesusieta su failo tipu „%s“\n" +msgstr "Jokia atvėrimo komanda nesusieta su failo tipu „%1“\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "Perrašyti %s" +msgstr "Perrašyti %1" #: cmd.rc:297 msgid "More..." @@ -9927,23 +9930,20 @@ msgid "Syntax error\n" msgstr "Sintaksės klaida\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "Nėra informacijos apie %s\n" +msgstr "Nėra informacijos apie %1\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "GOTO tikslas nerastas\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "Dabartinė data yra %s\n" +msgstr "Dabartinė data yra %1\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "Dabartinis laikas yra %s\n" +msgstr "Dabartinis laikas yra %1\n" #: cmd.rc:307 msgid "Enter new date: " @@ -9954,9 +9954,8 @@ msgid "Enter new time: " msgstr "Įveskite naują laiką: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "Aplinkos kintamasis %s neapibrėžtas\n" +msgstr "Aplinkos kintamasis %1 neapibrėžtas\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -9972,19 +9971,16 @@ msgid "A" msgstr "V" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, šalinti" +msgstr "%1, šalinti" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "ECHO yra %s\n" +msgstr "Echo yra %1\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "VERIFY yra %s\n" +msgstr "Verify yra %1\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -9995,14 +9991,13 @@ msgid "Parameter error\n" msgstr "Parametro klaida\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"Tomas diske %c yra %s\n" -"Tomo serijos numeris yra %04x-%04x\n" +"Tomas diske %1!c! yra %2\n" +"Tomo serijos numeris yra %3!04x!-%4!04x!\n" "\n" #: cmd.rc:319 @@ -10022,9 +10017,8 @@ msgid "Wine Command Prompt" msgstr "Wine komandų interpretatorius" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "CMD versija %s\n" +msgstr "CMD versija %1!S!\n" #: cmd.rc:324 msgid "More? "

1 0

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

13 Dec '11

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 CKJ Han and Ideographic scripts.
by Alexandre Julliard 13 Dec '11

13 Dec '11

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

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

13 Dec '11

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

Alexandre Julliard : gdi32: Implement GetPixel in the null driver using GetImage.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 9f410413a6cb89fc4c4340daf917d5cfa9d1909e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f410413a6cb89fc4c4340daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:53:50 2011 +0100 gdi32: Implement GetPixel in the null driver using GetImage. --- dlls/gdi32/bitblt.c | 29 +++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 13 +++++++++++++ dlls/gdi32/driver.c | 5 ----- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/painting.c | 8 ++------ 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 1638f46..0d7ed3c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -472,6 +472,35 @@ done: return ret; } +COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) +{ + DC *dc = get_nulldrv_dc( dev ); + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct bitblt_coords src; + struct gdi_image_bits bits; + COLORREF ret; + + src.visrect.left = x; + src.visrect.top = y; + LPtoDP( dev->hdc, (POINT *)&src.visrect, 1 ); + src.visrect.right = src.visrect.left + 1; + src.visrect.bottom = src.visrect.top + 1; + src.x = src.visrect.left; + src.y = src.visrect.top; + src.width = src.height = 1; + + if (!clip_visrect( dc, &src.visrect, &src.visrect )) return CLR_INVALID; + + dev = GET_DC_PHYSDEV( dc, pGetImage ); + if (dev->funcs->pGetImage( dev, 0, info, &bits, &src )) return CLR_INVALID; + + ret = get_pixel_bitmapinfo( info, bits.ptr, &src ); + if (bits.free) bits.free( &bits ); + return ret; +} + + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 20fcd4d..ad329be 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1372,6 +1372,19 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a return ret; } +COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) +{ + dib_info dib; + POINT pt; + DWORD pixel; + + init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table ); + pt.x = src->x; + pt.y = src->y; + pixel = dib.funcs->get_pixel( &dib, &pt ); + return dib.funcs->pixel_to_colorref( &dib, pixel ); +} + /*********************************************************************** * dibdrv_StretchBlt */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 15481ac..9612d6f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -394,11 +394,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT return 0; } -static COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) -{ - return CLR_INVALID; -} - static INT nulldrv_GetPixelFormat( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a371f4e..d87dfdc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -250,6 +250,7 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode, const POINT *dev_pts, HRGN rgn ) DECLSPEC_HIDDEN; +extern COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; @@ -356,6 +357,7 @@ extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, IN extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index d721bd1..241f9c3 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -476,13 +476,9 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixel ); update_dc( dc ); - /* FIXME: should this be in the graphics driver? */ - if (PtVisible( hdc, x, y )) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixel ); - ret = physdev->funcs->pGetPixel( physdev, x, y ); - } + ret = physdev->funcs->pGetPixel( physdev, x, y ); release_dc_ptr( dc ); } return ret;

1 0

Alexandre Julliard : winex11: Get rid of the GetPixel implementation, use the null driver fallback instead.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 810d215a3c53f4a2d027ab660a69a1c2d2abbdcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d215a3c53f4a2d027ab660… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 21:21:28 2011 +0100 winex11: Get rid of the GetPixel implementation, use the null driver fallback instead. --- dlls/winex11.drv/graphics.c | 52 ------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 1 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 0f72389..163afd2 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1093,58 +1093,6 @@ COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** - * X11DRV_GetPixel - */ -COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y ) -{ - static Pixmap pixmap = 0; - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - XImage * image; - int pixel; - POINT pt; - BOOL memdc = (GetObjectType(dev->hdc) == OBJ_MEMDC); - - pt.x = x; - pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); - - /* Update the pixmap from the DIB section */ - X11DRV_LockDIBSection(physDev, DIB_Status_GdiMod); - - wine_tsx11_lock(); - if (memdc) - { - image = XGetImage( gdi_display, physDev->drawable, - physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, - 1, 1, AllPlanes, ZPixmap ); - } - else - { - /* If we are reading from the screen, use a temporary copy */ - /* to avoid a BadMatch error */ - if (!pixmap) pixmap = XCreatePixmap( gdi_display, root_window, - 1, 1, physDev->depth ); - XCopyArea( gdi_display, physDev->drawable, pixmap, get_bitmap_gc(physDev->depth), - physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, 1, 1, 0, 0 ); - image = XGetImage( gdi_display, pixmap, 0, 0, 1, 1, AllPlanes, ZPixmap ); - } - pixel = XGetPixel( image, 0, 0 ); - XDestroyImage( image ); - wine_tsx11_unlock(); - - /* Update the DIBSection from the pixmap */ - X11DRV_UnlockDIBSection(physDev, FALSE); - if( physDev->depth > 1) - pixel = X11DRV_PALETTE_ToLogical(physDev, pixel); - else - /* monochrome bitmaps return black or white */ - if( pixel) pixel = 0xffffff; - return pixel; - -} - - -/*********************************************************************** * X11DRV_PaintRgn */ BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 39a57b5..b094e0a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -512,7 +512,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGetKerningPairs */ X11DRV_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ - X11DRV_GetPixel, /* pGetPixel */ + NULL, /* pGetPixel */ X11DRV_GetPixelFormat, /* pGetPixelFormat */ X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */ NULL, /* pGetTextCharsetInfo */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7c12360..922aa9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -198,7 +198,6 @@ extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) D extern DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN;

1 0

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

13 Dec '11

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

Alexandre Julliard : ntdll: Make an error message a proper ERR.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 70f4b2d5024cbe923518510c88e9fa1aa689e117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f4b2d5024cbe923518510c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 21:25:13 2011 +0100 ntdll: Make an error message a proper ERR. --- dlls/ntdll/rtl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c430e2d..1970251 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -140,7 +140,7 @@ void WINAPI RtlDeleteResource(LPRTL_RWLOCK rwl) { RtlEnterCriticalSection( &rwl->rtlCS ); if( rwl->iNumberActive || rwl->uExclusiveWaiters || rwl->uSharedWaiters ) - MESSAGE("Deleting active MRSW lock (%p), expect failure\n", rwl ); + ERR("Deleting active MRSW lock (%p), expect failure\n", rwl ); rwl->hOwningThreadId = 0; rwl->uExclusiveWaiters = rwl->uSharedWaiters = 0; rwl->iNumberActive = 0;

1 0