wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Francois Gouget : d3drm/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: a17d518122cc8086f18b1af75da883299664aff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17d518122cc8086f18b1af75… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 18 10:40:53 2013 +0200 d3drm/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3drm/tests/d3drm.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f82af5f..31ba044 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -856,41 +856,41 @@ static void test_Face(void) ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n", U1(v2[0]).x, U1(v1[0]).x); - ok(U1(v2[0]).y == U1(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", - U1(v2[0]).y, U1(v1[0]).y); - ok(U1(v2[0]).z == U1(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", - U1(v2[0]).z, U1(v1[0]).z); + ok(U2(v2[0]).y == U2(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", + U2(v2[0]).y, U2(v1[0]).y); + ok(U3(v2[0]).z == U3(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", + U3(v2[0]).z, U3(v1[0]).z); ok(U1(v2[1]).x == U1(v1[1]).x, "Wrong component v2[1].x = %f (expected %f)\n", U1(v2[1]).x, U1(v1[1]).x); - ok(U1(v2[1]).y == U1(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", - U1(v2[1]).y, U1(v1[1]).y); - ok(U1(v2[1]).z == U1(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", - U1(v2[1]).z, U1(v1[1]).z); + ok(U2(v2[1]).y == U2(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", + U2(v2[1]).y, U2(v1[1]).y); + ok(U3(v2[1]).z == U3(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", + U3(v2[1]).z, U3(v1[1]).z); ok(U1(v2[2]).x == U1(v1[2]).x, "Wrong component v2[2].x = %f (expected %f)\n", U1(v2[2]).x, U1(v1[2]).x); - ok(U1(v2[2]).y == U1(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", - U1(v2[2]).y, U1(v1[2]).y); - ok(U1(v2[2]).z == U1(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", - U1(v2[2]).z, U1(v1[2]).z); + ok(U2(v2[2]).y == U2(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", + U2(v2[2]).y, U2(v1[2]).y); + ok(U3(v2[2]).z == U3(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", + U3(v2[2]).z, U3(v1[2]).z); ok(U1(n2[0]).x == U1(n1[0]).x, "Wrong component n2[0].x = %f (expected %f)\n", U1(n2[0]).x, U1(n1[0]).x); - ok(U1(n2[0]).y == U1(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", - U1(n2[0]).y, U1(n1[0]).y); - ok(U1(n2[0]).z == U1(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", - U1(n2[0]).z, U1(n1[0]).z); + ok(U2(n2[0]).y == U2(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", + U2(n2[0]).y, U2(n1[0]).y); + ok(U3(n2[0]).z == U3(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", + U3(n2[0]).z, U3(n1[0]).z); ok(U1(n2[1]).x == U1(n1[1]).x, "Wrong component n2[1].x = %f (expected %f)\n", U1(n2[1]).x, U1(n1[1]).x); - ok(U1(n2[1]).y == U1(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", - U1(n2[1]).y, U1(n1[1]).y); - ok(U1(n2[1]).z == U1(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", - U1(n2[1]).z, U1(n1[1]).z); + ok(U2(n2[1]).y == U2(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", + U2(n2[1]).y, U2(n1[1]).y); + ok(U3(n2[1]).z == U3(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", + U3(n2[1]).z, U3(n1[1]).z); ok(U1(n2[2]).x == U1(n1[2]).x, "Wrong component n2[2].x = %f (expected %f)\n", U1(n2[2]).x, U1(n1[2]).x); - ok(U1(n2[2]).y == U1(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", - U1(n2[2]).y, U1(n1[2]).y); - ok(U1(n2[2]).z == U1(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", - U1(n2[2]).z, U1(n1[2]).z); + ok(U2(n2[2]).y == U2(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", + U2(n2[2]).y, U2(n1[2]).y); + ok(U3(n2[2]).z == U3(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", + U3(n2[2]).z, U3(n1[2]).z); IDirect3DRMFace_Release(face); IDirect3DRMFaceArray_Release(array1);

1 0

Aric Stewart : gdi32: GetGlyphIndices does substitute glyph.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 546c5870362305ef98af83a7bcab476e08365274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546c5870362305ef98af83a7b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 17 14:32:39 2013 -0500 gdi32: GetGlyphIndices does substitute glyph. --- dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 141238b..ae48914 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5841,6 +5841,8 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP } pgi[i] = default_char; } + else + pgi[i] = get_GSUB_vert_glyph(physdev->font, pgi[i]); } LeaveCriticalSection( &freetype_cs ); return count; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5202985..fdb6451 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4835,7 +4835,7 @@ static void test_vertical_font(void) "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY); - todo_wine ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); + ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0

Aric Stewart : gdi32/tests: Update the vertical font to be a proper windows vertical font.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: adfa3c0c575077b98ee9771ec21ac6be257c25bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfa3c0c575077b98ee9771ec… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 17 14:32:23 2013 -0500 gdi32/tests: Update the vertical font to be a proper windows vertical font. --- dlls/gdi32/tests/font.c | 16 +- dlls/gdi32/tests/vertical.sfd | 1058 ++++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/vertical.ttf | Bin 2372 -> 3560 bytes 3 files changed, 958 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adfa3c0c575077b98ee97…

1 0

Akihiro Sagawa : fonts: Fix default character index of Japanese Fixedsys.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: d29f6c41eb13e647a311091956af3131633e7eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29f6c41eb13e647a31109195… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 16 23:33:42 2013 +0900 fonts: Fix default character index of Japanese Fixedsys. --- fonts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index ac034f6..556ed0c 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -93,7 +93,7 @@ vgafix.fon: fixedsys.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 jvgafix.fon: fixedsys_jp.ttf - $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys_jp.ttf 18,932,8 + $(LDPATH) $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8 sserife.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8

1 0

Detlef Riekenberg : user32: The flag EF_APP_HAS_HANDLE is now obsolete.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 9782ad77b54d8743e06ab5eaf6e34a065840698c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9782ad77b54d8743e06ab5eaf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:45 2013 +0200 user32: The flag EF_APP_HAS_HANDLE is now obsolete. --- dlls/user32/edit.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8910748..3e5a850 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -79,9 +79,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #define EF_AFTER_WRAP 0x0080 /* the caret is displayed after the last character of a wrapped line, instead of in front of the next character */ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ -#define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of - the text buffer if this is clear. */ -#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ +#define EF_DIALOGMODE 0x0200 /* Indicates that we are inside a dialog window */ typedef enum { @@ -1296,7 +1294,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) } else es->text = LocalLock(es->hloc32W); } - if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); es->lock_count++; } @@ -2493,8 +2490,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) /* The text buffer handle belongs to the app */ es->hlocapp = hLocal; - /* The app has knowledge of the text buffer handle */ - es->flags |= EF_APP_HAS_HANDLE; + TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -2837,9 +2833,9 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) /* The text buffer handle belongs to the control */ es->hlocapp = NULL; - /* The app has knowledge of the text buffer handle */ - es->flags |= EF_APP_HAS_HANDLE; + EDIT_LockBuffer(es); + text_buffer_changed(es); es->x_offset = es->y_offset = 0; es->selection_start = es->selection_end = 0;

1 0

Detlef Riekenberg : user32/tests: Add tests for EM_GETHANDLE.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: caf1bbba94157211f7ab43b61f46a4b018c8e72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf1bbba94157211f7ab43b61… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:44 2013 +0200 user32/tests: Add tests for EM_GETHANDLE. --- dlls/user32/tests/edit.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 11550f7..700dfb0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2530,6 +2530,120 @@ static void test_dialogmode(void) destroy_child_editcontrol(hwEdit); } +static void test_EM_GETHANDLE(void) +{ + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + char *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenA(buffer); + ok((len == lstrlenA(str1)) && !lstrcmpA(buffer, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyA(buffer, str2); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str2)) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal upto EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + + START_TEST(edit) { BOOL b; @@ -2568,5 +2682,7 @@ START_TEST(edit) else win_skip("EndMenu is not available\n"); + test_EM_GETHANDLE(); + UnregisterWindowClasses(); }

1 0

Detlef Riekenberg : user32: The app owns the text buffer memory after an EM_GETHANDLE.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 40afb51a70ae491011f44dc9e6c1bbf59cf8bd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40afb51a70ae491011f44dc9e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:43 2013 +0200 user32: The app owns the text buffer memory after an EM_GETHANDLE. --- dlls/user32/edit.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 126ab12..8910748 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -151,6 +151,7 @@ typedef struct HLOCAL hloc32W; /* our unicode local memory block */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ + HLOCAL hlocapp; /* The text buffer handle belongs to the app */ /* * IME Data */ @@ -1264,6 +1265,8 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { + if (es->hlocapp) return; + if (!es->text) { if(!es->hloc32W) return; @@ -1305,6 +1308,7 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { + if (es->hlocapp) return; /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) @@ -2485,6 +2489,11 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) hLocal = es->hloc32A; } + EDIT_UnlockBuffer(es, TRUE); + + /* The text buffer handle belongs to the app */ + es->hlocapp = hLocal; + /* The app has knowledge of the text buffer handle */ es->flags |= EF_APP_HAS_HANDLE; TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; @@ -2826,6 +2835,9 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + /* The text buffer handle belongs to the control */ + es->hlocapp = NULL; + /* The app has knowledge of the text buffer handle */ es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); @@ -4597,10 +4609,11 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; - if (es->hloc32W) { + /* The app can own the text buffer handle */ + if (es->hloc32W && (es->hloc32W != es->hlocapp)) { LocalFree(es->hloc32W); } - if (es->hloc32A) { + if (es->hloc32A && (es->hloc32A != es->hlocapp)) { LocalFree(es->hloc32A); } EDIT_InvalidateUniscribeData(es);

1 0

Jacek Caban : mshtml: Added whitespace parser tests.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 421f62ad0c4bd42702bb3dcc74fb04016c3c11ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=421f62ad0c4bd42702bb3dcc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:35:08 2013 +0200 mshtml: Added whitespace parser tests. --- dlls/mshtml/tests/jstest.html | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index d599756..bfa98c0 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -190,6 +190,28 @@ function test_customtag() { ok(children[2].tagName === "BR", "children[2].tagName = " + children[2].tagName); } +function test_whitespace_nodes() { + document.body.innerHTML = '<table id="tid"> <tr> \t<td>\n \t<div></div> </td>\n </tr> </table>'; + + var t = document.getElementById("tid"); + ok(t.childNodes.length === 1, "t.childNodes.length = " + t.childNodes.length); + ok(t.childNodes[0].tagName === "TBODY", "t.childNodes[0].tagName = " + t.childNodes[0].tagName); + + var row = t.rows[0]; + ok(row.childNodes.length === 1, "row.childNodes.length = " + row.childNodes.length); + ok(row.childNodes[0].tagName === "TD", "row.childNodes[0].tagName = " + row.childNodes[0].tagName); + + var cell = row.cells[0]; + ok(cell.childNodes.length === 1, "cell.childNodes.length = " + cell.childNodes.length); + + + document.body.innerHTML = '<table id="tid"> x<tr> \tx<td>\n \tx<div></div> </td>\n </tr> </table>'; + + t = document.getElementById("tid"); + ok(t.rows[0].cells[0].childNodes.length === 2, + "t.rows[0].cells[0].childNodes.length = " + t.rows[0].cells[0].childNodes.length); +} + var globalVar = false; function runTests() { @@ -212,6 +234,7 @@ function runTests() { test_override_functions(); test_forin(); test_customtag(); + test_whitespace_nodes(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Wine Gecko 2.21 release.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: fb9620f1c8e2f531c265d6c4205d78c8b56682bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9620f1c8e2f531c265d6c42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:34 2013 +0200 mshtml: Wine Gecko 2.21 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlelem2.c | 8 +- dlls/mshtml/nsiface.idl | 217 +++++++++++++++++++++++++++++++--------------- dlls/mshtml/nsio.c | 52 ++++++++++- dlls/mshtml/propbag.c | 8 +- 5 files changed, 204 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb9620f1c8e2f531c265d…

1 0

Jacek Caban : mshtml: Added parsing custom tag name tests.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 1c134c16d3327e41f22d9a5532f9e2ed49255cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c134c16d3327e41f22d9a553… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:59 2013 +0200 mshtml: Added parsing custom tag name tests. --- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 4185112..d599756 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -179,6 +179,17 @@ function test_forin() { ok(cnt > 100, "cnt = " + cnt); } +function test_customtag() { + document.body.innerHTML = 'test<unk><br>'; + + var children = document.body.childNodes; + + ok(children.length === 3, "children.length = " + children.length); + ok(children[0].data === "test", "children[0].data = " + children[0].data); + ok(children[1].tagName === "UNK", "children[1].tagName = " + children[1].tagName); + ok(children[2].tagName === "BR", "children[2].tagName = " + children[2].tagName); +} + var globalVar = false; function runTests() { @@ -200,6 +211,7 @@ function runTests() { test_arg_conv(); test_override_functions(); test_forin(); + test_customtag(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013