June 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Avoid overdriving single-buffered GL if possible; the system throttles us.
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: 3c7bc8202c3fbf63b36572b9ac97f980d25152ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7bc8202c3fbf63b36572b9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 21 03:34:03 2013 -0500 winemac: Avoid overdriving single-buffered GL if possible; the system throttles us. Use glFlushRenderAPPLE(), if available, instead of glFlush() calls less than 1/60th of a second since the last. --- dlls/winemac.drv/opengl.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 931b9ee..904158b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -66,6 +66,7 @@ struct wgl_context struct wgl_pbuffer *read_pbuffer; BOOL has_been_current; BOOL sharing; + DWORD last_flush_time; }; @@ -101,6 +102,8 @@ static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; static void (*pglCopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); static void (*pglCopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +static void (*pglFlush)(void); +static void (*pglFlushRenderAPPLE)(void); static void (*pglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); static void (*pglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); @@ -1490,6 +1493,28 @@ static void macdrv_glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, } +static void macdrv_glFlush(void) +{ + struct wgl_context *context = NtCurrentTeb()->glContext; + const pixel_format *pf = &pixel_formats[context->format - 1]; + DWORD now = GetTickCount(); + + TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, + context->last_flush_time, now); + if (pglFlushRenderAPPLE && !pf->double_buffer && (now - context->last_flush_time) < 17) + { + TRACE("calling glFlushRenderAPPLE()\n"); + pglFlushRenderAPPLE(); + } + else + { + TRACE("calling glFlush()\n"); + pglFlush(); + context->last_flush_time = now; + } +} + + /********************************************************************** * macdrv_glReadPixels * @@ -3024,6 +3049,7 @@ static BOOL init_opengl(void) #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) REDIRECT(glCopyPixels); + REDIRECT(glFlush); REDIRECT(glReadPixels); REDIRECT(glViewport); #undef REDIRECT @@ -3037,6 +3063,9 @@ static BOOL init_opengl(void) if (!init_gl_info()) goto failed; + if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) + pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0); + load_extensions(); if (!init_pixel_formats()) goto failed;

1 0

Marcus Meissner : wbemprox: Fixed leaking dirstack (Coverity).
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: 7bf97430418dda0c84928fe624e116fab016c5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf97430418dda0c84928fe62… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 20 22:44:00 2013 +0200 wbemprox: Fixed leaking dirstack (Coverity). --- dlls/wbemprox/builtin.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3cf47f8..9e2369a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1273,11 +1273,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; - struct dirstack *dirstack = alloc_dirstack(2); + struct dirstack *dirstack; enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; + dirstack = alloc_dirstack(2); + for (i = 0; i < sizeof(drives); i++) { if (!(drives & (1 << i))) continue;

1 0

Hans Leidekker : wintrust/tests: Replace the self-signed certificate with one that expires in ten years.
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: e1b4334f893f804c5d948f0461ef2f3573409bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b4334f893f804c5d948f046… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 21 15:21:04 2013 +0200 wintrust/tests: Replace the self-signed certificate with one that expires in ten years. --- dlls/wintrust/tests/softpub.c | 135 ++++++++++++++++++++++++++++++++++------- 1 files changed, 112 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1b4334f893f804c5d948…

1 0

Piotr Caban : msvcrt: Don' t call invalid parameter handler when string to be tokenized and context are not set in mbstok .
by Alexandre Julliard June 21, 2013

June 21, 2013

Module: wine Branch: master Commit: 779c1f8049879f67077cd64be42b3f8c097a3a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779c1f8049879f67077cd64be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 21 12:17:33 2013 +0200 msvcrt: Don't call invalid parameter handler when string to be tokenized and context are not set in mbstok. --- dlls/msvcr100/msvcr100.c | 6 ++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 7 ++++++- include/msvcrt/mbstring.h | 1 + 9 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index d425455..28d4d6e 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -25,6 +25,7 @@ #include "stdlib.h" #include "errno.h" #include "malloc.h" +#include "mbstring.h" #include "limits.h" #include "sys/stat.h" #include "windef.h" @@ -489,6 +490,11 @@ int CDECL MSVCR100_atoi(const char *str) return _atoi_l(str, NULL); } +unsigned char* CDECL MSVCR100__mbstok(unsigned char *str, const unsigned char *delim) +{ + return _mbstok_l(str, delim, NULL); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 63a0caa..8e728c1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1182,7 +1182,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) MSVCR100__mbstok @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e82f100..7b43159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1544,7 +1544,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 1a33fbb..dc6dc03 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -468,7 +468,7 @@ @ cdecl _mbsspn(str str) msvcrt._mbsspn @ cdecl _mbsspnp(str str) msvcrt._mbsspnp @ cdecl _mbsstr(str str) msvcrt._mbsstr -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ cdecl _mbsupr(str) msvcrt._mbsupr @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index afdab05..3e3cf6f 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -463,7 +463,7 @@ @ cdecl _mbsspn(str str) msvcrt._mbsspn @ cdecl _mbsspnp(str str) msvcrt._mbsspnp @ cdecl _mbsstr(str str) msvcrt._mbsstr -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ cdecl _mbsupr(str) msvcrt._mbsupr @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 521a69d..2344f0f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -853,7 +853,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd71ef4..e31da91 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -831,7 +831,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l -@ cdecl _mbstok(str str) msvcrt._mbstok +@ cdecl _mbstok(str str) msvcr100._mbstok #don't forward to msvcrt @ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l @ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s @ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b70ffa0..b25649b6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1149,7 +1149,12 @@ unsigned char* CDECL _mbstok_l(unsigned char *str, */ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) { - return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, NULL); + thread_data_t *data = msvcrt_get_thread_data(); + + if(!str && !data->mbstok_next) + return NULL; + + return _mbstok_s_l(str, delim, &data->mbstok_next, NULL); } /********************************************************************* diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index a4d0746..7a40f7b 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -102,6 +102,7 @@ size_t __cdecl _mbsspn(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsspnp(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); +unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); unsigned char* __cdecl _mbsupr(unsigned char*); #ifndef _MBLEADTRAIL_DEFINED

1 0

Stefan Dösinger : ddraw/tests: Get rid of D3DRENDERSTATE_LIGHTING hacks in ddraw4.c.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: cf1e6a487a9a7250698d5496b067bd1bcfce3335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1e6a487a9a7250698d5496b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:04 2013 +0200 ddraw/tests: Get rid of D3DRENDERSTATE_LIGHTING hacks in ddraw4.c. --- dlls/ddraw/tests/ddraw4.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c31bc62..45c399b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1127,8 +1127,6 @@ static void test_depth_blit(void) ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); - hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); U1(d3drect).x1 = U2(d3drect).y1 = 0; U3(d3drect).x2 = ddsd_existing.dwWidth; U4(d3drect).y2 = ddsd_existing.dwHeight; @@ -3243,8 +3241,6 @@ static void test_draw_strided(void) hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); - hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice3_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Test lighting control in different interface versions.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 4b93cf707d44940f99b94d781c66f608f423feb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b93cf707d44940f99b94d781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:03 2013 +0200 ddraw/tests: Test lighting control in different interface versions. --- dlls/ddraw/tests/ddraw2.c | 162 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 236 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 222 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 620 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b93cf707d44940f99b94…

1 0

Stefan Dösinger : ddraw: Device2 and Device3 do not have a lighting render state.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: c1663c55830f77d9648d8d06e936aaf6007bc6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1663c55830f77d9648d8d06e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:02 2013 +0200 ddraw: Device2 and Device3 do not have a lighting render state. --- dlls/ddraw/device.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 15 ++------------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b9058b0..09880dd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1998-2004 Lionel Ulmer * Copyright (c) 2002-2005 Christian Costa - * Copyright (c) 2006-2009, 2011-2012 Stefan Dösinger + * Copyright (c) 2006-2009, 2011-2013 Stefan Dösinger * Copyright (c) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or @@ -2445,6 +2445,10 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, return D3D_OK; } + case D3DRENDERSTATE_LIGHTING: + *value = 0xffffffff; + return D3D_OK; + default: return IDirect3DDevice7_GetRenderState(&device->IDirect3DDevice7_iface, state, value); } @@ -2800,6 +2804,10 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, break; } + case D3DRENDERSTATE_LIGHTING: + hr = D3D_OK; + break; + default: hr = IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, state, value); break; @@ -3475,6 +3483,22 @@ static HRESULT WINAPI d3d_device7_DrawPrimitive_FPUPreserve(IDirect3DDevice7 *if return hr; } +static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD flags) +{ + BOOL enable; + + /* Ignore the D3DFVF_XYZRHW case here, wined3d takes care of that */ + if (flags & D3DDP_DONOTLIGHT) + enable = FALSE; + else if (!(fvf & D3DFVF_NORMAL)) + enable = FALSE; + else + enable = TRUE; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); +} + + static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface, D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count, DWORD flags) @@ -3484,6 +3508,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface, TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, flags); + setup_lighting(device, fvf, flags); + return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, primitive_type, fvf, vertices, vertex_count, flags); } @@ -3666,6 +3692,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitive(IDirect3DDevice3 *iface, "indices %p, index_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); + setup_lighting(device, fvf, flags); + return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); } @@ -3972,6 +4000,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface, TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); + setup_lighting(device, VertexType, Flags); + return IDirect3DDevice7_DrawPrimitiveStrided(&device->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); } @@ -4097,6 +4127,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 * TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + setup_lighting(device, VertexType, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveStrided(&device->IDirect3DDevice7_iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); } @@ -4189,6 +4221,8 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPR TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); + setup_lighting(device, vb->fvf, Flags); + return IDirect3DDevice7_DrawPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, StartVertex, NumVertices, Flags); } @@ -4320,6 +4354,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); + setup_lighting(device, vb->fvf, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 80a2b27..178900f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -902,13 +902,6 @@ static void test_depth_blit(void) {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, }; - static const BOOL todo[4][4] = - { - {FALSE, FALSE, TRUE, TRUE}, - {FALSE, FALSE, TRUE, TRUE}, - {TRUE, TRUE, TRUE, TRUE}, - {TRUE, TRUE, TRUE, TRUE}, - }; DDSURFACEDESC ddsd_new, ddsd_existing; IDirect3DDevice2 *device; @@ -1056,12 +1049,8 @@ static void test_depth_blit(void) unsigned int x = 80 * ((2 * j) + 1); unsigned int y = 60 * ((2 * i) + 1); color = get_surface_color(rt, x, y); - if (todo[i][j]) - todo_wine ok(compare_color(color, expected_colors[i][j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); - else - ok(compare_color(color, expected_colors[i][j], 1), - "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); } } IDirectDrawSurface_Release(rt);

