December 2013 - Wine-Commits

Rico Schüller : Fix German release date for wine 1.7.7
by Jeremy Newman Dec. 2, 2013

Dec. 2, 2013

Module: website Branch: master Commit: 04359649624316bbae5d8e75c0c0f794f58d003b URL: http://source.winehq.org/git/website.git/?a=commit;h=04359649624316bbae5d8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 2 16:21:21 2013 -0600 Fix German release date for wine 1.7.7 --- news/de/2013112201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2013112201.xml b/news/de/2013112201.xml index 8346641..9c94321 100644 --- a/news/de/2013112201.xml +++ b/news/de/2013112201.xml @@ -1,5 +1,5 @@ <news> -<date>2. November 2013</date> +<date>22. November 2013</date> <title>Wine 1.7.7 freigegeben</title> <body> <p> Die Entwicklungsversion 1.7.7 von Wine ist jetzt verfügbar.</p>

1 0

Francois Gouget : winecfg: Tweak the wording of the drives configuration.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

1 0

Stefan Dösinger : wined3d: Don' t pass the pitch to read_from_framebuffer.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 6f865d3ea5b4db6930962b4ad56ebb88a2847e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f865d3ea5b4db6930962b4ad… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 29 12:59:15 2013 +0100 wined3d: Don't pass the pitch to read_from_framebuffer. --- dlls/wined3d/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0cdcbba..5ff3b0d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3438,7 +3438,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined } /* Read the framebuffer back into the surface */ -static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) +static void read_from_framebuffer(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; @@ -3451,6 +3451,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) BOOL bpp; BOOL srcIsUpsideDown; struct wined3d_bo_address data; + UINT pitch = wined3d_surface_get_pitch(surface); surface_get_memory(surface, &data); @@ -5020,7 +5021,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, if (surface->flags & SFLAG_INDRAWABLE) { - read_from_framebuffer(surface, wined3d_surface_get_pitch(surface)); + read_from_framebuffer(surface); return; }

1 0

Stefan Dösinger : wined3d: Remove redundant state restoration from read_from_framebuffer.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: e8c774e486c48ebadb05ff52acbd95769120d004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c774e486c48ebadb05ff52a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 29 12:59:14 2013 +0100 wined3d: Remove redundant state restoration from read_from_framebuffer. --- dlls/wined3d/surface.c | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f07c28d..0cdcbba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3450,9 +3450,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) int i; BOOL bpp; BOOL srcIsUpsideDown; - GLint rowLen = 0; - GLint skipPix = 0; - GLint skipRow = 0; struct wined3d_bo_address data; surface_get_memory(surface, &data); @@ -3535,21 +3532,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) ERR("mem not null for pbo -- unexpected\n"); } - /* Save old pixel store pack state */ - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_ROW_LENGTH, &rowLen); - checkGLcall("glGetIntegerv"); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_SKIP_PIXELS, &skipPix); - checkGLcall("glGetIntegerv"); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PACK_SKIP_ROWS, &skipRow); - checkGLcall("glGetIntegerv"); - /* Setup pixel store pack state -- to glReadPixels into the correct place */ gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, surface->resource.width); checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_PIXELS, 0); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, 0); - checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, @@ -3557,11 +3542,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, rowLen); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_PIXELS, skipPix); - checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, skipRow); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, 0); checkGLcall("glPixelStorei"); if (data.buffer_object && !srcIsUpsideDown)

1 0

