March 2007 - Wine-commits - list.winehq.org

Leslie Choong : comctl32: updown: Added message sequencing tests.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 851197f80c904c15c2fe69ee5df5f12e15fa0b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=851197f80c904c15c2fe69ee5… Author: Leslie Choong <septikus(a)gmail.com> Date: Tue Mar 13 20:22:03 2007 -0800 comctl32: updown: Added message sequencing tests. --- dlls/comctl32/tests/updown.c | 109 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index c8f944f..fb1a522 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -110,6 +110,86 @@ static const struct message get_edit_text_seq[] = { { 0 } }; +static const struct message test_updown_pos_seq[] = { + { UDM_SETRANGE, sent|lparam, 0, MAKELONG(100,0) }, + { UDM_GETRANGE, sent}, + { UDM_SETPOS, sent|lparam, 0, 5}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 0}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, MAKELONG(-1,0)}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 100}, + { UDM_GETPOS, sent}, + { UDM_SETPOS, sent|lparam, 0, 101}, + { UDM_GETPOS, sent}, + { 0 } +}; + +static const struct message test_updown_pos32_seq[] = { + { UDM_SETRANGE32, sent|lparam, 0, 1000 }, + { UDM_GETRANGE32, sent}, /* Cannot check wparam and lparam as they are ptrs */ + { UDM_SETPOS32, sent|lparam, 0, 500 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 0 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, -1 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 1000 }, + { UDM_GETPOS32, sent}, + { UDM_SETPOS32, sent|lparam, 0, 1001 }, + { UDM_GETPOS32, sent}, + { 0 } +}; + +static const struct message test_updown_buddy_seq[] = { + { UDM_GETBUDDY, sent }, + { UDM_SETBUDDY, sent }, + { WM_STYLECHANGING, sent|defwinproc }, + { WM_STYLECHANGED, sent|defwinproc }, + { WM_STYLECHANGING, sent|defwinproc }, + { WM_STYLECHANGED, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|optional|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_MOVE, sent|defwinproc }, + { UDM_GETBUDDY, sent }, + { 0 } +}; + +static const struct message test_updown_base_seq[] = { + { UDM_SETBASE, sent|wparam, 10 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 80 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 16 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 80 }, + { UDM_GETBASE, sent }, + { UDM_SETBASE, sent|wparam, 10 }, + { UDM_GETBASE, sent }, + { 0 } +}; + +static const struct message test_updown_unicode_seq[] = { + { UDM_SETUNICODEFORMAT, sent|wparam, 0 }, + { UDM_GETUNICODEFORMAT, sent }, + { UDM_SETUNICODEFORMAT, sent|wparam, 1 }, + { UDM_GETUNICODEFORMAT, sent }, + { UDM_SETUNICODEFORMAT, sent|wparam, 0 }, + { UDM_GETUNICODEFORMAT, sent }, + { 0 } +}; + +static const struct message test_updown_destroy_seq[] = { + { WM_SHOWWINDOW, sent|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent}, + { WM_WINDOWPOSCHANGED, sent}, + { WM_DESTROY, sent}, + { WM_NCDESTROY, sent}, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static long defwndproc_counter = 0; @@ -239,7 +319,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - add_message(sequences, EDIT_SEQ_INDEX, &msg); + add_message(sequences, UPDOWN_SEQ_INDEX, &msg); defwndproc_counter++; ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); @@ -279,6 +359,8 @@ static void test_updown_pos(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set Range from 0 to 100 */ SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) ); r = SendMessage(updown, UDM_GETRANGE, 0,0); @@ -324,6 +406,8 @@ static void test_updown_pos(void) r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); expect(100,LOWORD(r)); expect(1,HIWORD(r)); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos_seq , "test updown pos", FALSE); } static void test_updown_pos32(void) @@ -331,6 +415,8 @@ static void test_updown_pos32(void) int r; int low, high; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set the position to 0 to 1000 */ SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); @@ -374,20 +460,35 @@ static void test_updown_pos32(void) r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); expect(1000,r); expect(1,high); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos32_seq, "test updown pos32", FALSE); } static void test_updown_buddy(void) { HWND buddyReturn; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); ok(buddyReturn == edit, "Expected edit handle\n"); + + buddyReturn = (HWND)SendMessage(updown, UDM_SETBUDDY, (WPARAM) edit, 0); + ok(buddyReturn == edit, "Expected edit handle\n"); + + buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); + ok(buddyReturn == edit, "Expected edit handle\n"); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_buddy_seq, "test updown buddy", TRUE); + ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "test updown buddy_edit", FALSE); } static void test_updown_base(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessage(updown, UDM_SETBASE, 10 , 0); r = SendMessage(updown, UDM_GETBASE, 0 , 0); expect(10,r); @@ -415,12 +516,16 @@ static void test_updown_base(void) expect(16,r); r = SendMessage(updown, UDM_GETBASE, 0 , 0); expect(10,r); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_base_seq, "test updown base", FALSE); } static void test_updown_unicode(void) { int r; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* Set it to ANSI, don't check return as we don't know previous state */ SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); @@ -437,6 +542,8 @@ static void test_updown_unicode(void) expect(1,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); expect(0,r); + + ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_unicode_seq, "test updown unicode", FALSE); }

