wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Piotr Caban : urlmon: Added stub for 444 and 445 function.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: dc8467fefedc55c8449f71e1c78a3c0a96bd6de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8467fefedc55c8449f71e1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:12:01 2011 +0100 urlmon: Added stub for 444 and 445 function. --- dlls/urlmon/urlmon.spec | 6 ++++-- dlls/urlmon/urlmon_main.c | 35 +++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 2f38346..575bdc0 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -101,5 +101,7 @@ 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString -410 stdcall @(long long) URLMON_410 -423 stdcall @(long long long long) URLMON_423 +410 stdcall @(long long) LogSqmBits +423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal +444 stdcall @(long long long) MapUriToBrowserEmulationState +445 stdcall @(long long) MapBrowserEmulationModeToUserAgent diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index cfd0918..13c61de 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -921,23 +921,42 @@ BOOL WINAPI IsProtectedModeURL(const WCHAR *url) } /*********************************************************************** - * URLMON_410 (URLMON.410) + * LogSqmBits (URLMON.410) * Undocumented, added in IE8 */ -BOOL WINAPI URLMON_410(DWORD unknown1, DWORD unknown2) +int WINAPI LogSqmBits(DWORD unk1, DWORD unk2) { - FIXME("stub: %d %d\n", unknown1, unknown2); - return FALSE; + FIXME("stub: %d %d\n", unk1, unk2); + return 0; } /*********************************************************************** - * URLMON_423 (URLMON.423) + * LogSqmUXCommandOffsetInternal (URLMON.423) * Undocumented, added in IE8 */ -BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) +void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DWORD unk4) { - FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); - return FALSE; + FIXME("stub: %d %d %d %d\n", unk1, unk2, unk3, unk4); +} + +/*********************************************************************** + * MapUriToBrowserEmulationState (URLMON.444) + * Undocumented, added in IE8 + */ +int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) +{ + FIXME("stub: %d %d %d\n", unk1, unk2, unk3); + return 0; +} + +/*********************************************************************** + * MapBrowserEmulationModeToUserAgent (URLMON.445) + * Undocumented, added in IE8 + */ +int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) +{ + FIXME("stub: %d %d\n", unk1, unk2); + return 0; } /***********************************************************************

1 0

Piotr Caban : urlmon: Fixed trace message in URLMoniker_BindToObject function.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: b779ae4870d5f9b1254bba5b3f3285e3b0ccd785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b779ae4870d5f9b1254bba5b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:11:44 2011 +0100 urlmon: Fixed trace message in URLMoniker_BindToObject function. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 3e43bb8..c8bd0f8 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -229,7 +229,7 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM IRunningObjectTable *obj_tbl; HRESULT hres; - TRACE("(%p)->(%p,%p,%s,%p): stub\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); + TRACE("(%p)->(%p,%p,%s,%p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) {

1 0

Francois Gouget : include: Add a couple of missing include directives in windows.h.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 3c3a4740cae7c853451f62653fe2535301fe134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3a4740cae7c853451f62653… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 10:09:39 2011 +0100 include: Add a couple of missing include directives in windows.h. Rename a variable to avoid a conflict with the Unknown enumeration value. Define WIN32_LEAN_AND_MEAN to avoid conflicts caused by the SetPort macro. --- dlls/ole32/tests/ole2.c | 5 +++-- dlls/urlmon/tests/uri.c | 1 + include/windows.h | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f38af3b..6641683 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -20,6 +20,7 @@ #define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN #include <stdarg.h> @@ -1841,13 +1842,13 @@ static const IUnknownVtbl UnknownVtbl = Unknown_Release }; -static IUnknown Unknown = { &UnknownVtbl }; +static IUnknown unknown = { &UnknownVtbl }; static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); + hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ad63ccf..2332926 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -24,6 +24,7 @@ #define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN #include "windef.h" #include "winbase.h" diff --git a/include/windows.h b/include/windows.h index 7cd8a83..14f6ce9 100644 --- a/include/windows.h +++ b/include/windows.h @@ -60,7 +60,7 @@ #include <nb30.h> #include <rpc.h> #include <shellapi.h> -/* #include <winperf.h> */ +#include <winperf.h> #ifndef WINE_NOWINSOCK #include <winsock.h> @@ -69,7 +69,7 @@ #ifndef NOCRYPT #include <wincrypt.h> /* #include <winefs.h> */ -/* #include <winscard.h> */ +#include <winscard.h> #endif /* !NOCRYPT */ #ifndef NOGDI

