wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Ken Thomases : winemac: Move test for valid GL drawable into -[ WineContentView addGLContext:].
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: fd04552fe3d2acfc487192f7c6696526bd8c9950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd04552fe3d2acfc487192f7c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 27 15:32:46 2013 -0600 winemac: Move test for valid GL drawable into -[WineContentView addGLContext:]. Improves encapsulation. Avoids a round trip to the main thread. --- dlls/winemac.drv/cocoa_opengl.m | 9 ++------- dlls/winemac.drv/cocoa_window.m | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 45799db..85b3639 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,16 +123,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL viewIsValidDrawable; - macdrv_add_view_opengl_context(v, c); - OnMainThread(^{ - viewIsValidDrawable = [[view window] windowNumber] > 0 && - !NSIsEmptyRect([view visibleRect]); - }); - if (viewIsValidDrawable) + if (context.needsUpdate) { + context.needsUpdate = FALSE; [context setView:view]; [context setLatentView:nil]; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a29f20e..74fa191 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -294,8 +294,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) pendingGlContexts = [[NSMutableArray alloc] init]; - [pendingGlContexts addObject:context]; - [self setNeedsDisplay:YES]; + + if ([[self window] windowNumber] > 0 && !NSIsEmptyRect([self visibleRect])) + { + [glContexts addObject:context]; + context.needsUpdate = TRUE; + } + else + { + [pendingGlContexts addObject:context]; + [self setNeedsDisplay:YES]; + } + [(WineWindow*)[self window] updateColorSpace]; } @@ -2407,7 +2417,7 @@ void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) WineContentView* view = (WineContentView*)v; WineOpenGLContext *context = (WineOpenGLContext*)c; - OnMainThreadAsync(^{ + OnMainThread(^{ [view addGLContext:context]; });

1 0

Stefan Dösinger : wined3d: Don' t store PBO pointers in allocatedMemory.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 6d0d018bfa0a1d27c2d540fb688b29f0e5b6e21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0d018bfa0a1d27c2d540fb6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 27 00:26:36 2013 +0100 wined3d: Don't store PBO pointers in allocatedMemory. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bea4ce4..ac168dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -767,7 +767,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding); } -static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) +static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { struct wined3d_device *device = surface->resource.device; @@ -793,6 +793,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD if (surface->flags & SFLAG_PBO) { + BYTE *ret; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -802,12 +803,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB"); - /* This shouldn't happen but could occur if some other function - * didn't handle the PBO properly. */ - if (surface->resource.allocatedMemory) - ERR("The surface already has PBO memory allocated.\n"); - - surface->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); checkGLcall("glMapBufferARB"); /* Make sure the PBO isn't set anymore in order not to break non-PBO @@ -816,7 +812,10 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD checkGLcall("glBindBufferARB"); context_release(context); + return ret; } + + return surface->resource.allocatedMemory; } static void surface_unmap(struct wined3d_surface *surface) @@ -842,8 +841,6 @@ static void surface_unmap(struct wined3d_surface *surface) GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glUnmapBufferARB"); context_release(context); - - surface->resource.allocatedMemory = NULL; } TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); @@ -1473,10 +1470,12 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) +static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + + return surface->resource.allocatedMemory; } static void gdi_surface_unmap(struct wined3d_surface *surface) @@ -3195,6 +3194,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", surface, map_desc, wine_dbgstr_rect(rect), flags); @@ -3233,7 +3233,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } - surface->surface_ops->surface_map(surface, rect, flags); + base_memory = surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; @@ -3243,7 +3243,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!rect) { - map_desc->data = surface->resource.allocatedMemory; + map_desc->data = base_memory; surface->lockedRect.left = 0; surface->lockedRect.top = 0; surface->lockedRect.right = surface->resource.width; @@ -3255,13 +3255,13 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, { /* Compressed textures are block based, so calculate the offset of * the block that contains the top-left pixel of the locked rectangle. */ - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + ((rect->top / format->block_height) * map_desc->row_pitch) + ((rect->left / format->block_width) * format->block_byte_count); } else { - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + (map_desc->row_pitch * rect->top) + (rect->left * format->byte_count); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b5d01a..cb685e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2169,7 +2169,7 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); + BYTE *(*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

