April 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Dump more SetWindowPos flags.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 6a8b38ff206c1d89304bfd28d44ee8e07c7005e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8b38ff206c1d89304bfd28d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 20:30:43 2008 +0200 user32: Dump more SetWindowPos flags. --- dlls/user32/winpos.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6914ec0..4a79352 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1465,6 +1465,11 @@ LONG WINPOS_HandleWindowPosChanging( HWND hwnd, WINDOWPOS *winpos ) */ static void dump_winpos_flags(UINT flags) { + static const DWORD dumped_flags = (SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | + SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_SHOWWINDOW | + SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | + SWP_NOSENDCHANGING | SWP_DEFERERASE | SWP_ASYNCWINDOWPOS | + SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_STATECHANGED); TRACE("flags:"); if(flags & SWP_NOSIZE) TRACE(" SWP_NOSIZE"); if(flags & SWP_NOMOVE) TRACE(" SWP_NOMOVE"); @@ -1479,25 +1484,12 @@ static void dump_winpos_flags(UINT flags) if(flags & SWP_NOSENDCHANGING) TRACE(" SWP_NOSENDCHANGING"); if(flags & SWP_DEFERERASE) TRACE(" SWP_DEFERERASE"); if(flags & SWP_ASYNCWINDOWPOS) TRACE(" SWP_ASYNCWINDOWPOS"); + if(flags & SWP_NOCLIENTSIZE) TRACE(" SWP_NOCLIENTSIZE"); + if(flags & SWP_NOCLIENTMOVE) TRACE(" SWP_NOCLIENTMOVE"); + if(flags & SWP_STATECHANGED) TRACE(" SWP_STATECHANGED"); -#define DUMPED_FLAGS \ - (SWP_NOSIZE | \ - SWP_NOMOVE | \ - SWP_NOZORDER | \ - SWP_NOREDRAW | \ - SWP_NOACTIVATE | \ - SWP_FRAMECHANGED | \ - SWP_SHOWWINDOW | \ - SWP_HIDEWINDOW | \ - SWP_NOCOPYBITS | \ - SWP_NOOWNERZORDER | \ - SWP_NOSENDCHANGING | \ - SWP_DEFERERASE | \ - SWP_ASYNCWINDOWPOS) - - if(flags & ~DUMPED_FLAGS) TRACE(" %08x", flags & ~DUMPED_FLAGS); + if(flags & ~dumped_flags) TRACE(" %08x", flags & ~dumped_flags); TRACE("\n"); -#undef DUMPED_FLAGS } /***********************************************************************

1 0

Alexandre Julliard : winecfg: Don' t allow editing the configuration of the C drive.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 6b42c054c111f5afe567a84840ae81e895f306e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b42c054c111f5afe567a8484… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 20:29:34 2008 +0200 winecfg: Don't allow editing the configuration of the C drive. --- programs/winecfg/driveui.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 47aed18..9d9e420 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -427,6 +427,11 @@ static void update_controls(HWND dialog) if (selection == -1) selection = DRIVE_TYPE_DEFAULT; SendDlgItemMessage(dialog, IDC_COMBO_TYPE, CB_SETCURSEL, selection, 0); + EnableWindow( GetDlgItem( dialog, IDC_BUTTON_REMOVE ), (current_drive->letter != 'C') ); + EnableWindow( GetDlgItem( dialog, IDC_EDIT_PATH ), (current_drive->letter != 'C') ); + EnableWindow( GetDlgItem( dialog, IDC_BUTTON_BROWSE_PATH ), (current_drive->letter != 'C') ); + EnableWindow( GetDlgItem( dialog, IDC_COMBO_TYPE ), (current_drive->letter != 'C') ); + /* removeable media properties */ label = current_drive->label; set_text(dialog, IDC_EDIT_LABEL, label);

1 0

Alex Villacís Lasso : riched32: Implement a portion of suggested interpretation of CRLF handling for richedit 1 .0 emulation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 820de0bd595656d2f27863232d96104224d6e158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=820de0bd595656d2f27863232… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 10:10:05 2008 -0500 riched32: Implement a portion of suggested interpretation of CRLF handling for richedit 1.0 emulation. Fixes a few todos introduced by previous patch. --- dlls/riched20/caret.c | 23 +++++++++++++++++++---- dlls/riched32/tests/editor.c | 6 +++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a6a6217..7d50460 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -537,10 +537,25 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_ReleaseStyle(end_run->member.run.style); end_run->member.run.style = tmp_style; p->nOffset = 0; - if(pos-str < len && *pos =='\r') - pos++; - if(pos-str < len && *pos =='\n') - pos++; + if (editor->bEmulateVersion10) { + const WCHAR * tpos; + + tpos = pos; + while (tpos-str < len && *tpos == '\r') { + tpos++; + } + if (tpos-str >= len) { + if (tpos != pos) pos++; + } else if (*tpos == '\n') + pos = tpos + 1; + else + pos++; + } else { + if(pos-str < len && *pos =='\r') + pos++; + if(pos-str < len && *pos =='\n') + pos++; + } if(pos-str <= len) { len -= pos - str; str = pos; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f6f04af..906623f 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -113,9 +113,9 @@ static void test_WM_SETTEXT() TEST_SETTEXT(TestItem2, TestItem2, 1, 1, 1) TEST_SETTEXT(TestItem3, TestItem3, 2, 1, 1) TEST_SETTEXT(TestItem4, TestItem4, 3, 1, 0) - TEST_SETTEXT(TestItem5, TestItem5, 2, 1, 1) - TEST_SETTEXT(TestItem6, TestItem6, 3, 1, 1) - TEST_SETTEXT(TestItem7, TestItem7, 4, 1, 1) + TEST_SETTEXT(TestItem5, TestItem5, 2, 1, 0) + TEST_SETTEXT(TestItem6, TestItem6, 3, 1, 0) + TEST_SETTEXT(TestItem7, TestItem7, 4, 1, 0) TEST_SETTEXT(TestItem8, TestItem8, 2, 0, 0) TEST_SETTEXT(TestItem9, TestItem9, 3, 0, 0) TEST_SETTEXT(TestItem10, TestItem10, 3, 0, 0)

1 0

Alex Villacís Lasso : riched32: Add more todo tests for CR and LF behavior for richedit 1.0.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 17c437d48c3b1be0bf59cfca1273ee10814af581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c437d48c3b1be0bf59cfca1… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 10:08:01 2008 -0500 riched32: Add more todo tests for CR and LF behavior for richedit 1.0. --- dlls/riched32/tests/editor.c | 50 ++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 66a3090..f6f04af 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -64,6 +64,9 @@ static void test_WM_SETTEXT() const char * TestItem11 = "TestSomeText TestSomeText"; const char * TestItem12 = "TestSomeText \r\nTestSomeText"; const char * TestItem13 = "TestSomeText\r\n \r\nTestSomeText"; + const char * TestItem14 = "TestSomeText\n"; + const char * TestItem15 = "TestSomeText\r\r\r"; + const char * TestItem16 = "TestSomeText\r\r\rSomeMoreText"; char buf[1024] = {0}; LRESULT result; @@ -72,9 +75,19 @@ static void test_WM_SETTEXT() return it as is. In particular, \r\r\n is NOT converted, unlike riched20. Currently, builtin riched32 mangles solitary \r or \n when not part of a \r\n pair. + + For riched32, the rules for breaking lines seem to be the following: + - \r\n is one line break. This is the normal case. + - \r{0,N}\n is one line break. In particular, \n by itself is a line break. + - \n{1,N} are that many line breaks. + - \r with text or other characters (except \n) past it, is a line break. That + is, a run of \r{N} without a terminating \n is considered N line breaks + - \r at the end of the text is NOT a line break. This differs from riched20, + where \r at the end of the text is a proper line break. This causes + TestItem2 to fail its test. */ -#define TEST_SETTEXT(a, b, is_todo) \ +#define TEST_SETTEXT(a, b, nlines, is_todo, is_todo2) \ result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) a); \ ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); \ result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); \ @@ -88,21 +101,30 @@ static void test_WM_SETTEXT() } else { \ ok(result == 0, \ "WM_SETTEXT round trip: strcmp = %ld\n", result); \ + } \ + result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); \ + if (is_todo2) todo_wine { \ + ok(result == nlines, "EM_GETLINECOUNT returned %ld, expected %d\n", result, nlines); \ + } else { \ + ok(result == nlines, "EM_GETLINECOUNT returned %ld, expected %d\n", result, nlines); \ } - TEST_SETTEXT(TestItem1, TestItem1, 0) - TEST_SETTEXT(TestItem2, TestItem2, 1) - TEST_SETTEXT(TestItem3, TestItem3, 1) - TEST_SETTEXT(TestItem4, TestItem4, 1) - TEST_SETTEXT(TestItem5, TestItem5, 1) - TEST_SETTEXT(TestItem6, TestItem6, 1) - TEST_SETTEXT(TestItem7, TestItem7, 1) - TEST_SETTEXT(TestItem8, TestItem8, 0) - TEST_SETTEXT(TestItem9, TestItem9, 0) - TEST_SETTEXT(TestItem10, TestItem10, 0) - TEST_SETTEXT(TestItem11, TestItem11, 0) - TEST_SETTEXT(TestItem12, TestItem12, 0) - TEST_SETTEXT(TestItem13, TestItem13, 0) + TEST_SETTEXT(TestItem1, TestItem1, 1, 0, 0) + TEST_SETTEXT(TestItem2, TestItem2, 1, 1, 1) + TEST_SETTEXT(TestItem3, TestItem3, 2, 1, 1) + TEST_SETTEXT(TestItem4, TestItem4, 3, 1, 0) + TEST_SETTEXT(TestItem5, TestItem5, 2, 1, 1) + TEST_SETTEXT(TestItem6, TestItem6, 3, 1, 1) + TEST_SETTEXT(TestItem7, TestItem7, 4, 1, 1) + TEST_SETTEXT(TestItem8, TestItem8, 2, 0, 0) + TEST_SETTEXT(TestItem9, TestItem9, 3, 0, 0) + TEST_SETTEXT(TestItem10, TestItem10, 3, 0, 0) + TEST_SETTEXT(TestItem11, TestItem11, 1, 0, 0) + TEST_SETTEXT(TestItem12, TestItem12, 2, 0, 0) + TEST_SETTEXT(TestItem13, TestItem13, 3, 0, 0) + TEST_SETTEXT(TestItem14, TestItem14, 2, 1, 0) + TEST_SETTEXT(TestItem15, TestItem15, 3, 1, 1) + TEST_SETTEXT(TestItem16, TestItem16, 4, 1, 0) #undef TEST_SETTEXT DestroyWindow(hwndRichEdit);

1 0

Alex Villacís Lasso : riched20: Fix behavior of EM_REPLACESEL with painting disabled.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: dfcebfb22e17542c6e26fc45b4d285ee88c2730c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcebfb22e17542c6e26fc45b… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 10:02:52 2008 -0500 riched20: Fix behavior of EM_REPLACESEL with painting disabled. --- dlls/riched20/paint.c | 4 ++- dlls/riched20/tests/editor.c | 52 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 625f7dd..e6ec8ce 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -109,9 +109,11 @@ void ME_UpdateRepaint(ME_TextEditor *editor) { /* Should be called whenever the contents of the control have changed */ ME_Cursor *pCursor; + BOOL wrappedParagraphs; + wrappedParagraphs = ME_WrapMarkedParagraphs(editor); if (!editor->bRedraw) return; - if (ME_WrapMarkedParagraphs(editor)) + if (wrappedParagraphs) ME_UpdateScrollBar(editor); /* Ensure that the cursor is visible */ diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f8a3d6a..b97e458 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1793,7 +1793,7 @@ static void test_EM_EXSETSEL(void) DestroyWindow(hwndRichEdit); } -static void test_EM_REPLACESEL(void) +static void test_EM_REPLACESEL(int redraw) { HWND hwndRichEdit = new_richedit(NULL); char buffer[1024] = {0}; @@ -1818,6 +1818,9 @@ static void test_EM_REPLACESEL(void) hwndRichEdit = new_richedit(NULL); + trace("Testing EM_REPLACESEL behavior with redraw=%d\n", redraw); + SendMessage(hwndRichEdit, WM_SETREDRAW, redraw, 0); + /* Test behavior with carriage returns and newlines */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "RichEdit1"); @@ -1834,6 +1837,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "RichEdit1") == 0, "EM_GETTEXTEX results not what was set by EM_REPLACESEL\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 1, "EM_GETLINECOUNT returned %d, expected 1\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "RichEdit1\r"); ok(10 == r, "EM_REPLACESEL returned %d, expected 10\n", r); @@ -1849,6 +1856,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 2, "EM_GETLINECOUNT returned %d, expected 2\n", r); + /* Win98's riched20 and WinXP's riched20 disagree on what to return from EM_REPLACESEL. The general rule seems to be that Win98's riched20 returns the number of characters *inserted* into the control (after @@ -1861,6 +1872,10 @@ static void test_EM_REPLACESEL(void) ok(11 == r /* WinXP */ || 10 == r /* Win98 */, "EM_REPLACESEL returned %d, expected 11 or 10\n", r); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 2, "EM_GETLINECOUNT returned %d, expected 2\n", r); + r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 10, "EM_EXGETSEL returned cpMin=%d, expected 10\n", cr.cpMin); @@ -1907,6 +1922,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 3, "EM_GETLINECOUNT returned %d, expected 3\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n"); ok(3 == r /* WinXP */ || 1 == r /* Win98 */, @@ -1926,6 +1945,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, " ") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 1, "EM_GETLINECOUNT returned %d, expected 1\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\r\r\r\n\r\r\r"); ok(9 == r /* WinXP */ || 7 == r /* Win98 */, @@ -1945,6 +1968,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "\r\r\r \r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\n"); ok(5 == r /* WinXP */ || 2 == r /* Win98 */, @@ -1964,6 +1991,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, " \r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 2, "EM_GETLINECOUNT returned %d, expected 2\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\r"); ok(5 == r /* WinXP */ || 3 == r /* Win98 */, @@ -1983,6 +2014,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, " \r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 3, "EM_GETLINECOUNT returned %d, expected 3\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\rX\r\n\r\r"); ok(6 == r /* WinXP */ || 5 == r /* Win98 */, @@ -2002,6 +2037,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "\rX\r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 5, "EM_GETLINECOUNT returned %d, expected 5\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\n\n"); ok(2 == r, "EM_REPLACESEL returned %d, expected 2\n", r); @@ -2020,6 +2059,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 3, "EM_GETLINECOUNT returned %d, expected 3\n", r); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\n\n\n\n\r\r\r\r\n"); ok(9 == r /* WinXP */ || 7 == r /* Win98 */, @@ -2039,6 +2082,10 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "\r\r\r\r\r\r ") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Test number of lines reported after EM_REPLACESEL */ + r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + DestroyWindow(hwndRichEdit); } @@ -2721,7 +2768,8 @@ START_TEST( editor ) test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); - test_EM_REPLACESEL(); + test_EM_REPLACESEL(1); + test_EM_REPLACESEL(0); test_eventMask(); /* Set the environment variable WINETEST_RICHED20 to keep windows

1 0

Alex Villacís Lasso : riched20: EM_SETTEXTEX supports RTF strings, with tests.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 46ff4a6f165c55570324ff87d7a4bdd939d6e4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ff4a6f165c55570324ff87d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 10:05:31 2008 -0500 riched20: EM_SETTEXTEX supports RTF strings, with tests. --- dlls/riched20/editor.c | 11 +++++--- dlls/riched20/tests/editor.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7eaf769..42f7216 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -115,7 +115,7 @@ + EM_SETSCROLLPOS 3.0 - EM_SETTABSTOPS 3.0 - EM_SETTARGETDEVICE (partial) - + EM_SETTEXTEX 3.0 (no rich text insertion handling, proper style?) + + EM_SETTEXTEX 3.0 (proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 + EM_SETUNDOLIMIT 2.0 @@ -2117,17 +2117,20 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, wszText = lParam ? ME_ToUnicode(pStruct->codepage == 1200, (void *)lParam) : NULL; len = wszText ? lstrlenW(wszText) : 0; - /* FIXME: this should support RTF strings too, according to MSDN */ if (pStruct->flags & ST_SELECTION) { ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from); - ME_InsertTextFromCursor(editor, 0, wszText, len, style); + if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) + ME_StreamInRTFString(editor, 0, (char *)lParam); + else ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); } else { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); - ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); + if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) + ME_StreamInRTFString(editor, 0, (char *)lParam); + else ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); len = 1; } ME_CommitUndo(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b97e458..dd7640c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1041,6 +1041,20 @@ static void test_ES_PASSWORD(void) DestroyWindow(hwndRichEdit); } +static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + char** str = (char**)dwCookie; + *pcb = cb; + if (*pcb > 0) { + memcpy(*str, pbBuff, *pcb); + *str += *pcb; + } + return 0; +} + static void test_WM_SETTEXT() { HWND hwndRichEdit = new_richedit(NULL); @@ -1057,8 +1071,11 @@ static void test_WM_SETTEXT() const char * TestItem6_after = "TestSomeText \r\nTestSomeText"; const char * TestItem7 = "TestSomeText\r\n\r\r\n\rTestSomeText"; const char * TestItem7_after = "TestSomeText\r\n \r\nTestSomeText"; + char buf[1024] = {0}; LRESULT result; + EDITSTREAM es; + char * p; /* This test attempts to show that WM_SETTEXT on a riched20 control causes any solitary \r to be converted to \r\n on return. Properly paired @@ -1086,6 +1103,18 @@ static void test_WM_SETTEXT() TEST_SETTEXT(TestItem6, TestItem6_after) TEST_SETTEXT(TestItem7, TestItem7_after) + /* The following test demonstrates that WM_SETTEXT supports RTF strings */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); + p = buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + memset(buf, 0, sizeof(buf)); + SendMessage(hwndRichEdit, EM_STREAMOUT, + (WPARAM)(SF_RTF), (LPARAM)&es); + trace("EM_STREAMOUT produced: \n%s\n", buf); + TEST_SETTEXT(buf, TestItem1) + #undef TEST_SETTEXT DestroyWindow(hwndRichEdit); } @@ -1126,8 +1155,10 @@ static void test_EM_SETTEXTEX(void) ' ','\r', 0}; #define MAX_BUF_LEN 1024 WCHAR buf[MAX_BUF_LEN]; + char * p; int result; CHARRANGE cr; + EDITSTREAM es; setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */ @@ -1274,6 +1305,31 @@ static void test_EM_SETTEXTEX(void) "EM_SETTEXTEX to replace selection with more text failed: %i.\n", lstrlenW(buf) ); + /* The following test demonstrates that EM_SETTEXTEX supports RTF strings */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "TestSomeText"); /* TestItem1 */ + p = (char *)buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + memset(buf, 0, sizeof(buf)); + SendMessage(hwndRichEdit, EM_STREAMOUT, + (WPARAM)(SF_RTF), (LPARAM)&es); + trace("EM_STREAMOUT produced: \n%s\n", (char *)buf); + + setText.codepage = CP_ACP;/* EM_STREAMOUT saved as ANSI string */ + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) buf); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem1) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + DestroyWindow(hwndRichEdit); }