1 0

Francois Gouget : include: Update the nldef.h and *mib.h headers.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 3fe2d6e5fd4276cf747c0ee39a260ab5fba5af40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe2d6e5fd4276cf747c0ee39… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 10:06:24 2011 +0100 include: Update the nldef.h and *mib.h headers. --- dlls/inetmib1/main.c | 13 +++-- dlls/iphlpapi/ifenum.c | 10 ++-- dlls/iphlpapi/ifenum.h | 10 ++-- dlls/iphlpapi/iphlpapi_main.c | 14 +++--- dlls/iphlpapi/ipstats.c | 57 ++++++++++++----------- dlls/iphlpapi/tests/iphlpapi.c | 8 ++-- dlls/ws2_32/socket.c | 7 ++- include/ifmib.h | 9 +++- include/ipmib.h | 60 ++++++++++++++++++------ include/nldef.h | 43 ++++++++++------- include/tcpmib.h | 99 ++++++++++++++++++++++++++++++++------- include/udpmib.h | 14 ++++++ 12 files changed, 235 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fe2d6e5fd4276cf747c0…

1 0

Alexandre Julliard : comctl32: Don' t try to mask out the image for palette-based bitmaps.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 129f48a69224c7fa7d46577483a7351ceb5b0a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129f48a69224c7fa7d4657748… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 21:38:10 2011 +0100 comctl32: Don't try to mask out the image for palette-based bitmaps. --- dlls/comctl32/imagelist.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index db59104..0914c09 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -543,8 +543,6 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) SetBkColor (hdcBitmap, bkColor); BitBlt (hdcMask, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); - SetBkColor(hdcBitmap, RGB(255,255,255)); - /* * Remove the background from the image * @@ -558,7 +556,11 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) * * Blt mode 0x220326 is NOTSRCAND */ - BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); + if (bmp.bmBitsPixel > 8) /* NOTSRCAND can't work with palettes */ + { + SetBkColor(hdcBitmap, RGB(255,255,255)); + BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); + } DeleteDC(hdcBitmap); DeleteDC(hdcMask);

1 0

Aric Stewart : usp10: Add Spacing Modifier Letters to the Latin script block.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 447384e7b89289c661b2e22f9c050bf0dc9b292c URL: http://source.winehq.org/git/wine.git/?a=commit;h=447384e7b89289c661b2e22f9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 10:22:07 2011 -0600 usp10: Add Spacing Modifier Letters to the Latin script block. --- dlls/usp10/usp10.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4fcbfdf..3b99052 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -57,7 +57,8 @@ static const scriptRange scriptRanges[] = { /* Latin Extended-A: U+0100–U+017F */ /* Latin Extended-B: U+0180–U+024F */ /* IPA Extensions: U+0250–U+02AF */ - { Script_Latin, 0x80, 0x2af , Script_Numeric2, Script_Punctuation}, + /* Spacing Modifier Letters:U+02B0–U+02FF */ + { Script_Latin, 0x80, 0x2ff , Script_Numeric2, Script_Punctuation}, /* Combining Diacritical Marks : U+0300–U+036F */ { Script_Diacritical,0x300, 0x36f, 0, 0}, /* Greek: U+0370–U+03FF */

1 0

