November 2011 - Wine-commits

Nikolay Sivov : msxml3: Add type id placeholder for index 0 to make lookup code actually work.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 8d602efe88dc2bc3d1e3551720e4ed2b31bba218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d602efe88dc2bc3d1e355172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 23:13:24 2011 +0300 msxml3: Add type id placeholder for index 0 to make lookup code actually work. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 436c277..67ce77c 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -78,6 +78,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID_NULL, &IID_IXMLDOMAttribute, &IID_IXMLDOMCDATASection, &IID_IXMLDOMComment, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8b84aca..698655e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -38,6 +38,7 @@ typedef enum { /* typelibs */ typedef enum tid_t { + NULL_tid, IXMLDOMAttribute_tid, IXMLDOMCDATASection_tid, IXMLDOMComment_tid,

1 0

Henri Verbeet : wined3d: Use wined3d_surface_blt() in surface_upload_from_surface().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: c30ea3767c69cacd2ed487fc3b6085028e097ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30ea3767c69cacd2ed487fc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:52 2011 +0100 wined3d: Use wined3d_surface_blt() in surface_upload_from_surface(). --- dlls/wined3d/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7361391..21848e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2588,13 +2588,13 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* This call loads the OpenGL surface directly, instead of copying the - * surface to the destination's sysmem copy. If surface conversion is - * needed, use BltFast instead to copy in sysmem and use regular surface - * loading. */ + /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ d3dfmt_get_conv(dst_surface, FALSE, TRUE, &format, &convert); if (convert != NO_CONVERSION || format.convert) - return surface_bltfast(dst_surface, dst_point->x, dst_point->y, src_surface, src_rect, 0); + { + RECT dst_rect = {dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h}; + return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3DTEXF_POINT); + } context = context_acquire(dst_surface->resource.device, NULL); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Use wined3d_surface_blt() in wined3d_swapchain_get_front_buffer_data().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 0b3185665f590a2facb2ee06cd1442fa88a69090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3185665f590a2facb2ee06c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:53 2011 +0100 wined3d: Use wined3d_surface_blt() in wined3d_swapchain_get_front_buffer_data(). --- dlls/wined3d/swapchain.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7141165..e31b622 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -154,16 +154,23 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface) { - POINT offset = {0, 0}; + struct wined3d_surface *src_surface; + RECT src_rect, dst_rect; TRACE("swapchain %p, dst_surface %p.\n", swapchain, dst_surface); - if (swapchain->presentParms.Windowed) - MapWindowPoints(swapchain->win_handle, NULL, &offset, 1); + src_surface = swapchain->front_buffer; + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + dst_rect = src_rect; - surface_bltfast(dst_surface, offset.x, offset.y, swapchain->front_buffer, NULL, 0); + if (swapchain->presentParms.Windowed) + { + MapWindowPoints(swapchain->win_handle, NULL, (POINT *)&dst_rect, 2); + FIXME("Using destination rect %s in windowed mode, this is likely wrong.\n", + wine_dbgstr_rect(&dst_rect)); + } - return WINED3D_OK; + return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3DTEXF_POINT); } HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Use wined3d_surface_blt() in swapchain_gl_present( ).
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 335a6ca78e18cdc0196377f8e258fb3e299b73dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=335a6ca78e18cdc0196377f8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 2 22:46:54 2011 +0100 wined3d: Use wined3d_surface_blt() in swapchain_gl_present(). --- dlls/wined3d/surface.c | 19 ------------------- dlls/wined3d/swapchain.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21848e9..1492071 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1815,25 +1815,6 @@ cpu: return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } -/* Do not call while under the GL lock. */ -HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) -{ - RECT src_rect, dst_rect; - - TRACE("dst_surface %p, dst_x %u, dst_y %u, src_surface %p, src_rect_in %s, flags %#x.\n", - dst_surface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect_in), flags); - - surface_get_rect(src_surface, src_rect_in, &src_rect); - - dst_rect.left = dst_x; - dst_rect.top = dst_y; - dst_rect.right = dst_x + src_rect.right - src_rect.left; - dst_rect.bottom = dst_y + src_rect.bottom - src_rect.top; - - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, NULL, WINED3DTEXF_POINT); -} - HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, struct wined3d_surface *render_target) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e31b622..7d7be5b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -482,9 +482,12 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R if (swapchain->device->logo_surface) { + struct wined3d_surface *src_surface = swapchain->device->logo_surface; + RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; + /* Blit the logo into the upper left corner of the drawable. */ - surface_bltfast(swapchain->back_buffers[0], 0, 0, - swapchain->device->logo_surface, NULL, WINEDDBLT_KEYSRC); + wined3d_surface_blt(swapchain->back_buffers[0], &rect, src_surface, &rect, + WINEDDBLT_KEYSRC, NULL, WINED3DTEXF_POINT); } TRACE("Presenting HDC %p.\n", context->hdc); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26be952..2a987d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,8 +2079,6 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -HRESULT surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msiexec: Preserve the first argument in process_args_from_reg.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 494e20541d8e485227deea24e5a64ee483e64ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494e20541d8e485227deea24e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 3 11:39:44 2011 +0100 msiexec: Preserve the first argument in process_args_from_reg. --- programs/msiexec/msiexec.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index d7c83cb..b794557 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -471,12 +471,12 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) *pargv = argv; } -static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv ) { LONG r; - HKEY hkey = 0, hkeyArgs = 0; + HKEY hkey; DWORD sz = 0, type = 0; - LPWSTR buf = NULL; + WCHAR *buf; BOOL ret = FALSE; r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); @@ -485,8 +485,15 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); if(r == ERROR_SUCCESS && type == REG_SZ) { - buf = HeapAlloc(GetProcessHeap(), 0, sz); - r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); + int len = lstrlenW( *pargv[0] ); + if (!(buf = HeapAlloc( GetProcessHeap(), 0, sz + (len + 1) * sizeof(WCHAR) ))) + { + RegCloseKey( hkey ); + return FALSE; + } + memcpy( buf, *pargv[0], len * sizeof(WCHAR) ); + buf[len++] = ' '; + r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz); if( r == ERROR_SUCCESS ) { process_args(buf, pargc, pargv); @@ -494,7 +501,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) } HeapFree(GetProcessHeap(), 0, buf); } - RegCloseKey(hkeyArgs); + RegCloseKey(hkey); return ret; }

