September 2011 - Wine-commits

Dylan Smith : richedit: Return number of bytes read for EM_STREAMIN with SF_TEXT.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: e060272de73d909fb39c7a8a1952a2fbd75141c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e060272de73d909fb39c7a8a1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Sep 25 22:17:19 2011 -0400 richedit: Return number of bytes read for EM_STREAMIN with SF_TEXT. --- dlls/riched20/editor.c | 17 +++++++++------ dlls/riched20/tests/editor.c | 46 ++++++++++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3c409e4..8051889 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -285,9 +285,10 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea { WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; WCHAR *pText; - + LRESULT total_bytes_read = 0; + TRACE("%08x %p\n", dwFormat, stream); - + do { LONG nWideChars = 0; @@ -298,8 +299,9 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; if (!stream->dwSize) break; + total_bytes_read += stream->dwSize; } - + if (!(dwFormat & SF_UNICODE)) { /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ @@ -311,13 +313,13 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea nWideChars = stream->dwSize >> 1; pText = (WCHAR *)stream->buffer; } - + ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); if (stream->dwSize == 0) break; stream->dwSize = 0; } while(1); - return 0; + return total_bytes_read; } static void ME_ApplyBorderProperties(RTF_Info *info, @@ -1390,6 +1392,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InStream inStream; BOOL invalidRTF = FALSE; ME_Cursor *selStart, *selEnd; + LRESULT num_read = 0; /* bytes read for SF_TEXT, non-control chars inserted for SF_RTF */ TRACE("stream==%p editor==%p format==0x%X\n", stream, editor, format); editor->nEventMask = 0; @@ -1564,7 +1567,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre style = parser.style; } else if (format & SF_TEXT) - ME_StreamInText(editor, format, &inStream, style); + num_read = ME_StreamInText(editor, format, &inStream, style); else ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ @@ -1594,7 +1597,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); - return 0; + return num_read; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 77ce09e..5058b7a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5040,20 +5040,29 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; - struct StringWithLength cookieForStream4; const char * streamText4 = "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; int length4 = strlen(streamText4) + 1; - cookieForStream4.buffer = (char *)streamText4; - cookieForStream4.length = length4; + struct StringWithLength cookieForStream4 = { + length4, + (char *)streamText4, + }; + + const WCHAR streamText5[] = { 'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't' }; + int length5 = sizeof(streamText5) / sizeof(WCHAR); + struct StringWithLength cookieForStream5 = { + sizeof(streamText5), + (char *)streamText5, + }; /* Minimal test without \par at the end */ es.dwCookie = (DWORD_PTR)&streamText0; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5067,7 +5076,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText0a; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5081,7 +5091,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText0b; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 13, "got %ld, expected %d\n", result, 13); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 14, @@ -5094,7 +5105,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5106,7 +5118,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText2; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 0, "got %ld, expected %d\n", result, 0); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, @@ -5117,7 +5130,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText3; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 0, "got %ld, expected %d\n", result, 0); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, @@ -5129,13 +5143,25 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == length4, "got %ld, expected %d\n", result, length4); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == length4, "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length4); ok(es.dwError == 0, "EM_STREAMIN: Test 4 set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream5; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback2; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT | SF_UNICODE, (LPARAM)&es); + ok(result == sizeof(streamText5), "got %ld, expected %u\n", result, (UINT)sizeof(streamText5)); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == length5, + "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length5); + ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); + DestroyWindow(hwndRichEdit); }

1 0

Dylan Smith : richedit: Return number of chars inserted for EM_STREAMIN with SF_RTF.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f61d417a3493c61d62f678995a363e8f9ae25291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61d417a3493c61d62f678995… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Sep 25 22:17:28 2011 -0400 richedit: Return number of chars inserted for EM_STREAMIN with SF_RTF. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8051889..5dda1ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1470,6 +1470,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { if (format & SF_RTF) { + from = ME_GetCursorOfs(&editor->pCursors[0]); + /* setup the RTF parser */ memset(&parser, 0, sizeof parser); RTFSetEditStream(&parser, &inStream); @@ -1563,6 +1565,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } } } + to = ME_GetCursorOfs(&editor->pCursors[0]); + num_read = to - from; style = parser.style; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5058b7a..c8d8e0d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5062,7 +5062,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5077,7 +5077,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5092,7 +5092,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 13, "got %ld, expected %d\n", result, 13); + ok(result == 13, "got %ld, expected %d\n", result, 13); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 14, @@ -5106,7 +5106,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12,

1 0