1 0

Rob Shearman : ole32: Print the contents of the IID input to OleLoad.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: f1ced14eed40365de0d393467f53b7b576a69824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ced14eed40365de0d393467… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 14 15:53:33 2007 +0000 ole32: Print the contents of the IID input to OleLoad. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8c49621..924c6cd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -948,7 +948,7 @@ HRESULT WINAPI OleLoad( STATSTG storageInfo; HRESULT hres; - TRACE("(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj); + TRACE("(%p, %s, %p, %p)\n", pStg, debugstr_guid(riid), pClientSite, ppvObj); *ppvObj = NULL;

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean Resource.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 323ff79fe7f45385e0f801e43440c8a9ad604fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=323ff79fe7f45385e0f801e43… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Mar 14 17:47:18 2007 +0900 cmd: Updated Korean Resource. --- programs/cmd/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index ad3f33a..ebc3116 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -230,6 +230,6 @@ HELP <��>�� ġ�� \n" WCMD_CONFIRM, "�� Ȯ��մϱ�?" WCMD_YES, "��" WCMD_NO, "�ƴϿ�" - WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ� \n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ�. \n" + WCMD_NOFTYPE, "�� '%s'�� �� ɵ� ��ϴ�.'\n" }

1 0

Huw Davies : kernel32: Fix GetPrivateProfileSectionNamesA when the file does not exist.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 3f49239063eac5d91fdd6b75c09cc13d1af609b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f49239063eac5d91fdd6b75c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 14 14:55:14 2007 +0000 kernel32: Fix GetPrivateProfileSectionNamesA when the file does not exist. --- dlls/kernel32/profile.c | 2 ++ dlls/kernel32/tests/profile.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index b48f5e9..0abb887 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1629,6 +1629,8 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, else ret = ret-1; } + else if(size) + buffer[0] = '\0'; RtlFreeUnicodeString(&filenameW); HeapFree(GetProcessHeap(), 0, bufferW); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 4379ee2..3ee66eb 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -145,6 +145,7 @@ static void test_profile_sections(void) static const char content[]="[section1]\r\n[section2]\r\n[section3]\r\n"; static const char testfile3[]=".\\testwine3.ini"; static const WCHAR testfile3W[]={ '.','\\','t','e','s','t','w','i','n','e','3','.','i','n','i',0 }; + static const WCHAR not_here[] = {'.','\\','n','o','t','_','h','e','r','e','.','i','n','i',0}; DeleteFileA( testfile3 ); h = CreateFileA( testfile3, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -185,6 +186,19 @@ static void test_profile_sections(void) ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); DeleteFileA( testfile3 ); + + /* Tests on non-existent file */ + memset(buf, 0xcc, sizeof(buf)); + ret = GetPrivateProfileSectionNamesA( buf, 10, ".\\not_here.ini" ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( buf[0] == 0, "returned buffer not terminated with null\n" ); + ok( buf[1] != 0, "returned buffer terminated with double-null\n" ); + + memset(bufW, 0xcc, sizeof(bufW)); + ret = GetPrivateProfileSectionNamesW( bufW, 10, not_here ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( bufW[0] == 0, "returned buffer not terminated with null\n" ); + ok( bufW[1] != 0, "returned buffer terminated with double-null\n" ); } START_TEST(profile)

1 0

Rob Shearman : include: Add a definition for REGCLS_SURROGATE and add declarations for CoRegisterSurrogate and CoGetObjectContext .
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 2b5524867d427d2b73d19653fe724609b8b40b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5524867d427d2b73d19653f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 14 15:43:52 2007 +0000 include: Add a definition for REGCLS_SURROGATE and add declarations for CoRegisterSurrogate and CoGetObjectContext. --- include/objbase.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 79603a0..4d94c05 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -355,7 +355,8 @@ typedef enum tagREGCLS REGCLS_SINGLEUSE = 0, REGCLS_MULTIPLEUSE = 1, REGCLS_MULTI_SEPARATE = 2, - REGCLS_SUSPENDED = 4 + REGCLS_SUSPENDED = 4, + REGCLS_SURROGATE = 8 } REGCLS; HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv); @@ -363,6 +364,7 @@ HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsC HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister); HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid); HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid); +HRESULT WINAPI CoRegisterSurrogate(LPSURROGATE pSurrogate); HRESULT WINAPI CoSuspendClassObjects(void); HRESULT WINAPI CoResumeClassObjects(void); ULONG WINAPI CoAddRefServerProcess(void); @@ -400,6 +402,7 @@ HRESULT WINAPI CoRevertToSelf(void); HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew); HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew); HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, LPVOID lpvReserved); +HRESULT WINAPI CoGetObjectContext(REFIID riid, LPVOID *ppv); HRESULT WINAPI CoCreateGuid(GUID* pguid); BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);