1 0

Hans Leidekker : msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small .
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: eb7d8b92cb3f74655f9721e020e12d971076d58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d8b92cb3f74655f9721e02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 3 11:40:16 2011 +0100 msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c265cca..756be42 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1014,7 +1014,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) } } len = 0; - if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_BUFFER_OVERFLOW) { WCHAR *computername; if ((computername = msi_alloc( len * sizeof(WCHAR) )))

1 0

Dmitry Timoshkov : ntdll: Use PAGE_READWRITE access when resolving DLL imports.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: df9a0868656fc4d1bf6ed351385f44ffa2f6b116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9a0868656fc4d1bf6ed3513… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:37 2011 +0800 ntdll: Use PAGE_READWRITE access when resolving DLL imports. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5ee7d0a..314813f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -563,7 +563,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d protect_base = thunk_list; protect_size *= sizeof(*thunk_list); NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, - &protect_size, PAGE_WRITECOPY, &protect_old ); + &protect_size, PAGE_READWRITE, &protect_old ); imp_mod = wmImp->ldr.BaseAddress; exports = RtlImageDirectoryEntryToData( imp_mod, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size );

1 0

Dmitry Timoshkov : ntdll: Make the VirtualProtect tests pass under Wine.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 33255ee6ecf48725e8e061313da8f387a5714e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33255ee6ecf48725e8e061313… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 31 13:48:54 2011 +0800 ntdll: Make the VirtualProtect tests pass under Wine. --- dlls/kernel32/tests/virtual.c | 16 ---------------- dlls/ntdll/virtual.c | 1 + 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 49630fd..d0b9f4f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1472,16 +1472,8 @@ static void test_VirtualProtect(void) } else { - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].prot_set == PAGE_WRITECOPY) || (td[i].prot_set == PAGE_EXECUTE_WRITECOPY)) - todo_wine { ok(!ret, "%d: VirtualProtect should fail\n", i); ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); - } - else { - ok(!ret, "%d: VirtualProtect should fail\n", i); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); - } } old_prot = 0xdeadbeef; @@ -1491,13 +1483,7 @@ static void test_VirtualProtect(void) if (td[i].prot_get) ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); else - { - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].prot_set == PAGE_WRITECOPY) || (td[i].prot_set == PAGE_EXECUTE_WRITECOPY)) - todo_wine ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - else ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - } } exec_prot = 0; @@ -1521,10 +1507,8 @@ static void test_VirtualProtect(void) { if (prot & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)) { - todo_wine { ok(!ret, "VirtualProtect(%02x) should fail\n", prot); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } } else ok(ret, "VirtualProtect(%02x) error %d\n", prot, GetLastError()); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index b23e596..8c5e773 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2088,6 +2088,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); if ((status = get_vprot_flags( new_prot, &new_vprot ))) return status; + if (new_vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; new_vprot |= VPROT_COMMITTED; server_enter_uninterrupted_section( &csVirtual, &sigset );

1 0

Stefan Dösinger : d3d9/tests: Move the double unlock test into a separate test, test other pools.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: f1d98aed7015da2d7a647c6de3b685a55305f08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d98aed7015da2d7a647c6de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 23:13:53 2011 +0200 d3d9/tests: Move the double unlock test into a separate test, test other pools. --- dlls/d3d9/tests/surface.c | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 8353b81..361e8a3 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -1,5 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet + * Copyright 2011 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -238,8 +239,6 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); - hr = IDirect3DSurface9_UnlockRect(surface); - ok(hr == D3DERR_INVALIDCALL, "Double UnlockRect returned %08x, expected D3DERR_INVALIDCALL\n", hr); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); @@ -590,6 +589,50 @@ static void test_surface_format_null(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } +static void test_surface_double_unlock(IDirect3DDevice9 *device) +{ + static const struct + { + D3DPOOL pool; + const char *name; + } + pools[] = + { + { D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT" }, + { D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH" }, + { D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM" }, + /* There are no standalone MANAGED pool surfaces */ + }; + IDirect3DSurface9 *surface; + unsigned int i; + HRESULT hr; + D3DLOCKED_RECT lr; + + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) + { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_X8R8G8B8, + pools[i].pool, &surface, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Unlock without lock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); + ok(SUCCEEDED(hr), "IDirect3DSurface9_LockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface9_UnlockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Double unlock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + IDirect3DSurface9_Release(surface); + } +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -614,6 +657,7 @@ START_TEST(surface) test_getdc(device_ptr); test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); + test_surface_double_unlock(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Stefan Dösinger : wined3d: Locking partial blocks is not allowed in DEFAULT pool resources.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 9b0adb406dda4a1796e8207f1f3206e0d2784ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0adb406dda4a1796e8207f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 23:35:38 2011 +0200 wined3d: Locking partial blocks is not allowed in DEFAULT pool resources. --- dlls/wined3d/surface.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1492071..f75593d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6,7 +6,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006-2008 Stefan Dösinger for CodeWeavers + * Copyright 2006-2011 Stefan Dösinger for CodeWeavers * Copyright 2007-2008 Henri Verbeet * Copyright 2006-2008 Roderick Colenbrander * Copyright 2009-2011 Henri Verbeet for CodeWeavers @@ -3782,6 +3782,8 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { + const struct wined3d_format *format = surface->resource.format; + TRACE("surface %p, locked_rect %p, rect %s, flags %#x.\n", surface, locked_rect, wine_dbgstr_rect(rect), flags); @@ -3790,6 +3792,29 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; } + if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED + && rect && (rect->left || rect->top + || rect->right != surface->resource.width + || rect->bottom != surface->resource.height)) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + + if ((rect->left & width_mask) || (rect->right & width_mask) + || (rect->top & height_mask) || (rect->bottom & height_mask)) + { + switch (surface->resource.pool) + { + case WINED3DPOOL_DEFAULT: + WARN("Partial block lock with WINED3DPOOL_DEFAULT\n"); + return WINED3DERR_INVALIDCALL; + + default: + FIXME("Partial block lock with %s\n", debug_d3dpool(surface->resource.pool)); + } + } + } + surface->flags |= SFLAG_LOCKED; if (!(surface->flags & SFLAG_LOCKABLE)) @@ -3809,8 +3834,6 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } else { - const struct wined3d_format *format = surface->resource.format; - if ((format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_COMPRESSED) { /* Compressed textures are block based, so calculate the offset of

1 0