Hans Leidekker : advapi32: Perform a case-insensitive match on the credential target name.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 0c56639a6aff582689f66e0273cecabd00212715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c56639a6aff582689f66e027… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 14:35:38 2013 +0100 advapi32: Perform a case-insensitive match on the credential target name. --- dlls/advapi32/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e17dfb6..58dd72d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -746,7 +746,7 @@ static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; @@ -818,7 +818,7 @@ static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCH TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; HeapFree(GetProcessHeap(), 0, target_name);

1 0

Nikolay Sivov : qmgr/tests: Do an early check to skip all tests.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 2245acf75a438d5605b23c7bb8e717e44e72effe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2245acf75a438d5605b23c7bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 16:50:30 2013 +0400 qmgr/tests: Do an early check to skip all tests. --- dlls/qmgr/tests/enum_files.c | 35 +---------------- dlls/qmgr/tests/enum_jobs.c | 52 +------------------------ dlls/qmgr/tests/file.c | 48 +++++++++++++++-------- dlls/qmgr/tests/job.c | 29 ++++++++++++++- dlls/qmgr/tests/qmgr.c | 84 +++++++++++++----------------------------- 5 files changed, 91 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2245acf75a438d5605b23…

1 0

Nikolay Sivov : qmgr: Implement Get/SetNotifyFlags().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 76c3f0cffb793511f0bb76bd10749102aebb9709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c3f0cffb793511f0bb76bd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 16:49:55 2013 +0400 qmgr: Implement Get/SetNotifyFlags(). --- dlls/qmgr/job.c | 24 ++++++++++++++++++++---- dlls/qmgr/qmgr.h | 1 + dlls/qmgr/tests/job.c | 13 +++++++++++++ include/bits.idl | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index ac7deaf..52c7b7f 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -410,8 +410,17 @@ static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags( ULONG Val) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%d): stub\n", This, Val); - return E_NOTIMPL; + static const ULONG valid_flags = BG_NOTIFY_JOB_TRANSFERRED | + BG_NOTIFY_JOB_ERROR | + BG_NOTIFY_DISABLE | + BG_NOTIFY_JOB_MODIFICATION | + BG_NOTIFY_FILE_TRANSFERRED; + + TRACE("(%p)->(0x%x)\n", This, Val); + + if (Val & ~valid_flags) return E_NOTIMPL; + This->notify_flags = Val; + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags( @@ -419,8 +428,14 @@ static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags( ULONG *pVal) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) return E_INVALIDARG; + + *pVal = This->notify_flags; + + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_SetNotifyInterface( @@ -689,6 +704,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->state = BG_JOB_STATE_SUSPENDED; This->description = NULL; + This->notify_flags = BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED; *job = This; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 63d9f91..eb982a0 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -43,6 +43,7 @@ typedef struct struct list files; BG_JOB_PROGRESS jobProgress; BG_JOB_STATE state; + ULONG notify_flags; /* Protects file list, and progress */ CRITICAL_SECTION cs; struct list entryFromQmgr; diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 1979140..f311235 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -414,6 +414,18 @@ static void test_CompleteLocalURL(void) HeapFree(GetProcessHeap(), 0, urlB); } +static void test_NotifyFlags(void) +{ + ULONG flags; + HRESULT hr; + + /* check default flags */ + flags = 0; + hr = IBackgroundCopyJob_GetNotifyFlags(test_job, &flags); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(flags == (BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED), "flags 0x%08x\n", flags); +} + typedef void (*test_t)(void); START_TEST(job) @@ -425,6 +437,7 @@ START_TEST(job) test_GetProgress_preTransfer, test_GetState, test_ResumeEmpty, + test_NotifyFlags, 0 }; static const test_t tests_bits20[] = { diff --git a/include/bits.idl b/include/bits.idl index 2eed38d..0e3362c 100644 --- a/include/bits.idl +++ b/include/bits.idl @@ -29,6 +29,7 @@ cpp_quote("#define BG_NOTIFY_JOB_TRANSFERRED 0x0001") cpp_quote("#define BG_NOTIFY_JOB_ERROR 0x0002") cpp_quote("#define BG_NOTIFY_DISABLE 0x0004") cpp_quote("#define BG_NOTIFY_JOB_MODIFICATION 0x0008") +cpp_quote("#define BG_NOTIFY_FILE_TRANSFERRED 0x0010") cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef EnumJobs")