1 0

Rob Shearman : rpcrt4: Unmarshal NULL OLE interfaces properly by handling the case of a 0 stream size .
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 8620d15d3960921a8f316e0653ef0d11ceb55e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8620d15d3960921a8f316e065… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 14 15:46:16 2007 +0000 rpcrt4: Unmarshal NULL OLE interfaces properly by handling the case of a 0 stream size. --- dlls/rpcrt4/ndr_ole.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 6c32121..b65e18b 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -288,12 +288,14 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg *(LPVOID*)ppMemory = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, FALSE); - if (stream) { + if (!stream) RpcRaiseException(E_OUTOFMEMORY); + if (*((RpcStreamImpl *)stream)->size != 0) hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); - IStream_Release(stream); - if (FAILED(hr)) + else + hr = S_OK; + IStream_Release(stream); + if (FAILED(hr)) RpcRaiseException(hr); - } } return NULL; }

1 0

Rob Shearman : user32: Add several more MsgWaitForMultipleObjects tests and split them out from the main message tests .
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: c3b30e535102ddfffa8f97a8bed8a94176f95cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b30e535102ddfffa8f97a8b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 14 15:46:56 2007 +0000 user32: Add several more MsgWaitForMultipleObjects tests and split them out from the main message tests. --- dlls/user32/tests/msg.c | 60 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a380883..50b00c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3625,6 +3625,49 @@ static const struct message WmSetIcon_2[] = { { 0 } }; +static void test_MsgWaitForMultipleObjects(HWND hwnd) +{ + DWORD ret; + MSG msg; + + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + PostMessageA(hwnd, WM_USER, 0, 0); + + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); + + ok(PeekMessageW( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + PostMessageA(hwnd, WM_USER, 0, 0); + + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); + + ok(PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* shows QS_POSTMESSAGE flag is cleared in the PeekMessage call */ + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + PostMessageA(hwnd, WM_USER, 0, 0); + + /* new incoming message causes it to become signaled again */ + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); + + ok(PeekMessageW( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + ok(PeekMessageW( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); +} + /* test if we receive the right sequence of messages */ static void test_messages(void) { @@ -3632,7 +3675,6 @@ static void test_messages(void) HWND hchild2, hbutton; HMENU hmenu; MSG msg; - DWORD ret; flush_sequence(); @@ -3921,21 +3963,7 @@ static void test_messages(void) while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); flush_sequence(); - /* MsgWaitForMultipleObjects test */ - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); - ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); - - PostMessageA(hparent, WM_USER, 0, 0); - - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); - ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %x\n", ret); - - ok(PeekMessageW( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); - ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); - - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); - ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); - /* end of MsgWaitForMultipleObjects test */ + test_MsgWaitForMultipleObjects(hparent); /* the following test causes an exception in user.exe under win9x */ if (!PostMessageW( hparent, WM_USER, 0, 0 ))

