December 2011 - Wine-commits

Piotr Caban : msvcp90: Added collate<unsigned short> class stub.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 59b2639e39ec15475947797840954cb0e90cc025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b2639e39ec1547594779784… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:17:28 2011 +0100 msvcp90: Added collate<unsigned short> class stub. --- dlls/msvcp90/locale.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 56 ++++++++++++------------ 2 files changed, 137 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b2639e39ec154759477…

1 0

Dmitry Timoshkov : kernel32: Add the tests for various combinations of CreateFileMapping/ MapViewOfFile protections.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 5379a75baf32415618f8d650c0f1c35faee8aea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5379a75baf32415618f8d650c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 15 16:06:37 2011 +0800 kernel32: Add the tests for various combinations of CreateFileMapping/MapViewOfFile protections. --- dlls/kernel32/tests/virtual.c | 292 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 291 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5379a75baf32415618f8d…

1 0

Alexandre Julliard : server: Optionally return the global key state when queueing a hardware message.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 5a30e31806b8b2c2917670aaf9e2c5038bc625c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a30e31806b8b2c2917670aaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 14:29:46 2011 +0100 server: Optionally return the global key state when queueing a hardware message. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/queue.c | 12 ++++++++++-- server/trace.c | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ab239f3..5880b47 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2796,6 +2796,7 @@ struct send_hardware_message_reply { struct reply_header __header; int wait; + /* VARARG(keystate,bytes); */ char __pad_12[4]; }; #define SEND_HWMSG_INJECTED 0x01 @@ -5639,6 +5640,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 428 +#define SERVER_PROTOCOL_VERSION 429 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a59bb6e..91a59b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2032,6 +2032,7 @@ enum message_type unsigned int flags; /* flags (see below) */ @REPLY int wait; /* do we need to wait for a reply? */ + VARARG(keystate,bytes); /* global state array for all the keys */ @END #define SEND_HWMSG_INJECTED 0x01 diff --git a/server/queue.c b/server/queue.c index 7de6d88..20d3e41 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2189,13 +2189,20 @@ DECL_HANDLER(send_hardware_message) struct thread *thread = NULL; struct desktop *desktop; struct msg_queue *sender = get_current_queue(); + data_size_t size = min( 256, get_reply_max_size() ); + + if (!(desktop = get_thread_desktop( current, 0 ))) return; if (req->win) { if (!(thread = get_window_thread( req->win ))) return; - desktop = (struct desktop *)grab_object( thread->queue->input->desktop ); + if (desktop != thread->queue->input->desktop) + { + /* don't allow queuing events to a different desktop */ + release_object( desktop ); + return; + } } - else if (!(desktop = get_thread_desktop( current, 0 ))) return; switch (req->input.type) { @@ -2212,6 +2219,7 @@ DECL_HANDLER(send_hardware_message) set_error( STATUS_INVALID_PARAMETER ); } if (thread) release_object( thread ); + set_reply_data( desktop->keystate, size ); release_object( desktop ); } diff --git a/server/trace.c b/server/trace.c index e463229..4a50232 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2452,6 +2452,7 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) { fprintf( stderr, " wait=%d", req->wait ); + dump_varargs_bytes( ", keystate=", cur_size ); } static void dump_get_message_request( const struct get_message_request *req )

1 0

Alexandre Julliard : user32: Cache the global key state to avoid performance issues in applications that poll constantly .
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: cb3b7237925a24ba4c5696dd079fdc5d99a48577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3b7237925a24ba4c5696dd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 14:30:41 2011 +0100 user32: Cache the global key state to avoid performance issues in applications that poll constantly. --- dlls/user32/hook.c | 4 ++++ dlls/user32/input.c | 10 ++++++++++ dlls/user32/message.c | 4 ++++ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 4 +++- dlls/user32/winstation.c | 1 + 6 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 2e36801..1ba5dda 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -385,6 +385,10 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA thread_info->hook_unicode = prev_unicode; } } + + if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) + get_user_thread_info()->key_state_time = 0; /* force refreshing the key state cache */ + return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1ffce8d..d9fb7c0 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -374,21 +374,31 @@ HWND WINAPI GetCapture(void) */ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { + struct user_thread_info *thread_info = get_user_thread_info(); SHORT ret; if (key < 0 || key >= 256) return 0; if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { + if (thread_info->key_state) + { + if (GetTickCount() - thread_info->key_state_time < 50) + return (thread_info->key_state[key] & 0x80) ? 0x8000 : 0; + } + else thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); + ret = 0; SERVER_START_REQ( get_key_state ) { req->tid = 0; req->key = key; + if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; + thread_info->key_state_time = GetTickCount(); } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7661e3e..a38d77b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3112,6 +3112,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO */ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) { + struct user_thread_info *thread_info = get_user_thread_info(); struct send_message_info info; NTSTATUS ret; BOOL wait; @@ -3149,11 +3150,14 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); break; } + if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); ret = wine_server_call( req ); wait = reply->wait; } SERVER_END_REQ; + if (!ret && thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if (wait) { LRESULT ignored; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a42efb0..790ba92 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -312,6 +312,7 @@ static void thread_detach(void) if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); CloseHandle( thread_info->server_queue ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); + HeapFree( GetProcessHeap(), 0, thread_info->key_state ); exiting_thread_id = 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 399974e..1a63bad 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -176,10 +176,12 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ UINT active_hooks; /* Bitmap of active hooks */ + UINT key_state_time; /* Time of last key state refresh */ + BYTE *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ - ULONG pad[11]; /* Available for more data */ + ULONG pad[9]; /* Available for more data */ }; struct hook_extra_info diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c6c52b7..8126b31 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -401,6 +401,7 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) struct user_thread_info *thread_info = get_user_thread_info(); thread_info->top_window = 0; thread_info->msg_window = 0; + thread_info->key_state_time = 0; } return ret; }

1 0

Alexandre Julliard : user32: Always use the default alignment when displaying submenu popups.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 755abced55b85632e0e32c1fb9567446d047ff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755abced55b85632e0e32c1fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 17:44:03 2011 +0100 user32: Always use the default alignment when displaying submenu popups. --- dlls/user32/menu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3ec682f..349adc6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2395,6 +2395,9 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, } } + /* use default alignment for submenus */ + wFlags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN); + MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, wFlags, rect.left, rect.top, rect.right, rect.bottom ); if (selectFirst)

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

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 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 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 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