1 0

Jacek Caban : mshtml: Added HTMLDocument's IDispatchEx implementation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 98ab1a92c03c9aa28963e5cb221a7fbd137bd318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ab1a92c03c9aa28963e5cb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:21:54 2008 +0200 mshtml: Added HTMLDocument's IDispatchEx implementation. --- dlls/mshtml/dispex.c | 5 + dlls/mshtml/htmldoc.c | 169 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 7 ++ 3 files changed, 180 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 06b495b..26be1e8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -51,7 +51,12 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, + &DIID_DispHTMLDocument, &DIID_DispHTMLWindow2, + &IID_IHTMLDocument2, + &IID_IHTMLDocument3, + &IID_IHTMLDocument4, + &IID_IHTMLDocument5, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1907ab7..16db749 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -46,7 +46,10 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID *ppvObject = HTMLDOC(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch, %p)\n", This, ppvObject); - *ppvObject = HTMLDOC(This); + *ppvObject = DISPATCHEX(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx, %p)\n", This, ppvObject); + *ppvObject = DISPATCHEX(This); }else if(IsEqualGUID(&IID_IHTMLDocument, riid)) { TRACE("(%p)->(IID_IHTMLDocument, %p)\n", This, ppvObject); *ppvObject = HTMLDOC(This); @@ -1354,6 +1357,167 @@ static const IHTMLDocument2Vtbl HTMLDocumentVtbl = { HTMLDocument_createStyleSheet }; +#define DISPEX_THIS(iface) DEFINE_THIS(HTMLDocument, IDispatchEx, iface) + +static HRESULT WINAPI DocDispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI DocDispatchEx_AddRef(IDispatchEx *iface) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI DocDispatchEx_Release(IDispatchEx *iface) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLDOC(This)); +} + +static HRESULT WINAPI DocDispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); +} + +static HRESULT WINAPI DocDispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocDispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI DocDispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + switch(dispIdMember) { + case DISPID_READYSTATE: + TRACE("DISPID_READYSTATE\n"); + + if(!(wFlags & DISPATCH_PROPERTYGET)) + return E_INVALIDARG; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = This->readystate; + return S_OK; + } + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); +} + +static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_InvokeEx(DISPATCHEX(&This->dispex), id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); +} + +static HRESULT WINAPI DocDispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_DeleteMemberByName(DISPATCHEX(&This->dispex), bstrName, grfdex); +} + +static HRESULT WINAPI DocDispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_DeleteMemberByDispID(DISPATCHEX(&This->dispex), id); +} + +static HRESULT WINAPI DocDispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetMemberProperties(DISPATCHEX(&This->dispex), id, grfdexFetch, pgrfdex); +} + +static HRESULT WINAPI DocDispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetMemberName(DISPATCHEX(&This->dispex), id, pbstrName); +} + +static HRESULT WINAPI DocDispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetNextDispID(DISPATCHEX(&This->dispex), grfdex, id, pid); +} + +static HRESULT WINAPI DocDispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + HTMLDocument *This = DISPEX_THIS(iface); + + return IDispatchEx_GetNameSpaceParent(DISPATCHEX(&This->dispex), ppunk); +} + +#undef DISPEX_THIS + +static const IDispatchExVtbl DocDispatchExVtbl = { + DocDispatchEx_QueryInterface, + DocDispatchEx_AddRef, + DocDispatchEx_Release, + DocDispatchEx_GetTypeInfoCount, + DocDispatchEx_GetTypeInfo, + DocDispatchEx_GetIDsOfNames, + DocDispatchEx_Invoke, + DocDispatchEx_GetDispID, + DocDispatchEx_InvokeEx, + DocDispatchEx_DeleteMemberByName, + DocDispatchEx_DeleteMemberByDispID, + DocDispatchEx_GetMemberProperties, + DocDispatchEx_GetMemberName, + DocDispatchEx_GetNextDispID, + DocDispatchEx_GetNameSpaceParent +}; + +static dispex_static_data_t HTMLDocument_dispex = { + DispHTMLDocument_tid, + NULL, + { + IHTMLDocument2_tid, + IHTMLDocument3_tid, + IHTMLDocument4_tid, + IHTMLDocument5_tid, + 0 + } +}; + HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) { HTMLDocument *ret; @@ -1363,6 +1527,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret = heap_alloc_zero(sizeof(HTMLDocument)); ret->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; + ret->lpIDispatchExVtbl = &DocDispatchExVtbl; ret->ref = 0; ret->readystate = READYSTATE_UNINITIALIZED; @@ -1394,6 +1559,8 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ConnectionPoint_Init(&ret->cp_htmldocevents, &ret->cp_container, &DIID_HTMLDocumentEvents); ConnectionPoint_Init(&ret->cp_htmldocevents2, &ret->cp_container, &DIID_HTMLDocumentEvents2); + init_dispex(&ret->dispex, (IUnknown*)HTMLDOC(ret), &HTMLDocument_dispex); + ret->nscontainer = NSContainer_Create(ret, NULL); ret->window = HTMLWindow_Create(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 15320be..73169f7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -61,7 +61,12 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { NULL_tid, + DispHTMLDocument_tid, DispHTMLWindow2_tid, + IHTMLDocument2_tid, + IHTMLDocument3_tid, + IHTMLDocument4_tid, + IHTMLDocument5_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, @@ -149,6 +154,7 @@ typedef struct { } HTMLOptionElementFactory; struct HTMLDocument { + DispatchEx dispex; const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; @@ -168,6 +174,7 @@ struct HTMLDocument { const IHlinkTargetVtbl *lpHlinkTargetVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const ICustomDocVtbl *lpCustomDocVtbl; + const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref;

1 0

Jacek Caban : mshtml: Forward IHTMLDocument2' s IDispatch methods to IDispatchEx implementation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 0a32cd868db912ad861bc2269c38e595f0e7c8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a32cd868db912ad861bc2269… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:22:12 2008 +0200 mshtml: Forward IHTMLDocument2's IDispatch methods to IDispatchEx implementation. --- dlls/mshtml/htmldoc.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 16db749..0bb2ebf 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -213,16 +213,16 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) static HRESULT WINAPI HTMLDocument_GetTypeInfoCount(IHTMLDocument2 *iface, UINT *pctinfo) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLDocument_GetTypeInfo(IHTMLDocument2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDocument_GetIDsOfNames(IHTMLDocument2 *iface, REFIID riid, @@ -230,9 +230,8 @@ static HRESULT WINAPI HTMLDocument_GetIDsOfNames(IHTMLDocument2 *iface, REFIID r LCID lcid, DISPID *rgDispId) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMember, @@ -241,23 +240,8 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe { HTMLDocument *This = HTMLDOC_THIS(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - switch(dispIdMember) { - case DISPID_READYSTATE: - if(!(wFlags & DISPATCH_PROPERTYGET)) - return E_INVALIDARG; - - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = This->readystate; - return S_OK; - - default: - FIXME("Unsupported dispid %d\n", dispIdMember); - } - - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch **p)

1 0

Jacek Caban : mshtml: Make IHTMLDocument2 iterface offset independent.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 7d0034a5ba3ab64cba7440c28d642f4e8d1e0978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0034a5ba3ab64cba7440c28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:21:33 2008 +0200 mshtml: Make IHTMLDocument2 iterface offset independent. --- dlls/mshtml/htmldoc.c | 308 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 205 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d0034a5ba3ab64cba744…

1 0

Jacek Caban : mshtml: Added setTimeout implementation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 788432af49d0ce9a63ab15397c5277c68ec574b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=788432af49d0ce9a63ab15397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:21:19 2008 +0200 mshtml: Added setTimeout implementation. --- dlls/mshtml/htmlwindow.c | 15 ++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/task.c | 95 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ce98f38..82b03e6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -845,8 +845,19 @@ static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expre VARIANT *language, long *timerID) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); - return E_NOTIMPL; + + TRACE("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); + + switch(V_VT(expression)) { + case VT_DISPATCH: + *timerID = set_task_timer(This->doc, msec, V_DISPATCH(expression)); + break; + + default: + FIXME("unimplemented vt=%d\n", V_VT(expression)); + } + + return S_OK; } static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, long msec, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8bca848..15320be 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -555,12 +555,14 @@ typedef struct { HWND thread_hwnd; task_t *task_queue_head; task_t *task_queue_tail; + struct list timer_list; } thread_data_t; thread_data_t *get_thread_data(BOOL); HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); +DWORD set_task_timer(HTMLDocument*,DWORD,IDispatch*); HRESULT get_typeinfo(tid_t,ITypeInfo**); void release_typelib(void); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 3bb99cc..99e2573 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -36,6 +36,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define WM_PROCESSTASK 0x8008 +#define TIMER_ID 0x3000 + +typedef struct { + HTMLDocument *doc; + DWORD id; + DWORD time; + IDispatch *disp; + + struct list entry; +} task_timer_t; void push_task(task_t *task) { @@ -66,11 +76,34 @@ static task_t *pop_task(void) return task; } +static void release_task_timer(HWND thread_hwnd, task_timer_t *timer) +{ + list_remove(&timer->entry); + + KillTimer(thread_hwnd, timer->id); + IDispatch_Release(timer->disp); + + heap_free(timer); +} + void remove_doc_tasks(const HTMLDocument *doc) { thread_data_t *thread_data = get_thread_data(FALSE); + struct list *liter, *ltmp; + task_timer_t *timer; task_t *iter, *tmp; + LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->timer_list) { + timer = LIST_ENTRY(liter, task_timer_t, entry); + if(timer->doc == doc) + release_task_timer(thread_data->thread_hwnd, timer); + } + + if(!list_empty(&thread_data->timer_list)) { + timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time - GetTickCount(), NULL); + } + if(!thread_data) return; @@ -90,6 +123,43 @@ void remove_doc_tasks(const HTMLDocument *doc) } } +DWORD set_task_timer(HTMLDocument *doc, DWORD msec, IDispatch *disp) +{ + thread_data_t *thread_data = get_thread_data(TRUE); + task_timer_t *timer; + DWORD tc = GetTickCount(); + + static DWORD id_cnt = 0x20000000; + + timer = heap_alloc(sizeof(task_timer_t)); + timer->id = id_cnt++; + timer->doc = doc; + timer->time = tc + msec; + + IDispatch_AddRef(disp); + timer->disp = disp; + + if(list_empty(&thread_data->timer_list) + || LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry)->time > timer->time) { + + list_add_head(&thread_data->timer_list, &timer->entry); + SetTimer(thread_data->thread_hwnd, TIMER_ID, msec, NULL); + }else { + task_timer_t *iter; + + LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { + if(iter->time > timer->time) { + list_add_tail(&iter->entry, &timer->entry); + return timer->id; + } + } + + list_add_tail(&thread_data->timer_list, &timer->entry); + } + + return timer->id; +} + static void set_downloading(HTMLDocument *doc) { IOleCommandTarget *olecmd; @@ -238,6 +308,28 @@ static void process_task(task_t *task) } } +static LRESULT process_timer(void) +{ + thread_data_t *thread_data = get_thread_data(TRUE); + DWORD tc = GetTickCount(); + task_timer_t *timer; + + while(!list_empty(&thread_data->timer_list)) { + timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + if(timer->time > tc) { + SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time-tc, NULL); + return 0; + } + + list_remove(&timer->entry); + call_disp_func(timer->doc, timer->disp); + release_task_timer(thread_data->thread_hwnd, timer); + } + + KillTimer(thread_data->thread_hwnd, TIMER_ID); + return 0; +} + static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -252,6 +344,8 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } return 0; + case WM_TIMER: + return process_timer(); } if(msg > WM_USER) @@ -307,6 +401,7 @@ thread_data_t *get_thread_data(BOOL create) if(!thread_data && create) { thread_data = heap_alloc_zero(sizeof(thread_data_t)); TlsSetValue(mshtml_tls, thread_data); + list_init(&thread_data->timer_list); } return thread_data;

1 0