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

Alistair Leslie-Hughes : user32: Don' t crash in DrawTextEx when tab length is zero.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 731a32be41e206f31c29f39c3944e07a09ad0f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=731a32be41e206f31c29f39c3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 2 15:22:10 2016 +1100 user32: Don't crash in DrawTextEx when tab length is zero. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84d0c4f0da4982c3f67cce9552b7d971d7a0e1d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/text.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/user32/text.c | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index df8d3ee..57bc647 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -44,8 +44,9 @@ static void test_DrawTextCalcRect(void) static WCHAR emptystringW[] = { 0 }; static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; + static char tabstring[] = "one\ttwo"; INT textlen, textheight, heightcheck; - RECT rect = { 0, 0, 100, 0 }; + RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; @@ -580,6 +581,42 @@ static void test_DrawTextCalcRect(void) ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", textheight, heightcheck * 6); + /* DT_TABSTOP | DT_EXPANDTABS tests */ + SetRect( &rect, 0,0, 10, 10); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_TABSTOP | DT_EXPANDTABS ); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + + SetRect( &rect2, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect2, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left && rect.right != rect2.right && rect.top == rect2.top && rect.bottom == rect2.bottom, + "incorrect rect %d,%d-%d,%d rect2 %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom, rect2.left, rect2.top, rect2.right, rect2.bottom ); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + dtp.iTabLength = 8; + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 8, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left, "unexpected value %d, got %d\n", rect.left, rect2.left); + /* XP, 2003 appear to not give the same values. */ + ok(rect.right == rect2.right || broken(rect.right > rect2.right), "unexpected value %d, got %d\n",rect.right, rect2.right); + ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); + ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7b0302e..2ac3afd 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -948,7 +948,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_EXPANDTABS) { - int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; + int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8; tabwidth = tm.tmAveCharWidth * tabstop; }

1 0

Charles Davis : dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: ac418d52b1367139ee4f9733dc8267a94f64437a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac418d52b1367139ee4f9733d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:00:02 2016 -0700 dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcca411ac32e69a4c2f1be01595db113a20498e4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b48a769..98e7ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_LAO, TT_NAME_MAC_LANGID_VIETNAMESE, TT_NAME_MAC_LANGID_INDONESIAN, - TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_TAGALOG, TT_NAME_MAC_LANGID_MALAY_ROMAN, TT_NAME_MAC_LANGID_MALAY_ARABIC, TT_NAME_MAC_LANGID_AMHARIC, @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_NYANJA, TT_NAME_MAC_LANGID_MALAGASY, TT_NAME_MAC_LANGID_ESPERANTO, - TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_WELSH = 128, TT_NAME_MAC_LANGID_BASQUE, TT_NAME_MAC_LANGID_CATALAN, TT_NAME_MAC_LANGID_LATIN, - TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_QUECHUA, TT_NAME_MAC_LANGID_GUARANI, TT_NAME_MAC_LANGID_AYMARA, TT_NAME_MAC_LANGID_TATAR, @@ -605,6 +605,39 @@ static const char name_mac_langid_to_locale[][10] = { "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "cy-GB", "eu-ES", "ca-ES",

1 0

Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 31fa3bbe96f746706ca065496b8777f1a89d735b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fa3bbe96f746706ca065496… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:12:43 2016 +0100 ntdll: Don't call NtOpenKeyEx directly from NtOpenKey. Needed by Office 2013. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f005dc43cf76d09c9646969db1fa16639a1d960) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/reg.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 83749c4..788f1a7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -120,11 +120,7 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC return NtCreateKey(retkey, access, attr, 0, NULL, 0, dispos); } -/****************************************************************************** - * NtOpenKeyEx [NTDLL.@] - * ZwOpenKeyEx [NTDLL.@] - */ -NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +static NTSTATUS open_key( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; DWORD len; @@ -154,6 +150,15 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } /****************************************************************************** + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] + */ +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +{ + return open_key( retkey, access, attr, options ); +} + +/****************************************************************************** * NtOpenKey [NTDLL.@] * ZwOpenKey [NTDLL.@] * @@ -163,7 +168,7 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT */ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - return NtOpenKeyEx( retkey, access, attr, 0 ); + return open_key( retkey, access, attr, 0 ); } NTSTATUS WINAPI NtOpenKeyTransactedEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,

1 0

Aric Stewart : winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: cab336873547aa5dfe3276abc81097f23d537562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab336873547aa5dfe3276abc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 2 11:27:52 2016 -0600 winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED. This is a fix for broken applications that do not bother to check the flags to see if JOY_RETURNPOV is set and instead blindly read dwPOV. The previous value of 0 resulted in the POV appearing to be constantly in the UP position. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae2ead16ce3dfe9d906390a092ebda9d1a3d3354) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index da45450..72552d0 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -715,7 +715,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) } else { - info->dwPOV = 0; + info->dwPOV = JOY_POVCENTERED; info->dwFlags &= ~JOY_RETURNPOV; } }

1 0