1 0

Stefan Dösinger : ddraw: Send device2_Draw* through device3_Draw*.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 669611b4bea5e4d03f883095c89d80c194ca4556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669611b4bea5e4d03f883095c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:01 2013 +0200 ddraw: Send device2_Draw* through device3_Draw*. --- dlls/ddraw/device.c | 78 +++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7235949..b9058b0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2190,43 +2190,6 @@ static HRESULT WINAPI d3d_device2_Index(IDirect3DDevice2 *iface, WORD index) } /***************************************************************************** - * IDirect3DDevice3::End - * - * Ends a draw begun with IDirect3DDevice3::Begin or - * IDirect3DDevice::BeginIndexed. The vertices specified with - * IDirect3DDevice::Vertex or IDirect3DDevice::Index are drawn using - * the IDirect3DDevice7::DrawPrimitive method. So far only - * non-indexed mode is supported - * - * Version 2 and 3 - * - * Params: - * Flags: Some flags, as usual. Don't know which are defined - * - * Returns: - * The return value of IDirect3DDevice7::DrawPrimitive - * - *****************************************************************************/ -static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags) -{ - struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - - TRACE("iface %p, flags %#x.\n", iface, flags); - - return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, device->primitive_type, - device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags); -} - -static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags) -{ - struct d3d_device *device = impl_from_IDirect3DDevice2(iface); - - TRACE("iface %p, flags %#x.\n", iface, flags); - - return d3d_device3_End(&device->IDirect3DDevice3_iface, flags); -} - -/***************************************************************************** * IDirect3DDevice7::GetRenderState * * Returns the value of a render state. The possible render states are @@ -3545,7 +3508,7 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface, return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, + return d3d_device3_DrawPrimitive(&device->IDirect3DDevice3_iface, primitive_type, fvf, vertices, vertex_count, flags); } @@ -3728,11 +3691,48 @@ static HRESULT WINAPI d3d_device2_DrawIndexedPrimitive(IDirect3DDevice2 *iface, return DDERR_INVALIDPARAMS; /* Should never happen */ } - return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, + return d3d_device3_DrawIndexedPrimitive(&device->IDirect3DDevice3_iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); } /***************************************************************************** + * IDirect3DDevice3::End + * + * Ends a draw begun with IDirect3DDevice3::Begin or + * IDirect3DDevice::BeginIndexed. The vertices specified with + * IDirect3DDevice::Vertex or IDirect3DDevice::Index are drawn using + * the IDirect3DDevice3::DrawPrimitive method. So far only + * non-indexed mode is supported + * + * Version 2 and 3 + * + * Params: + * Flags: Some flags, as usual. Don't know which are defined + * + * Returns: + * The return value of IDirect3DDevice3::DrawPrimitive + * + *****************************************************************************/ +static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags) +{ + struct d3d_device *device = impl_from_IDirect3DDevice3(iface); + + TRACE("iface %p, flags %#x.\n", iface, flags); + + return d3d_device3_DrawPrimitive(&device->IDirect3DDevice3_iface, device->primitive_type, + device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags); +} + +static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags) +{ + struct d3d_device *device = impl_from_IDirect3DDevice2(iface); + + TRACE("iface %p, flags %#x.\n", iface, flags); + + return d3d_device3_End(&device->IDirect3DDevice3_iface, flags); +} + +/***************************************************************************** * IDirect3DDevice7::SetClipStatus * * Sets the clip status. This defines things as clipping conditions and

1 0

Stefan Dösinger : ddraw: SPECULARENABLE defaults to true in IDirect3DDevice2.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 05de3f8cee3758f87f66e1963d8d6a009e68e2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05de3f8cee3758f87f66e1963… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:00 2013 +0200 ddraw: SPECULARENABLE defaults to true in IDirect3DDevice2. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8e86f55..7235949 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6728,6 +6728,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); + else if (version == 2) + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); return D3D_OK; }

1 0

Matteo Bruni : wined3d: Fix NP2 surface repacking in surface_download_data.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 5649746b60af65248177309e1c998dff1aa9aef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5649746b60af65248177309e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:24 2013 +0200 wined3d: Fix NP2 surface repacking in surface_download_data. --- dlls/wined3d/surface.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a325ac0..83ff41f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2246,12 +2246,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data = mem; dst_data = surface->resource.allocatedMemory; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); - for (y = 1; y < surface->resource.height; ++y) + for (y = 0; y < surface->resource.height; ++y) { - /* skip the first row */ + memcpy(dst_data, src_data, dst_pitch); src_data += src_pitch; dst_data += dst_pitch; - memcpy(dst_data, src_data, dst_pitch); } HeapFree(GetProcessHeap(), 0, mem);

1 0