May 2013 - Wine-commits - list.winehq.org

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

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

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

Ken Thomases : winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: c8d4b1cc5e9d69a8dc0e6150d768fc2b02b5ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d4b1cc5e9d69a8dc0e6150d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:50 2013 -0500 winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status. When we have windows on two different spaces and the user switches between them by clicking our Dock icon, Cocoa inexplicably sends the switched-to window to the back of the z-order. It's only -makeKeyAndOrderFront: that brings it forward again, but our override broke that. --- dlls/winemac.drv/cocoa_window.m | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cec86b5..d2b2547 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1051,8 +1051,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* We don't call this. It's the action method of the items in the Window menu. */ - (void) makeKeyAndOrderFront:(id)sender { + WineApplicationController* controller = [WineApplicationController sharedController]; + WineWindow* front = [controller frontWineWindow]; + if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [[WineApplicationController sharedController] windowGotFocus:self]; + [controller windowGotFocus:self]; + + if (front && [self level] < [front level]) + [self setLevel:[front level]]; + [self orderFront:nil]; + [controller adjustWindowLevels]; } - (void) sendEvent:(NSEvent*)event

1 0

Alistair Leslie-Hughes : oledb32: Support VT_NULL when converting to DBTYPE_BSTR.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: d3c3a38f692756b73b9bb1cedbcf22dcbea8be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c3a38f692756b73b9bb1ced… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 12:21:12 2013 +1000 oledb32: Support VT_NULL when converting to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 15 ++++++++++++--- dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 19f46f6..af603e4 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -534,9 +534,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - VariantInit(&tmp); - if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - *d = V_BSTR(&tmp); + if(V_VT((VARIANT*)src) == VT_NULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = get_length(DBTYPE_BSTR); + return S_OK; + } + else + { + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + *d = V_BSTR(&tmp); + } break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 90e1658..6f02899 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -977,6 +977,14 @@ static void test_converttobstr(void) ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); SysFreeString(dst); SysFreeString(b); + + V_VT(&v) = VT_NULL; + dst = (void*)0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(dst == (void*)0x1234, "got %p\n", dst); } static void test_converttowstr(void)

1 0

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

17 May '13

Module: wine Branch: master Commit: ae56273c46e6853616f0b01003a963af64361743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae56273c46e6853616f0b0100… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:45 2013 +0200 mshtml: Added more parser compatMode tests. --- dlls/mshtml/tests/dom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d4693ae..da44190 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7439,6 +7439,7 @@ static void test_quirks_mode(void) { run_domtest("<html></html>", check_quirks_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); + run_domtest("<!DOCTYPE html>\n<html></html>", check_quirks_mode); } START_TEST(dom)

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

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

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