André Hentschel : ntdll: Set TPIDRURW also on ARMv8-A.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 56648c55cb0182ea72a111dc0e4a2e9fa2803eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56648c55cb0182ea72a111dc0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 25 21:29:26 2016 +0100 ntdll: Set TPIDRURW also on ARMv8-A. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b363f386cda116901db126be3f4688c4cc5c481c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1f6da96..5ee9f45 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -926,7 +926,7 @@ void signal_init_thread( TEB *teb ) init_done = TRUE; } -#ifdef __ARM_ARCH_7A__ +#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); #endif

1 0

Michael Müller : kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 7121526c1273da06ea3c20246abe32334b39817e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7121526c1273da06ea3c20246… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 16 06:53:14 2016 +0100 kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8eb893f185414278dc45b238349c2e87a73381c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 03ef38c..4bfc6cc 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -235,7 +235,13 @@ BOOL WINAPI VirtualProtect( LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD ol BOOL WINAPI VirtualProtectEx( HANDLE process, LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD old_prot ) { - NTSTATUS status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); + NTSTATUS status; + DWORD prot; + + /* Win9x allows to pass NULL as old_prot while it fails on NT */ + if (!old_prot && (GetVersion() & 0x80000000)) old_prot = &prot; + + status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

Sebastian Lackner : kernel32: Forward InterlockedPushListSList[Ex] to ntdll.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: f61c9e310bc862ce83557b0f4993776f41a0bb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61c9e310bc862ce83557b0f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:54:55 2016 +0100 kernel32: Forward InterlockedPushListSList[Ex] to ntdll. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49051392d79b1e0e0760f1649a47a1d70dcc11d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-interlocked-l1-1-0.spec | 2 +- .../api-ms-win-core-interlocked-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec index 9c6d25c..8b2d3ac 100644 --- a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec index f1fbd94..c3e2d0c 100644 --- a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSListEx +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) kernel32.InterlockedPushListSListEx @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ff67e54..80a4e79 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -957,7 +957,8 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -# @ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) ntdll.RtlInterlockedPushListSListEx @ stub InvalidateConsoleDIBits @ stdcall InvalidateNLSCache() @ stdcall IsBadCodePtr(ptr)

1 0

Paul Gofman : d3dx9: Fix D3DXIntersectTri function.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: b3eb4fea718e2a5f6723878d39bde8cf5b569bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3eb4fea718e2a5f6723878d3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 11 15:35:32 2016 +0300 d3dx9: Fix D3DXIntersectTri function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fda55a3fdfdfc41b4a1ea35a9f69fcf630001b33) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 7 +++++-- dlls/d3dx9_36/tests/mesh.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 606a088..bb88253 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2380,12 +2380,15 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXMATRIX m; D3DXVECTOR4 vec; + TRACE("p0 %p, p1 %p, p2 %p, praypos %p, praydir %p, pu %p, pv %p, pdist %p.\n", + p0, p1, p2, praypos, praydir, pu, pv, pdist); + m.u.m[0][0] = p1->x - p0->x; m.u.m[1][0] = p2->x - p0->x; m.u.m[2][0] = -praydir->x; m.u.m[3][0] = 0.0f; - m.u.m[0][1] = p1->y - p0->z; - m.u.m[1][1] = p2->y - p0->z; + m.u.m[0][1] = p1->y - p0->y; + m.u.m[1][1] = p2->y - p0->y; m.u.m[2][1] = -praydir->y; m.u.m[3][1] = 0.0f; m.u.m[0][2] = p1->z - p0->z; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 588654d..0181168 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1103,14 +1103,39 @@ static void D3DXIntersectTriTest(void) exp_res = TRUE; exp_u = 0.5f; exp_v = 0.25f; exp_dist = 8.0f; - got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); - ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); - ok( compare(exp_u,got_u), "Expected u = %f, got %f\n",exp_u,got_u); - ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); - ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); - ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = 0.0f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = 0.0f; + + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = -0.5f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = -1.0f; + exp_u = 0.375f; + exp_v = 0.5625f; + exp_dist = 7.9375f; + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + /*Only positive ray is taken in account*/

1 0

Hugh McMaster : reg: Remove stub output from the 'add' and 'delete' functions.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 5a5390aa9b8ee97ca4e2175600f2746fbd22ce9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5390aa9b8ee97ca4e217560… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 5 19:08:30 2016 +1100 reg: Remove stub output from the 'add' and 'delete' functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcd05e8e863dd47de9b7cf7745b62260a7d3af42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/reg/reg.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 00eaab0..e7729a3 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -263,13 +263,9 @@ static BOOL sane_path(const WCHAR *key) static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', - ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; LPWSTR p; HKEY root,subkey; - reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); - if (!sane_path(key_name)) return 1; @@ -335,11 +331,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, LPWSTR p; HKEY root,subkey; - static const WCHAR stubW[] = {'D','E','L','E','T','E', - ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' - ,0}; - reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); - if (!sane_path(key_name)) return 1;

1 0

André Hentschel : winemaker: Markup fixes in German translation.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 85d6104ce30ea93de9bd17fe4a137bc61888d195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6104ce30ea93de9bd17fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 21:51:10 2016 +0100 winemaker: Markup fixes in German translation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 154d024f8db9017ddf9ca28f0022554ac919eb5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 83 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85d6104ce30ea93de9bd1…

1 0