1 0

Alexandre Julliard : winnls.h: Added some defines for Unicode surrogates.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: e13c9cd6a1a0a8a814c1cab2d23f6265c495a724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13c9cd6a1a0a8a814c1cab2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:56:10 2007 +0100 winnls.h: Added some defines for Unicode surrogates. --- include/winnls.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 8888171..6388eed 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -309,9 +309,19 @@ extern "C" { #define CP_INSTALLED 0x1 #define CP_SUPPORTED 0x2 +#define HIGH_SURROGATE_START 0xd800 +#define HIGH_SURROGATE_END 0xdbff +#define LOW_SURROGATE_START 0xdc00 +#define LOW_SURROGATE_END 0xdfff + +#define IS_HIGH_SURROGATE(ch) ((ch) >= HIGH_SURROGATE_START && (ch) <= HIGH_SURROGATE_END) +#define IS_LOW_SURROGATE(ch) ((ch) >= LOW_SURROGATE_START && (ch) <= LOW_SURROGATE_END) +#define IS_SURROGATE_PAIR(high,low) (IS_HIGH_SURROGATE(high) && IS_LOW_SURROGATE(low)) + #define WC_DISCARDNS 0x0010 #define WC_SEPCHARS 0x0020 #define WC_DEFAULTCHAR 0x0040 +#define WC_ERR_INVALID_CHARS 0x0080 #define WC_COMPOSITECHECK 0x0200 #define WC_NO_BEST_FIT_CHARS 0x0400

1 0

Alexandre Julliard : libwine: Pass flags to wine_utf8_wcstombs to allow supporting WC_ERR_INVALID_CHARS.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: a79b26284aa318c691582878fac39295c1412f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79b26284aa318c691582878f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:57:50 2007 +0100 libwine: Pass flags to wine_utf8_wcstombs to allow supporting WC_ERR_INVALID_CHARS. --- dlls/kernel32/locale.c | 2 +- dlls/ntdll/rtlstr.c | 2 +- include/wine/unicode.h | 2 +- libs/wine/utf8.c | 4 ++-- tools/wrc/utils.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1c6e537..5b09793 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1892,7 +1892,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, /* fall through */ case CP_UTF8: if (used) *used = FALSE; /* all chars are valid for UTF-8 */ - ret = wine_utf8_wcstombs( src, srclen, dst, dstlen ); + ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); break; default: if (!(table = get_codepage_table( page ))) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 34336fd..2a54223 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -76,7 +76,7 @@ int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int ds if (unix_table) return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); if (used) *used = 0; /* all chars are valid for UTF-8 */ - return wine_utf8_wcstombs( src, srclen, dst, dstlen ); + return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); } /************************************************************************** diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 83a7d52..198b00b 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -86,7 +86,7 @@ extern int wine_cp_wcstombs( const union cptable *table, int flags, extern int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen ); extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); +extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); diff --git a/libs/wine/utf8.c b/libs/wine/utf8.c index 334d7fc..be1c672 100644 --- a/libs/wine/utf8.c +++ b/libs/wine/utf8.c @@ -58,8 +58,8 @@ inline static int get_length_wcs_utf8( const WCHAR *src, unsigned int srclen ) } /* wide char to UTF-8 string conversion */ -/* return -1 on dst buffer overflow */ -int wine_utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ) +/* return -1 on dst buffer overflow, -2 on invalid input char */ +int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { int len; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 9e736d4..39d1764 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -270,12 +270,12 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) { ret->type = str_char; ret->size = cptable ? wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, NULL, 0, NULL, NULL ) - : wine_utf8_wcstombs( str->str.wstr, str->size, NULL, 0 ); + : wine_utf8_wcstombs( 0, str->str.wstr, str->size, NULL, 0 ); ret->str.cstr = xmalloc( ret->size + 1 ); if (cptable) wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, NULL, NULL ); else - wine_utf8_wcstombs( str->str.wstr, str->size, ret->str.cstr, ret->size ); + wine_utf8_wcstombs( 0, str->str.wstr, str->size, ret->str.cstr, ret->size ); ret->str.cstr[ret->size] = 0; } else if(str->type == str_unicode)