1 0

Henri Verbeet : ddraw: Move the flippable validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 5889f822f10c63d22251cc993726f3dbe465986a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5889f822f10c63d22251cc993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:52 2013 +0100 ddraw: Move the flippable validation from CreateSurface() to ddraw_surface_create_texture(). --- 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 109d745..415eda0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2855,14 +2855,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, DDSD->dwFlags &= ~DDSD_LPSURFACE; } - if ((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) - == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) - && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - { - WARN("Attempted to create a flipable primary surface without DDSCL_EXCLUSIVE.\n"); - return DDERR_NOEXCLUSIVEMODE; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ebbd6c1..4c5021d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) + == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) + && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + return DDERR_NOEXCLUSIVEMODE; + } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) {

1 0

Henri Verbeet : ddraw: Move the primary surface validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 3139249a2eceae05130472ea53aea2a8d6184f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3139249a2eceae05130472ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:51 2013 +0100 ddraw: Move the primary surface validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 6 ------ dlls/ddraw/surface.c | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73fa17a..109d745 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2863,12 +2863,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_NOEXCLUSIVEMODE; } - if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - { - WARN("Application wanted to create back buffer primary surface\n"); - return DDERR_INVALIDCAPS; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e9f0d42..ebbd6c1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,13 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + { + WARN("Tried to create a back buffer surface.\n"); + 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

Henri Verbeet : ddraw: Create back buffers in ddraw_surface_create_texture( ).
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 2105b4493fad705f7c597b7ebf9b163bd0e4b333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2105b4493fad705f7c597b7eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:50 2013 +0100 ddraw: Create back buffers in ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 46 --------------------------- dlls/ddraw/surface.c | 85 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5f6d792..73fa17a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2872,10 +2872,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); - /* The first surface is a front buffer, the back buffer is created afterwards */ - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - desc2.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object))) { WARN("Failed to create texture, hr %#x.\n", hr); @@ -2885,48 +2881,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, *surface = object; - /* Create Additional surfaces if necessary - * This applies to Primary surfaces which have a back buffer count - * set, but not to mipmap textures. In case of Mipmap textures, - * wineD3D takes care of the creation of additional surfaces - */ - if(DDSD->dwFlags & DDSD_BACKBUFFERCOUNT) - { - struct ddraw_surface *last = object; - UINT i; - - desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ - desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; - desc2.dwBackBufferCount = 0; - - for (i = 0; i < DDSD->dwBackBufferCount; ++i) - { - struct ddraw_surface *object2 = NULL; - - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object2))) - { - if (version == 7) - IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); - else if (version == 4) - IDirectDrawSurface4_Release(&object->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&object->IDirectDrawSurface_iface); - - return hr; - } - - /* Add the new surface to the complex attachment array. */ - last->complex_array[0] = object2; - last = object2; - - /* Remove the (possible) back buffer cap from the new surface - * description, because only one surface in the flipping chain is a - * back buffer, one is a front buffer, the others are just primary - * surfaces. */ - desc2.ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; - } - } - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ddraw->primary = object; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e127f72..e9f0d42 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5687,22 +5687,26 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (!desc->dwWidth || !desc->dwHeight) return DDERR_INVALIDPARAMS; - if ((desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER) - && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - struct wined3d_swapchain_desc swapchain_desc; + /* The first surface is a front buffer, the back buffers are created + * afterwards. */ + desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE | DDSCAPS_FRONTBUFFER; + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + { + struct wined3d_swapchain_desc swapchain_desc; - wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); - swapchain_desc.backbuffer_width = mode.width; - swapchain_desc.backbuffer_height = mode.height; - swapchain_desc.backbuffer_format = mode.format_id; + wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); + swapchain_desc.backbuffer_width = mode.width; + swapchain_desc.backbuffer_height = mode.height; + swapchain_desc.backbuffer_format = mode.format_id; - if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) - { - ERR("Failed to reset device.\n"); - return hr; + if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + { + ERR("Failed to reset device.\n"); + return hr; + } } } @@ -5792,9 +5796,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } } - if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { wined3d_desc.pool = WINED3D_POOL_SYSTEM_MEM; @@ -5926,9 +5927,61 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } } + if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) + { + unsigned int count = desc->dwBackBufferCount; + struct ddraw_surface *last = root; + + attach = &last->complex_array[0]; + for (i = 0; i < count; ++i) + { + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + texture->version = version; + texture->surface_desc = root->surface_desc; + desc = &texture->surface_desc; + + /* Only one surface in the flipping chain is a back buffer, one is + * a front buffer, the others are just primary surfaces. */ + desc->ddsCaps.dwCaps &= ~(DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); + if (!i) + desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; + desc->dwBackBufferCount = 0; + + if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, 1, + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) + { + HeapFree(GetProcessHeap(), 0, texture); + goto fail; + } + + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + last = wined3d_resource_get_parent(resource); + last->wined3d_texture = wined3d_texture; + texture->root = last; + + *attach = last; + attach = &last->complex_array[0]; + } + } + *surface = root; return DD_OK; + +fail: + if (version == 7) + IDirectDrawSurface7_Release(&root->IDirectDrawSurface7_iface); + else if (version == 4) + IDirectDrawSurface4_Release(&root->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&root->IDirectDrawSurface_iface); + + return hr; } HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture,