Aric Stewart : usp10: Add Private Use Area and Surrogates Area from Unicode Chapter 16.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 4d188aa20eb1f1922a73de34adaa41afa6017aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d188aa20eb1f1922a73de34a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:54 2011 -0600 usp10: Add Private Use Area and Surrogates Area from Unicode Chapter 16. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/tests/usp10.c | 9 +++++++++ dlls/usp10/usp10.c | 17 ++++++++++++++++- dlls/usp10/usp10_internal.h | 3 +++ 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 008d2cf..d0ab0b2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -675,6 +675,8 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "ogam", "", NULL, NULL}, {{ no_features, 0}, NULL, "runr", "", NULL, NULL}, {{ no_features, 0}, NULL, "brai", "", NULL, NULL}, + {{ no_features, 0}, NULL, "", "", NULL, NULL}, + {{ no_features, 0}, NULL, "", "", 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 700de68..64cbb30 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -429,6 +429,11 @@ static void test_ScriptItemize( void ) static const itemTest t431[2] = {{{0,0,0,0,0},0,0,0,0,brai_tag,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; static const itemTest t432[4] = {{{0,0,0,0,0},0,0,0,2,brai_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + /* Private and Surrogates Area */ + static const WCHAR test44[] = {0xe000, 0xe001, 0xd800, 0xd801}; + static const itemTest t441[3] = {{{0,0,0,0,0},0,0,0,0,0,FALSE},{{0,0,0,0,0},2,0,0,0,0,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + static const itemTest t442[4] = {{{0,0,0,0,0},0,0,0,2,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},2,0,0,2,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -505,6 +510,7 @@ static void test_ScriptItemize( void ) test_items_ok(test41,6,NULL,NULL,1,t411,FALSE,0); test_items_ok(test42,6,NULL,NULL,1,t421,FALSE,0); test_items_ok(test43,7,NULL,NULL,1,t431,FALSE,0); + test_items_ok(test44,4,NULL,NULL,2,t441,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -555,6 +561,7 @@ static void test_ScriptItemize( void ) test_items_ok(test41,6,&Control,&State,1,t411,FALSE,0); test_items_ok(test42,6,&Control,&State,1,t421,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t431,FALSE,0); + test_items_ok(test44,4,&Control,&State,2,t441,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -605,6 +612,7 @@ static void test_ScriptItemize( void ) test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); + test_items_ok(test44,4,&Control,&State,2,t442,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -656,6 +664,7 @@ static void test_ScriptItemize( void ) test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); + test_items_ok(test44,4,&Control,&State,2,t442,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 1efeed9..4fcbfdf 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -258,6 +258,12 @@ static const scriptRange scriptRanges[] = { { Script_Hangul, 0xac00, 0xd7a3, 0, 0}, /* Hangul Jamo Extended-B: U+D7B0–U+D7FF */ { Script_Hangul, 0xd7b0, 0xd7ff, 0, 0}, + /* Surrogates Area: U+D800–U+DFFF */ + { Script_Surrogates, 0xd800, 0xdbfe, 0, 0}, + { Script_Private, 0xdbff, 0xdc00, 0, 0}, + { Script_Surrogates, 0xdc01, 0xdfff, 0, 0}, + /* Private Use Area: U+E000–U+F8FF */ + { Script_Private, 0xe000, 0xf8ff, 0, 0}, /* CJK Compatibility Ideographs: U+F900–U+FAFF */ { Script_CJK_Han ,0xf900, 0xfaff, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ @@ -586,6 +592,14 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('b','r','a','i'), {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {{Script_Surrogates, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + 0x00000000, + {0}}, + {{Script_Private, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 1, 0, 0, 0, 0, 1, 0, 0}, + 0x00000000, + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -626,7 +640,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[66].props, &scriptInformation[67].props, &scriptInformation[68].props, &scriptInformation[69].props, &scriptInformation[70].props, &scriptInformation[71].props, - &scriptInformation[72].props + &scriptInformation[72].props, &scriptInformation[73].props, + &scriptInformation[74].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 2853f6a..1692b60 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -106,6 +106,9 @@ #define Script_Runic 71 /* Unicode Chapter 15 */ #define Script_Braille 72 +/* Unicode Chapter 16 */ +#define Script_Surrogates 73 +#define Script_Private 74 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Braille script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: ad71c95e59085a93d03b39b04b5db641471b3096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad71c95e59085a93d03b39b04… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:48 2011 -0600 usp10: Add Braille script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d7f7d8b..008d2cf 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -674,6 +674,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "cans", "", NULL, NULL}, {{ no_features, 0}, NULL, "ogam", "", NULL, NULL}, {{ no_features, 0}, NULL, "runr", "", NULL, NULL}, + {{ no_features, 0}, NULL, "brai", "", 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 29db5f7..700de68 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -167,6 +167,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define cans_tag MS_MAKE_TAG('c','a','n','s') #define ogam_tag MS_MAKE_TAG('o','g','a','m') #define runr_tag MS_MAKE_TAG('r','u','n','r') +#define brai_tag MS_MAKE_TAG('b','r','a','i') static void test_ScriptItemize( void ) { @@ -423,6 +424,11 @@ static void test_ScriptItemize( void ) static const itemTest t421[2] = {{{0,0,0,0,0},0,0,0,0,runr_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; static const itemTest t422[4] = {{{0,0,0,0,0},0,0,0,2,runr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + /* Braille */ + static const WCHAR test43[] = {0x280f,0x2817,0x2811,0x280d,0x280a,0x2811,0x2817}; + static const itemTest t431[2] = {{{0,0,0,0,0},0,0,0,0,brai_tag,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const itemTest t432[4] = {{{0,0,0,0,0},0,0,0,2,brai_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -498,6 +504,7 @@ static void test_ScriptItemize( void ) test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0); test_items_ok(test41,6,NULL,NULL,1,t411,FALSE,0); test_items_ok(test42,6,NULL,NULL,1,t421,FALSE,0); + test_items_ok(test43,7,NULL,NULL,1,t431,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -547,6 +554,7 @@ static void test_ScriptItemize( void ) test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0); test_items_ok(test41,6,&Control,&State,1,t411,FALSE,0); test_items_ok(test42,6,&Control,&State,1,t421,FALSE,0); + test_items_ok(test43,7,&Control,&State,1,t431,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -596,6 +604,7 @@ static void test_ScriptItemize( void ) test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); + test_items_ok(test43,7,&Control,&State,1,t432,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -646,6 +655,7 @@ static void test_ScriptItemize( void ) test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); + test_items_ok(test43,7,&Control,&State,1,t432,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 a97f8ba..1efeed9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -174,6 +174,8 @@ static const scriptRange scriptRanges[] = { /* Miscellaneous Mathematical Symbols-A : U+27c0 –U+27ef */ /* Supplemental Arrows-A : U+27f0 –U+27ff */ { Script_Latin, 0x2100, 0x27ff, 0, 0}, + /* Braille Patterns: U+2800–U+28FF */ + { Script_Braille, 0x2800, 0x28ff, 0, 0}, /* Supplemental Arrows-B : U+2900 –U+297f */ /* Miscellaneous Mathematical Symbols-B : U+2980 –U+29ff */ /* Supplemental Mathematical Operators : U+2a00 –U+2aff */ @@ -580,6 +582,10 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('r','u','n','r'), {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {{Script_Braille, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('b','r','a','i'), + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -619,7 +625,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[64].props, &scriptInformation[65].props, &scriptInformation[66].props, &scriptInformation[67].props, &scriptInformation[68].props, &scriptInformation[69].props, - &scriptInformation[70].props, &scriptInformation[71].props + &scriptInformation[70].props, &scriptInformation[71].props, + &scriptInformation[72].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9ff4e60..2853f6a 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -104,6 +104,8 @@ /* Unicode Chapter 14 */ #define Script_Ogham 70 #define Script_Runic 71 +/* Unicode Chapter 15 */ +#define Script_Braille 72 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Runic Script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 1c079ad1964ea859b0e76c31cf38aa21800f0b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c079ad1964ea859b0e76c31c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:39 2011 -0600 usp10: Add Runic 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 3b8eb6d..d7f7d8b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -673,6 +673,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "cher", "", NULL, NULL}, {{ no_features, 0}, NULL, "cans", "", NULL, NULL}, {{ no_features, 0}, NULL, "ogam", "", NULL, NULL}, + {{ no_features, 0}, NULL, "runr", "", 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 0439d5f..29db5f7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -166,6 +166,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define cher_tag MS_MAKE_TAG('c','h','e','r') #define cans_tag MS_MAKE_TAG('c','a','n','s') #define ogam_tag MS_MAKE_TAG('o','g','a','m') +#define runr_tag MS_MAKE_TAG('r','u','n','r') static void test_ScriptItemize( void ) { @@ -417,6 +418,11 @@ static void test_ScriptItemize( void ) static const itemTest t412[4] = {{{0,0,0,0,0},0,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},1,0,0,2,ogam_tag,FALSE},{{0,0,0,0,0},5,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; static const int b412[2] = {1,1}; + /* Runic */ + static const WCHAR test42[] = {0x16a0,0x16a1,0x16a2,0x16a3,0x16a4,0x16a5}; + static const itemTest t421[2] = {{{0,0,0,0,0},0,0,0,0,runr_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t422[4] = {{{0,0,0,0,0},0,0,0,2,runr_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -491,6 +497,7 @@ static void test_ScriptItemize( void ) test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0); test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0); test_items_ok(test41,6,NULL,NULL,1,t411,FALSE,0); + test_items_ok(test42,6,NULL,NULL,1,t421,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -539,6 +546,7 @@ static void test_ScriptItemize( void ) test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0); test_items_ok(test41,6,&Control,&State,1,t411,FALSE,0); + test_items_ok(test42,6,&Control,&State,1,t421,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -587,6 +595,7 @@ static void test_ScriptItemize( void ) test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); + test_items_ok(test42,6,&Control,&State,1,t422,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -636,6 +645,7 @@ static void test_ScriptItemize( void ) test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); + test_items_ok(test42,6,&Control,&State,1,t422,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 c1f7967..a97f8ba 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -124,6 +124,8 @@ static const scriptRange scriptRanges[] = { { Script_Canadian, 0x1400, 0x167f, 0, 0}, /* Ogham: U+1680–U+169F */ { Script_Ogham, 0x1680, 0x169f, 0, 0}, + /* Runic: U+16A0–U+16F0 */ + { Script_Runic, 0x16a0, 0x16f0, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Mongolian: U+1800–U+18AF */ @@ -574,6 +576,10 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','g','a','m'), {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {{Script_Runic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('r','u','n','r'), + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -613,7 +619,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[64].props, &scriptInformation[65].props, &scriptInformation[66].props, &scriptInformation[67].props, &scriptInformation[68].props, &scriptInformation[69].props, - &scriptInformation[70].props + &scriptInformation[70].props, &scriptInformation[71].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f02556c..9ff4e60 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -103,6 +103,7 @@ #define Script_Canadian 69 /* Unicode Chapter 14 */ #define Script_Ogham 70 +#define Script_Runic 71 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Ogham script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 8b415ee99f2b18f92a4c446758a4450f96f1b82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b415ee99f2b18f92a4c44675… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:28 2011 -0600 usp10: Add Ogham script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 11 +++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b8caed2..3b8eb6d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -672,6 +672,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "cher", "", NULL, NULL}, {{ no_features, 0}, NULL, "cans", "", NULL, NULL}, + {{ no_features, 0}, NULL, "ogam", "", 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 c8906c9..0439d5f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -165,6 +165,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define vai_tag MS_MAKE_TAG('v','a','i',' ') #define cher_tag MS_MAKE_TAG('c','h','e','r') #define cans_tag MS_MAKE_TAG('c','a','n','s') +#define ogam_tag MS_MAKE_TAG('o','g','a','m') static void test_ScriptItemize( void ) { @@ -410,6 +411,12 @@ static void test_ScriptItemize( void ) static const itemTest t401[2] = {{{0,0,0,0,0},0,0,0,0,cans_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; static const itemTest t402[2] = {{{0,0,0,0,0},0,0,0,2,cans_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + /* Ogham */ + static const WCHAR test41[] = {0x169b,0x1691,0x168c,0x1690,0x168b,0x169c}; + static const itemTest t411[2] = {{{0,0,0,0,0},0,0,0,0,ogam_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t412[4] = {{{0,0,0,0,0},0,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},1,0,0,2,ogam_tag,FALSE},{{0,0,0,0,0},5,1,1,1,ogam_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const int b412[2] = {1,1}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -483,6 +490,7 @@ static void test_ScriptItemize( void ) test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0); test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0); test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0); + test_items_ok(test41,6,NULL,NULL,1,t411,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -530,6 +538,7 @@ static void test_ScriptItemize( void ) test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0); + test_items_ok(test41,6,&Control,&State,1,t411,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -577,6 +586,7 @@ static void test_ScriptItemize( void ) test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); + test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -625,6 +635,7 @@ static void test_ScriptItemize( void ) test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); + test_items_ok(test41,6,&Control,&State,3,t412,FALSE,b412); } 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 4d0e52b..c1f7967 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -122,6 +122,8 @@ static const scriptRange scriptRanges[] = { { Script_Cherokee, 0x13a0, 0x13ff, 0, 0}, /* Canadian Aboriginal Syllabics: U+1400–U+167F */ { Script_Canadian, 0x1400, 0x167f, 0, 0}, + /* Ogham: U+1680–U+169F */ + { Script_Ogham, 0x1680, 0x169f, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Mongolian: U+1800–U+18AF */ @@ -568,6 +570,10 @@ static const scriptData scriptInformation[] = { {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','a','n','s'), {'E','u','p','h','e','m','i','a'}}, + {{Script_Ogham, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('o','g','a','m'), + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -606,7 +612,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[62].props, &scriptInformation[63].props, &scriptInformation[64].props, &scriptInformation[65].props, &scriptInformation[66].props, &scriptInformation[67].props, - &scriptInformation[68].props, &scriptInformation[69].props + &scriptInformation[68].props, &scriptInformation[69].props, + &scriptInformation[70].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 696189b..f02556c 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -101,6 +101,8 @@ #define Script_Vai_Numeric 67 #define Script_Cherokee 68 #define Script_Canadian 69 +/* Unicode Chapter 14 */ +#define Script_Ogham 70 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011