1 0

Alexandre Julliard : libwine: Added support for Unicode surrogates in utf-8 conversions.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 62c3d3d6203d45d1d4b75871038c8a1e3ea4ae99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c3d3d6203d45d1d4b758710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:58:56 2007 +0100 libwine: Added support for Unicode surrogates in utf-8 conversions. Also make the conversions more strict against invalid input data. --- libs/wine/utf8.c | 171 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 112 insertions(+), 59 deletions(-) diff --git a/libs/wine/utf8.c b/libs/wine/utf8.c index be1c672..61d3d37 100644 --- a/libs/wine/utf8.c +++ b/libs/wine/utf8.c @@ -29,30 +29,60 @@ static const char utf8_length[128] = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90-0x9f */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xa0-0xaf */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xb0-0xbf */ - 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xc0-0xcf */ + 0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xc0-0xcf */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xd0-0xdf */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xe0-0xef */ - 3,3,3,3,3,3,3,3,4,4,4,4,5,5,0,0 /* 0xf0-0xff */ + 3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0 /* 0xf0-0xff */ }; /* first byte mask depending on UTF-8 sequence length */ -static const unsigned char utf8_mask[6] = { 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x01 }; +static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ -static const unsigned int utf8_minval[6] = { 0x0, 0x80, 0x800, 0x10000, 0x200000, 0x4000000 }; +static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; +/* get the next char value taking surrogates into account */ +static inline unsigned int get_surrogate_value( const WCHAR *src, unsigned int srclen ) +{ + if (src[0] >= 0xd800 && src[0] <= 0xdfff) /* surrogate pair */ + { + if (src[0] > 0xdbff || /* invalid high surrogate */ + srclen <= 1 || /* missing low surrogate */ + src[1] < 0xdc00 || src[1] > 0xdfff) /* invalid low surrogate */ + return 0; + return 0x10000 + ((src[0] & 0x3ff) << 10) + (src[1] & 0x3ff); + } + return src[0]; +} + /* query necessary dst length for src string */ -inline static int get_length_wcs_utf8( const WCHAR *src, unsigned int srclen ) +static inline int get_length_wcs_utf8( int flags, const WCHAR *src, unsigned int srclen ) { int len; - for (len = 0; srclen; srclen--, src++, len++) + unsigned int val; + + for (len = 0; srclen; srclen--, src++) { - if (*src >= 0x80) + if (*src < 0x80) /* 0x00-0x7f: 1 byte */ { len++; - if (*src >= 0x800) len++; + continue; + } + if (*src < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + len += 2; + continue; + } + if (!(val = get_surrogate_value( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; } + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + len += 3; + else /* 0x10000-0x10ffff: 4 bytes */ + len += 4; } return len; } @@ -63,11 +93,12 @@ int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int { int len; - if (!dstlen) return get_length_wcs_utf8( src, srclen ); + if (!dstlen) return get_length_wcs_utf8( flags, src, srclen ); for (len = dstlen; srclen; srclen--, src++) { WCHAR ch = *src; + unsigned int val; if (ch < 0x80) /* 0x00-0x7f: 1 byte */ { @@ -86,53 +117,80 @@ int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int continue; } - /* 0x800-0xffff: 3 bytes */ + if (!(val = get_surrogate_value( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; + } - if ((len -= 3) < 0) return -1; /* overflow */ - dst[2] = 0x80 | (ch & 0x3f); - ch >>= 6; - dst[1] = 0x80 | (ch & 0x3f); - ch >>= 6; - dst[0] = 0xe0 | ch; - dst += 3; + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + { + if ((len -= 3) < 0) return -1; /* overflow */ + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xe0 | val; + dst += 3; + } + else /* 0x10000-0x10ffff: 4 bytes */ + { + if ((len -= 4) < 0) return -1; /* overflow */ + dst[3] = 0x80 | (val & 0x3f); + val >>= 6; + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xf0 | val; + dst += 4; + } } return dstlen - len; } /* query necessary dst length for src string */ -inline static int get_length_mbs_utf8( const unsigned char *src, int srclen ) +inline static int get_length_mbs_utf8( int flags, const char *src, int srclen ) { - int ret; - const unsigned char *srcend = src + srclen; + int len, ret = 0; + unsigned int res; + const char *srcend = src + srclen; - for (ret = 0; src < srcend; ret++) + while (src < srcend) { unsigned char ch = *src++; - if (ch < 0xc0) continue; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + ret++; + continue; + } + len = utf8_length[ch-0x80]; + if (src + len > srcend) goto bad; + res = ch & utf8_mask[len]; - switch(utf8_length[ch-0x80]) + switch(len) { - case 5: - if (src >= srcend) return ret; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) continue; - src++; - case 4: - if (src >= srcend) return ret; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) continue; - src++; case 3: - if (src >= srcend) return ret; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) continue; + if ((ch = *src ^ 0x80) >= 0x40) goto bad; + res = (res << 6) | ch; src++; case 2: - if (src >= srcend) return ret; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) continue; + if ((ch = *src ^ 0x80) >= 0x40) goto bad; + res = (res << 6) | ch; src++; case 1: - if (src >= srcend) return ret; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) continue; + if ((ch = *src ^ 0x80) >= 0x40) goto bad; + res = (res << 6) | ch; src++; + if (res < utf8_minval[len]) goto bad; + if (res > 0x10ffff) goto bad; + if (res > 0xffff) ret++; + ret++; + continue; } + bad: + if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ + /* otherwise ignore it */ } return ret; } @@ -141,60 +199,55 @@ inline static int get_length_mbs_utf8( const unsigned char *src, int srclen ) /* return -1 on dst buffer overflow, -2 on invalid input char */ int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { - int len, count; + int len; unsigned int res; const char *srcend = src + srclen; + WCHAR *dstend = dst + dstlen; - if (!dstlen) return get_length_mbs_utf8( (const unsigned char*)src, srclen ); + if (!dstlen) return get_length_mbs_utf8( flags, src, srclen ); - for (count = dstlen; count && (src < srcend); count--, dst++) + while ((dst < dstend) && (src < srcend)) { unsigned char ch = *src++; if (ch < 0x80) /* special fast case for 7-bit ASCII */ { - *dst = ch; + *dst++ = ch; continue; } len = utf8_length[ch-0x80]; + if (src + len > srcend) goto bad; res = ch & utf8_mask[len]; switch(len) { - case 5: - if (src >= srcend) goto done; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - case 4: - if (src >= srcend) goto done; /* ignore partial char */ - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; case 3: - if (src >= srcend) goto done; /* ignore partial char */ if ((ch = *src ^ 0x80) >= 0x40) goto bad; res = (res << 6) | ch; src++; case 2: - if (src >= srcend) goto done; /* ignore partial char */ if ((ch = *src ^ 0x80) >= 0x40) goto bad; res = (res << 6) | ch; src++; case 1: - if (src >= srcend) goto done; /* ignore partial char */ if ((ch = *src ^ 0x80) >= 0x40) goto bad; res = (res << 6) | ch; src++; if (res < utf8_minval[len]) goto bad; - if (res >= 0x10000) goto bad; /* FIXME: maybe we should do surrogates here */ - *dst = res; + if (res > 0x10ffff) goto bad; + if (res <= 0xffff) *dst++ = res; + else /* we need surrogates */ + { + if (dst == dstend - 1) return -1; /* overflow */ + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + *dst++ = 0xdc00 | (res & 0x3ff); + } continue; } bad: if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ - *dst = (WCHAR)'?'; + /* otherwise ignore it */ } if (src < srcend) return -1; /* overflow */ -done: - return dstlen - count; + return dstlen - (dstend - dst); }

1 0