Stefan Dösinger : wined3d: Use surface_get_memory in read_from_framebuffer.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 6907faf8050ecfa2f2a163d52c25abca95c80bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6907faf8050ecfa2f2a163d52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 29 12:59:13 2013 +0100 wined3d: Use surface_get_memory in read_from_framebuffer. --- dlls/wined3d/surface.c | 54 ++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 76f907d..f07c28d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3438,7 +3438,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined } /* Read the framebuffer back into the surface */ -static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, UINT pitch) +static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; @@ -3453,6 +3453,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U GLint rowLen = 0; GLint skipPix = 0; GLint skipRow = 0; + struct wined3d_bo_address data; + + surface_get_memory(surface, &data); context = context_acquire(device, surface); context_apply_blit_state(context, device); @@ -3489,7 +3492,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U /* In case of P8 render targets the index is stored in the alpha component */ fmt = GL_ALPHA; type = GL_UNSIGNED_BYTE; - mem = dest; + mem = data.addr; bpp = surface->resource.format->byte_count; } else @@ -3518,21 +3521,18 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U break; default: - mem = dest; + mem = data.addr; fmt = surface->resource.format->glFormat; type = surface->resource.format->glType; bpp = surface->resource.format->byte_count; } - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); if (mem) - { ERR("mem not null for pbo -- unexpected\n"); - mem = NULL; - } } /* Save old pixel store pack state */ @@ -3564,23 +3564,14 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, skipRow); checkGLcall("glPixelStorei"); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object && !srcIsUpsideDown) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - /* Check if we need to flip the image. If we need to flip use glMapBufferARB * to get a pointer to it and perform the flipping in software. This is a lot * faster than calling glReadPixels for each line. In case we want more speed * we should rerender it flipped in a FBO and read the data back from the FBO. */ - if (!srcIsUpsideDown) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); - - mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); - } + mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)"); } /* TODO: Merge this with the palettization loop below for P8 targets */ @@ -3611,15 +3602,19 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U bottom -= pitch; } HeapFree(GetProcessHeap(), 0, row); + } - /* Unmap the temp PBO buffer */ - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - } + if (data.buffer_object) + { + if (!srcIsUpsideDown) + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB)); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)"); } + context_release(context); + /* For P8 textures we need to perform an inverse palette lookup. This is * done by searching for a palette index which matches the RGB value. * Note this isn't guaranteed to work when there are multiple entries for @@ -3657,7 +3652,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U && *green == pal[c].peGreen && *blue == pal[c].peBlue) { - *((BYTE *) dest + y * width + x) = c; + *((BYTE *)data.addr + y * width + x) = c; break; } } @@ -3665,8 +3660,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U } HeapFree(GetProcessHeap(), 0, mem); } - - context_release(context); } /* Read the framebuffer contents into a texture. Note that this function @@ -5046,8 +5039,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, if (surface->flags & SFLAG_INDRAWABLE) { - read_from_framebuffer(surface, surface->resource.allocatedMemory, - wined3d_surface_get_pitch(surface)); + read_from_framebuffer(surface, wined3d_surface_get_pitch(surface)); return; }

1 0

Stefan Dösinger : wined3d: Add a function to retrieve surface data.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: ae3788dcba039feb3f3bebfa48cee972d8409779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3788dcba039feb3f3bebfa4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 29 12:59:12 2013 +0100 wined3d: Add a function to retrieve surface data. --- dlls/wined3d/surface.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ccf6249..76f907d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1934,6 +1934,20 @@ static BOOL surface_check_block_align(struct wined3d_surface *surface, const REC return FALSE; } +static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) +{ + if (surface->flags & SFLAG_PBO) + { + data->addr = NULL; + data->buffer_object = surface->pbo; + } + else + { + data->addr = surface->resource.allocatedMemory; + data->buffer_object = 0; + } +} + HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { @@ -2033,8 +2047,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P surface_load_location(dst_surface, SFLAG_INTEXTURE); wined3d_texture_bind(dst_surface->container, context, FALSE); - data.buffer_object = src_surface->pbo; - data.addr = src_surface->resource.allocatedMemory; + surface_get_memory(src_surface, &data); src_pitch = wined3d_surface_get_pitch(src_surface); surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, &data); @@ -5072,7 +5085,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_bo_address data; struct wined3d_format format; POINT dst_point = {0, 0}; - BYTE *mem; + BYTE *mem = NULL; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && surface_is_offscreen(surface) @@ -5171,6 +5184,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_remove_pbo(surface, gl_info); } + surface_get_memory(surface, &data); if (format.convert) { /* This code is entered for texture formats which need a fixup. */ @@ -5186,12 +5200,13 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context_release(context); return E_OUTOFMEMORY; } - format.convert(surface->resource.allocatedMemory, mem, src_pitch, src_pitch * height, + format.convert(data.addr, mem, src_pitch, src_pitch * height, dst_pitch, dst_pitch * height, width, height, 1); format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; + data.addr = mem; } - else if (convert != WINED3D_CT_NONE && surface->resource.allocatedMemory) + else if (convert != WINED3D_CT_NONE) { /* This code is only entered for color keying fixups */ UINT height = surface->resource.height; @@ -5206,25 +5221,18 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context_release(context); return E_OUTOFMEMORY; } - d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch, + d3dfmt_convert_surface(data.addr, mem, src_pitch, width, height, dst_pitch, convert, surface); format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; - } - else - { - mem = surface->resource.allocatedMemory; + data.addr = mem; } - data.buffer_object = surface->pbo; - data.addr = mem; surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data); context_release(context); - /* Don't delete PBO memory. */ - if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO)) - HeapFree(GetProcessHeap(), 0, mem); + HeapFree(GetProcessHeap(), 0, mem); return WINED3D_OK; }