Dylan Smith : riched20/tests: Avoid using flaky method of simulating typing .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: fdb2bc4be99ca9f98a283d1b61d48753b1558ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb2bc4be99ca9f98a283d1b6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 26 02:29:26 2011 -0400 riched20/tests: Avoid using flaky method of simulating typing. --- dlls/riched20/tests/editor.c | 91 ++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 60 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c8d8e0d..2a61f5c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -92,27 +92,6 @@ static void keep_responsive(time_t delay_time) } } -static void processPendingMessages(void) -{ - MSG msg; - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } -} - -static void pressKeyWithModifier(HWND hwnd, BYTE mod_vk, BYTE vk) -{ - BYTE mod_scan_code = MapVirtualKey(mod_vk, MAPVK_VK_TO_VSC); - BYTE scan_code = MapVirtualKey(vk, MAPVK_VK_TO_VSC); - SetFocus(hwnd); - keybd_event(mod_vk, mod_scan_code, 0, 0); - keybd_event(vk, scan_code, 0, 0); - keybd_event(vk, scan_code, KEYEVENTF_KEYUP, 0); - keybd_event(mod_vk, mod_scan_code, KEYEVENTF_KEYUP, 0); - processPendingMessages(); -} - static void simulate_typing_characters(HWND hwnd, const char* szChars) { int ret; @@ -4674,6 +4653,22 @@ static void test_EM_REPLACESEL(int redraw) DestroyWindow(hwndRichEdit); } +/* Native riched20 inspects the keyboard state (e.g. GetKeyState) + * to test the state of the modifiers (Ctrl/Alt/Shift). + * + * Therefore Ctrl-<key> keystrokes need to be simulated with + * keybd_event or by using SetKeyboardState to set the modifiers + * and SendMessage to simulate the keystrokes. + */ +static LRESULT send_ctrl_key(HWND hwnd, UINT key) +{ + LRESULT result; + hold_key(VK_CONTROL); + result = SendMessage(hwnd, WM_KEYDOWN, key, 1); + release_key(VK_CONTROL); + return result; +} + static void test_WM_PASTE(void) { int result; @@ -4686,34 +4681,19 @@ static void test_WM_PASTE(void) const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); - /* Native riched20 inspects the keyboard state (e.g. GetKeyState) - * to test the state of the modifiers (Ctrl/Alt/Shift). - * - * Therefore Ctrl-<key> keystrokes need to be simulated with - * keybd_event or by using SetKeyboardState to set the modifiers - * and SendMessage to simulate the keystrokes. - */ - - /* Sent keystrokes with keybd_event */ -#define SEND_CTRL_C(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'C') -#define SEND_CTRL_X(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'X') -#define SEND_CTRL_V(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'V') -#define SEND_CTRL_Z(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Z') -#define SEND_CTRL_Y(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Y') - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); SendMessage(hwndRichEdit, EM_SETSEL, 0, 14); - SEND_CTRL_C(hwndRichEdit); /* Copy */ + send_ctrl_key(hwndRichEdit, 'C'); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit); /* Paste */ + send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text1_step1, buffer); ok(result == 0, "test paste: strcmp = %i, text='%s'\n", result, buffer); - SEND_CTRL_Z(hwndRichEdit); /* Undo */ + send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text1_after, buffer); @@ -4722,33 +4702,27 @@ static void test_WM_PASTE(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); SendMessage(hwndRichEdit, EM_SETSEL, 8, 13); - SEND_CTRL_C(hwndRichEdit); /* Copy */ + send_ctrl_key(hwndRichEdit, 'C'); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit); /* Paste */ + send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text3, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Z(hwndRichEdit); /* Undo */ + send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text2_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Y(hwndRichEdit); /* Redo */ + send_ctrl_key(hwndRichEdit, 'Y'); /* Redo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should revert to post-paste state */ result = strcmp(buffer,text3); ok(result == 0, "test paste: strcmp = %i\n", result); -#undef SEND_CTRL_C -#undef SEND_CTRL_X -#undef SEND_CTRL_V -#undef SEND_CTRL_Z -#undef SEND_CTRL_Y - SendMessage(hwndRichEdit, WM_SETTEXT, 0, 0); /* Send WM_CHAR to simulates Ctrl-V */ SendMessage(hwndRichEdit, WM_CHAR, 22, @@ -5962,9 +5936,6 @@ static LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int co return 0; } -#define SEND_CTRL_LEFT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_LEFT) -#define SEND_CTRL_RIGHT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_RIGHT) - static void test_word_movement(void) { HWND hwnd; @@ -5980,25 +5951,25 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 0, 0); /* |one two three */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* |one two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6006,7 +5977,7 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 8, 8); /* one two | three */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6014,7 +5985,7 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 11, 11); /* one two th|ree */ - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6025,7 +5996,7 @@ static void test_word_movement(void) ok (result == TRUE, "Failed to clear the text.\n"); SendMessage(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); /* |one twoXthree */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one twoX|three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6045,7 +6016,7 @@ static void test_word_movement(void) ok (result == TRUE, "Failed to clear the text.\n"); SendMessageW(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); /* |one twoXthree */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one twoX|three */ SendMessageW(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n");

