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

Nikolay Sivov : include: Fix IsBad* prototypes.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: dbab6979a9fad2df502f69205727b79965188660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbab6979a9fad2df502f69205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 11:53:31 2016 +0300 include: Fix IsBad* prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd220569ddd1a43ade05a04d76f372ee6937e97e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 16 ++++++++-------- include/winbase.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 4bfc6cc..cce707b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -647,7 +647,7 @@ UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; @@ -655,7 +655,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { volatile const char *p = ptr; char dummy __attribute__((unused)); - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -689,14 +689,14 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; __TRY { volatile char *p = ptr; - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -730,7 +730,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT_PTR size ) { return IsBadReadPtr( ptr, size ); } @@ -749,7 +749,7 @@ BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT_PTR size ) { return IsBadWritePtr( ptr, size ); } @@ -786,7 +786,7 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr ) * Success: TRUE. * Failure: FALSE. Read access to all bytes in string. */ -BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) { if (!str) return TRUE; @@ -810,7 +810,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) * * See IsBadStringPtrA. */ -BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) { if (!str) return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 09b11e9..5c6f8ac 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2236,13 +2236,13 @@ WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); -WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); +WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT_PTR); #define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr) -WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT);

1 0

Aric Stewart : winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED.
by Alexandre Julliard 12 Apr '16

12 Apr '16

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

Miklós Máté : wined3d: Warn only once about unsupported wrap state.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 73909356d76d72d09472a6bacb17f1e4b62be07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73909356d76d72d09472a6bac… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Mon Mar 14 13:40:57 2016 +0100 wined3d: Warn only once about unsupported wrap state. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e29aaca0185c71461ebd708c542a0e1afdef7201) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91d6417..eab21d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1571,7 +1571,9 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3D_RS_WRAP0] + static unsigned int once; + + if ((state->render_states[WINED3D_RS_WRAP0] || state->render_states[WINED3D_RS_WRAP1] || state->render_states[WINED3D_RS_WRAP2] || state->render_states[WINED3D_RS_WRAP3] @@ -1587,6 +1589,7 @@ static void state_wrap(struct wined3d_context *context, const struct wined3d_sta || state->render_states[WINED3D_RS_WRAP13] || state->render_states[WINED3D_RS_WRAP14] || state->render_states[WINED3D_RS_WRAP15]) + && !once++) FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); }

1 0

Paul Gofman : d3dx9: Fix D3DXIntersectTri function.
by Alexandre Julliard 12 Apr '16

12 Apr '16

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

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

12 Apr '16

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

Matteo Bruni : wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 160a063c47731e6f88cccbef2c456875bdc6fa9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=160a063c47731e6f88cccbef2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:29 2016 +0100 wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a25c47f59a600d7da819869b643b0b17720c07c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b4209a..76fc04a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4426,7 +4426,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (quality_levels) { if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - *quality_levels = gl_info->limits.samples; + *quality_levels = wined3d_log2i(gl_info->limits.samples); else *quality_levels = 1; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 072c0ee..201a0c4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2887,7 +2887,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA), * but it does not have an equivalent OpenGL extension. */ if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - samples = surface->resource.multisample_quality; + samples = 1u << (surface->resource.multisample_quality + 1); else samples = surface->resource.multisample_type;

1 0

Józef Kucia : wined3d: Validate render state in wined3d_device_set_render_state().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: bcde1d70adba23b1c3b921a7b75b2deb9592258a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcde1d70adba23b1c3b921a7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 28 00:17:46 2016 +0100 wined3d: Validate render state in wined3d_device_set_render_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99fbc04bfe13bf2471725f88000892f8fee9f526) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 057ae18..7753e76 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1982,10 +1982,17 @@ static void resolve_depth_buffer(struct wined3d_state *state) void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { - DWORD old_value = device->state.render_states[state]; + DWORD old_value; TRACE("device %p, state %s (%#x), value %#x.\n", device, debug_d3drenderstate(state), state, value); + if (state > WINEHIGHEST_RENDER_STATE) + { + WARN("Unhandled render state %#x.\n", state); + return; + } + + old_value = device->state.render_states[state]; device->update_state->render_states[state] = value; /* Handle recording of state blocks. */

1 0

Jacek Caban : ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: cec6924b2f0398aeca30413dde07778e6182ff01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec6924b2f0398aeca30413dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:11:07 2016 +0100 ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. This is needed by Office 2013, which hooks those functions and expects flag to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 443c2a4719cd366a254eaa387417c357935b5634) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/path.c | 2 +- dlls/ntdll/reg.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 715a760..4aa1a72 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2449,7 +2449,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) @@ -2790,7 +2790,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 23ebf48..8a972c8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3357,7 +3357,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &dirW ); if (status != STATUS_SUCCESS) goto done; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 74feb97..cb9a4e2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2149,7 +2149,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -2184,7 +2184,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index feaac9e..ae0646a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index be95a2a..83749c4 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -660,7 +660,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile(&hive, GENERIC_READ, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, + ret = NtCreateFile(&hive, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, 0, NULL, 0); if (ret) return ret;

1 0

Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
by Alexandre Julliard 12 Apr '16

12 Apr '16

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

Sebastian Lackner : vcomp/tests: Reenable architecture dependent tests.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: af6f9a3c5458e290fd2b732864e131350dc4e154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6f9a3c5458e290fd2b73286… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:46:45 2016 +0100 vcomp/tests: Reenable architecture dependent tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a77e14714e495ecc63654374d53585a227b4c67f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4f030d3..914b55f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, +#endif }; struct { @@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, +#endif }; int i;

1 0