1 0

Henri Verbeet : ddraw/tests: Unify the skip messages a bit.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 019143a6a9774927b2e209fb8b1d8940f5ffc74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=019143a6a9774927b2e209fb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:38 2013 +0100 ddraw/tests: Unify the skip messages a bit. --- dlls/ddraw/tests/ddraw1.c | 52 +++++++++++++++++++------------------- dlls/ddraw/tests/ddraw2.c | 61 ++++++++++++++++++++++----------------------- dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++----------------- dlls/ddraw/tests/ddraw7.c | 51 ++++++++++++++++++------------------- 4 files changed, 104 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=019143a6a9774927b2e20…

1 0

Henri Verbeet : ddraw/tests: Add some missing DestroyWindow() calls.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: a86aba4bc09f686d80a05576c895904951054c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86aba4bc09f686d80a05576c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:37 2013 +0100 ddraw/tests: Add some missing DestroyWindow() calls. --- dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 2 ++ 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3ac74aa..b6c99a7 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3373,6 +3373,7 @@ static void test_lighting_interface_versions(void) IDirect3D2_Release(d3d); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); } static struct diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 2ecbc0e..a96877a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3654,6 +3654,7 @@ static void test_lighting_interface_versions(void) ok(ref == 0, "Device not properly released, refcount %u.\n", ref); ref = IDirect3D3_Release(d3d); ok(ref == 0, "D3d not properly released, refcount %u.\n", ref); + DestroyWindow(window); } static struct diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 11cb802..6ab6bba 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1260,6 +1260,7 @@ static void test_texture_load_ckey(void) IDirectDrawSurface7_Release(src); IDirectDraw7_Release(ddraw); IDirect3DDevice7_Release(device); + DestroyWindow(window); } static void test_zenable(void) @@ -3467,6 +3468,7 @@ static void test_lighting_interface_versions(void) IDirectDrawSurface7_Release(rt); ref = IDirect3DDevice7_Release(device); ok(ref == 0, "Device not properly released, refcount %u.\n", ref); + DestroyWindow(window); } static struct

1 0

Frédéric Delanoy : mshtml: Avoid memory leaks ( Coverity).
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 60a592b77a2f0c5339a68cfc3d0da3105b1c81c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a592b77a2f0c5339a68cfc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 30 20:17:31 2013 +0100 mshtml: Avoid memory leaks (Coverity). --- dlls/mshtml/htmlbody.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fcd8766..6c2bb7a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -635,7 +635,7 @@ static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - const WCHAR *ret; + const WCHAR *ret = NULL; BSTR overflow; HRESULT hres; @@ -648,7 +648,7 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * if(!overflow || !*overflow) { *p = NULL; - return S_OK; + hres = S_OK; }else if(!strcmpW(overflow, visibleW) || !strcmpW(overflow, autoW)) { ret = autoW; }else if(!strcmpW(overflow, scrollW)) { @@ -658,11 +658,16 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * }else { TRACE("Defaulting %s to NULL\n", debugstr_w(overflow)); *p = NULL; - return S_OK; + hres = S_OK; } - *p = SysAllocString(ret); - return *p ? S_OK : E_OUTOFMEMORY; + SysFreeString(overflow); + if(ret) { + *p = SysAllocString(ret); + hres = *p ? S_OK : E_OUTOFMEMORY; + } + + return hres; } static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v)

1 0

Henri Verbeet : ddraw: Get rid of the DDSCAPS_BACKBUFFER validation in ddraw_surface_create().
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 8a9fdb567ed5a2a76cef0e7ba47d3e9bfa04f9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9fdb567ed5a2a76cef0e7ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:36 2013 +0100 ddraw: Get rid of the DDSCAPS_BACKBUFFER validation in ddraw_surface_create(). All callers except ddraw1_CreateSurface() already have a stricter check themselves. --- dlls/ddraw/ddraw.c | 8 ++++++++ dlls/ddraw/surface.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d2d762d..7fca84c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,6 +2924,14 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + { + WARN("Application tried to create an explicit front or back buffer.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 29385b7..37fd096 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5640,14 +5640,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_NOEXCLUSIVEMODE; } - if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - { - WARN("Tried to create a back buffer surface.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_INVALIDCAPS; - } - /* This is a special case in ddrawex, but not allowed in ddraw. */ if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))

1 0