1 0

Dylan Smith : riched20/tests: Remove unnecessary SetFocus calls.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 9d2da7fa66cf7db5ec294fec65c64e703ddc6f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2da7fa66cf7db5ec294fec6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 26 02:29:33 2011 -0400 riched20/tests: Remove unnecessary SetFocus calls. --- dlls/riched20/tests/editor.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2a61f5c..d8eefbb 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1541,7 +1541,6 @@ static void test_EM_SETOPTIONS(void) SendMessage(hwndRichEdit, EM_SETOPTIONS, ECOOP_SET, 0); /* testing no readonly by sending 'a' to the control*/ - SetFocus(hwndRichEdit); SendMessage(hwndRichEdit, WM_CHAR, 'a', 0x1E0001); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok(buffer[0]=='a', @@ -1551,7 +1550,6 @@ static void test_EM_SETOPTIONS(void) /* READONLY - sending 'a' to the control */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); SendMessage(hwndRichEdit, EM_SETOPTIONS, ECOOP_SET, ECO_READONLY); - SetFocus(hwndRichEdit); SendMessage(hwndRichEdit, WM_CHAR, 'a', 0x1E0001); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok(buffer[0]==text[0],

1 0

Michael Stefaniuc : shell32: COM cleanup in shellpath.c.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 9e460675d602d20c6693cd423dac0dd89fa8052f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e460675d602d20c6693cd423… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 26 11:54:37 2011 +0200 shell32: COM cleanup in shellpath.c. --- dlls/shell32/shellpath.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1c723a2..b35cbbf 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3277,7 +3277,7 @@ static HRESULT redirect_known_folder( struct knownfolder { - const struct IKnownFolderVtbl *vtbl; + IKnownFolder IKnownFolder_iface; LONG refs; KNOWNFOLDERID id; LPWSTR registryPath; @@ -3285,7 +3285,7 @@ struct knownfolder static inline struct knownfolder *impl_from_IKnownFolder( IKnownFolder *iface ) { - return (struct knownfolder *)((char *)iface - FIELD_OFFSET( struct knownfolder, vtbl )); + return CONTAINING_RECORD( iface, struct knownfolder, IKnownFolder_iface ); } static ULONG WINAPI knownfolder_AddRef( @@ -3643,12 +3643,12 @@ static HRESULT knownfolder_create( void **ppv ) kf = HeapAlloc( GetProcessHeap(), 0, sizeof(*kf) ); if (!kf) return E_OUTOFMEMORY; - kf->vtbl = &knownfolder_vtbl; + kf->IKnownFolder_iface.lpVtbl = &knownfolder_vtbl; kf->refs = 1; memset( &kf->id, 0, sizeof(kf->id) ); kf->registryPath = NULL; - *ppv = &kf->vtbl; + *ppv = &kf->IKnownFolder_iface.lpVtbl; TRACE("returning iface %p\n", *ppv); return S_OK; @@ -3656,7 +3656,7 @@ static HRESULT knownfolder_create( void **ppv ) struct foldermanager { - const struct IKnownFolderManagerVtbl *vtbl; + IKnownFolderManager IKnownFolderManager_iface; LONG refs; UINT num_ids; KNOWNFOLDERID *ids; @@ -3664,7 +3664,7 @@ struct foldermanager static inline struct foldermanager *impl_from_IKnownFolderManager( IKnownFolderManager *iface ) { - return (struct foldermanager *)((char *)iface - FIELD_OFFSET( struct foldermanager, vtbl )); + return CONTAINING_RECORD( iface, struct foldermanager, IKnownFolderManager_iface ); } static ULONG WINAPI foldermanager_AddRef( @@ -3938,7 +3938,7 @@ static HRESULT foldermanager_create( void **ppv ) fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; - fm->vtbl = &foldermanager_vtbl; + fm->IKnownFolderManager_iface.lpVtbl = &foldermanager_vtbl; fm->refs = 1; fm->num_ids = 0; @@ -3961,7 +3961,7 @@ static HRESULT foldermanager_create( void **ppv ) } } TRACE("found %u known folders\n", fm->num_ids); - *ppv = &fm->vtbl; + *ppv = &fm->IKnownFolderManager_iface; TRACE("returning iface %p\n", *ppv); return S_OK;

1 0

André Hentschel : Wine 1.3.29 freigegeben
by Jeremy Newman 26 Sep '11

26 Sep '11

Module: website Branch: master Commit: b3ab23d2ae78abc7c6931d6006ec12ab964d3c09 URL: http://source.winehq.org/git/website.git/?a=commit;h=b3ab23d2ae78abc7c6931d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 24 14:23:29 2011 +0200 Wine 1.3.29 freigegeben --- news/de/2011092301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011092301.xml b/news/de/2011092301.xml new file mode 100644 index 0000000..f729d67 --- /dev/null +++ b/news/de/2011092301.xml @@ -0,0 +1,18 @@ +<news> +<date>23. September 2011</date> +<title>Wine 1.3.29 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.29 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.29">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Umfangreiche Unterstützung für VBScript.</li> + <li>Verschiedene Verbesserungen am Kalender Common Control.</li> + <li>Einige Fehlerbehebungen und Optimierungen für XRender.</li> + <li>Einige neue Funktionen in der MSVCP Runtime.</li> + <li>Ein paar Audio Fehlerbehebungen.</li> + <li>DirectDraw Aufräumarbeiten.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.29.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.29
by Jeremy Newman 26 Sep '11

26 Sep '11

Module: website Branch: master Commit: b8da825cb943749c4cca50f2cd61482b2515fad5 URL: http://source.winehq.org/git/website.git/?a=commit;h=b8da825cb943749c4cca50… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 25 08:13:15 2011 +0200 Polish translation for release 1.3.29 --- news/pl/2011092301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011092301.xml b/news/pl/2011092301.xml new file mode 100644 index 0000000..cf44e3c --- /dev/null +++ b/news/pl/2011092301.xml @@ -0,0 +1,18 @@ +<news> +<date>Wrzesień 23, 2011</date> +<title>Wydano Wine 1.3.29</title> +<body> + Wydanie rozwojowe Wine 1.3.29 jest już dostępne. + <a href="{$root}/announce/1.3.29">Co nowego</a> w tym wydaniu: +<ul> + <li>Obszerne wsparcie dla VBScript.</li> + <li>Rozmaite ulepszenia w powszechnej kontrolce kalendarza.</li> + <li>Kilka poprawek i optymalizacji w XRender.</li> + <li>Kilka nowych funkcji w bibliotece uruchomieniowej MSVCP.</li> + <li>Kilka poprawek w dźwięku.</li> + <li>Porządki w DirectDraw.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.29.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.29
by Jeremy Newman 23 Sep '11

23 Sep '11

Module: website Branch: master Commit: 5de5fb125671fd7eb72482e56b99995cf889dc0d URL: http://source.winehq.org/git/website.git/?a=commit;h=5de5fb125671fd7eb72482… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 23 20:35:03 2011 +0200 French translation for release 1.3.29 --- news/fr/2011092301.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2011092301.xml b/news/fr/2011092301.xml new file mode 100644 index 0000000..8c7836d --- /dev/null +++ b/news/fr/2011092301.xml @@ -0,0 +1,21 @@ +<news> +<date>23 septembre 2011</date> +<title>Sortie de Wine 1.3.29</title> +<body> + La version de développement 1.3.29 de Wine est disponible. + <a href="{$root}/announce/1.3.29">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge substantielle de VBScript.</li> + <li>Diverses améliorations au contrôle calendrier.</li> + <li>Plusieurs correctifs et optimisations XRender.</li> + <li>Diverses nouvelles fonctions dans le moteur d'exécutions MSVCP.</li> + <li>Quelques correctifs audio.</li> + <li>Nettoyages dans DirectDraw.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.29.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.29
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: website Branch: master Commit: d8ce77047d9a1497e7ad8055fb17f3701acb0d30 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8ce77047d9a1497e7ad80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 19:58:09 2011 +0200 Wine release 1.3.29 --- news/en/2011092301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011092301.xml b/news/en/2011092301.xml new file mode 100644 index 0000000..c45806e --- /dev/null +++ b/news/en/2011092301.xml @@ -0,0 +1,18 @@ +<news> +<date>September 23, 2011</date> +<title>Wine 1.3.29 Released</title> +<body> + The Wine development release 1.3.29 is now available. + <a href="{$root}/announce/1.3.29">What's new</a> in this release: +<ul> + <li>Extensive support for VBScript.</li> + <li>Various improvements to the calendar common control.</li> + <li>A number of XRender fixes and optimizations.</li> + <li>Several new functions in the MSVCP runtime.</li> + <li>A number of audio fixes.</li> + <li>DirectDraw cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.29.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.29.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: e5ba60174ef931d299894bc1e8961c822f4809c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ba60174ef931d299894bc1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 19:46:51 2011 +0200 Release 1.3.29. --- ANNOUNCE | 1314 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 681 insertions(+), 653 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5ba60174ef931d299894…

1 0