1 0

Henri Verbeet : ddraw: Move the location validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 559229aa1009e6d467a9cf6da18f6c5a400ed5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559229aa1009e6d467a9cf6da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:49 2013 +0100 ddraw: Move the location validation from CreateSurface() to ddraw_surface_create_texture(). --- 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 314b5a0..5f6d792 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2814,7 +2814,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, struct ddraw_surface *object = NULL; HRESULT hr; DDSURFACEDESC2 desc2; - const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); @@ -2870,13 +2869,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_INVALIDCAPS; } - /* This is a special case in ddrawex, but not allowed in ddraw. */ - if ((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) - { - WARN("Tried to create a surface in both system and video memory.\n"); - return DDERR_INVALIDCAPS; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 74bdce9..e127f72 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + /* This is a special case in ddrawex, but not allowed in ddraw. */ + if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("Tried to create a surface in both system and video memory.\n"); + return DDERR_INVALIDCAPS; + } + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) {

1 0

Henri Verbeet : wined3d: Merge the texture creation functions.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 4b3db52b53faf65ce0f4ff35faf96bc64d652820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3db52b53faf65ce0f4ff35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:48 2013 +0100 wined3d: Merge the texture creation functions. --- dlls/d3d10core/texture.c | 6 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/texture.c | 6 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/texture.c | 6 +- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 19 ++++----- dlls/wined3d/device.c | 4 +- dlls/wined3d/surface.c | 3 +- dlls/wined3d/texture.c | 90 +++++++++++---------------------------------- dlls/wined3d/wined3d.spec | 4 +- include/wine/wined3d.h | 7 +--- 12 files changed, 50 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b3db52b53faf65ce0f4f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013