November 2015 - Wine-Commits

Riccardo Bortolato : ddraw: Remove unused mipmap_level from ddraw_surface.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: f7bf61ea4cb3ad693d587831770b75a4cb179957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bf61ea4cb3ad693d5878317… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Nov 3 11:45:26 2015 +0100 ddraw: Remove unused mipmap_level from ddraw_surface. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/surface.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bb0a3f8..7c50031 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -185,9 +185,6 @@ struct ddraw_surface /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc; - /* Misc things */ - UINT mipmap_level; - /* Clipper objects */ struct ddraw_clipper *clipper; struct ddraw_palette *palette; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 692f129..8a10eff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -777,7 +777,6 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa */ TRACE("(%p): Returning surface %p\n", This, surf); - TRACE("(%p): mipmapcount=%d\n", This, surf->mipmap_level); *Surface = &surf->IDirectDrawSurface7_iface; ddraw_surface7_AddRef(*Surface); wined3d_mutex_unlock(); @@ -5108,8 +5107,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu struct ddraw_palette *dst_pal, *src_pal; DDSURFACEDESC *src_desc, *dst_desc; - TRACE("Copying surface %p to surface %p (mipmap level %d).\n", - src_surface, dst_surface, src_surface->mipmap_level); + TRACE("Copying surface %p to surface %p.\n", src_surface, dst_surface); /* Suppress the ALLOCONLOAD flag */ dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;

1 0

Józef Kucia : wined3d: Introduce wined3d_resource_unmap().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 7b9d06b49409a48c04bda3523de0ecc752a4bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9d06b49409a48c04bda3523… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:26 2015 +0100 wined3d: Introduce wined3d_resource_unmap(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 +++++++++++++ dlls/wined3d/resource.c | 7 +++++++ dlls/wined3d/surface.c | 7 +++++++ dlls/wined3d/texture.c | 41 +++++++++++++++++++++++------------------ dlls/wined3d/volume.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 1 + 8 files changed, 60 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b9d06b49409a48c04bda…

1 0

Józef Kucia : wined3d: Introduce wined3d_resource_map ().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 535b3fe029bf564e4f703e8f01020148edd87547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535b3fe029bf564e4f703e8f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:25 2015 +0100 wined3d: Introduce wined3d_resource_map(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 27 +++++++++++++++++++ dlls/wined3d/resource.c | 9 +++++++ dlls/wined3d/surface.c | 8 ++++++ dlls/wined3d/texture.c | 61 +++++++++++++++++++++++++----------------- dlls/wined3d/volume.c | 8 ++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 +-- include/wine/wined3d.h | 2 ++ 8 files changed, 94 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=535b3fe029bf564e4f703…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Unmap().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 825c675ebe58750753d2a2a20acb51d39e35823d URL: http://source.winehq.org/git/wine.git/?a=commit;h=825c675ebe58750753d2a2a20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:29 2015 +0100 d3d11: Implement d3d11_immediate_context_Unmap(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16aff79..ca8b0ef 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -229,7 +229,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx) { - FIXME("iface %p, resource %p, subresource_idx %u stub!\n", iface, resource, subresource_idx); + struct wined3d_resource *wined3d_resource; + + TRACE("iface %p, resource %p, subresource_idx %u.\n", iface, resource, subresource_idx); + + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_resource, subresource_idx); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Dmitry Timoshkov : ole32: Add more traces to the storage methods.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 2d08613e874d517e0b31b4972f2fd011e886f27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08613e874d517e0b31b4972… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 11:45:25 2015 +0800 ole32: Add more traces to the storage methods. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 105 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 94 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d08613e874d517e0b31b…

1 0

Henri Verbeet : wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 4896fd6e28cd37b7e82e088b69328d03f6b56b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896fd6e28cd37b7e82e088b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:44 2015 +0100 wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 046c6eb..a443636 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3054,6 +3054,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); + MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Map().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 75db69ad023d4221a991fb50f7e2915904ee3fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=75db69ad023d4221a991fb50f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:28 2015 +0100 d3d11: Implement d3d11_immediate_context_Map(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 22 ++++++++++++++++++++-- dlls/d3d11/texture.c | 4 ++-- dlls/d3d11/utils.c | 10 +++++----- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 043e7da..5af121f 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -312,7 +312,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP wined3d_mutex_lock(); hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, - wined3d_map_flags_from_d3d10_map_type(map_type)); + wined3d_map_flags_from_d3d11_map_type(map_type)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index fcd4742..b6d84c0 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -65,7 +65,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSP DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; -DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5f567ab..16aff79 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -202,10 +202,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext * static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { - FIXME("iface %p, resource %p, subresource_idx %u, map_type %u, map_flags %#x, mapped_subresource %p stub!\n", + struct wined3d_resource *wined3d_resource; + struct wined3d_map_desc map_desc; + HRESULT hr; + + TRACE("iface %p, resource %p, subresource_idx %u, map_type %u, map_flags %#x, mapped_subresource %p.\n", iface, resource, subresource_idx, map_type, map_flags, mapped_subresource); - return E_NOTIMPL; + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + + wined3d_mutex_lock(); + hr = wined3d_resource_map(wined3d_resource, subresource_idx, + &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + wined3d_mutex_unlock(); + + mapped_subresource->pData = map_desc.data; + mapped_subresource->RowPitch = map_desc.row_pitch; + mapped_subresource->DepthPitch = map_desc.slice_pitch; + + return hr; } static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index cd6b2fd..ef4c3ac 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -367,7 +367,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -824,7 +824,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 9bf3ada..31dffa3 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -546,20 +546,20 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re } } -DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) { switch (map_type) { - case D3D10_MAP_READ_WRITE: + case D3D11_MAP_READ_WRITE: return 0; - case D3D10_MAP_READ: + case D3D11_MAP_READ: return WINED3D_MAP_READONLY; - case D3D10_MAP_WRITE_DISCARD: + case D3D11_MAP_WRITE_DISCARD: return WINED3D_MAP_DISCARD; - case D3D10_MAP_WRITE_NO_OVERWRITE: + case D3D11_MAP_WRITE_NO_OVERWRITE: return WINED3D_MAP_NOOVERWRITE; default:

1 0

Piotr Caban : comctl32/tests: Flush events in listview tests after setting foreground window.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 7d6ca63154e2d36390f60949bb4a41ce23c53748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6ca63154e2d36390f60949b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 3 18:43:12 2015 +0100 comctl32/tests: Flush events in listview tests after setting foreground window. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 118b4a2..676dca1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5776,6 +5776,7 @@ static void test_oneclickactivate(void) ok(r == 0, "should return zero\n"); SetForegroundWindow(hwndparent); + flush_events(); fg = GetForegroundWindow(); if (fg != hwndparent) {

1 0

Nikolay Sivov : oledb32: Allow case-insensitive match for Provider keyword.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: ae9281e27ffddb0b872652b42144852bd899070f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9281e27ffddb0b872652b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 4 00:27:34 2015 +0300 oledb32: Allow case-insensitive match for Provider keyword. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 27 +++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 9 +++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3a76e0b..1ba0cb1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -413,7 +413,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) if (scol) scol++; start = scol; - if (!strcmpW(name, providerW)) + if (!strcmpiW(name, providerW)) { SysFreeString(name); SysFreeString(value); @@ -548,6 +548,29 @@ static void datasource_release(BOOL created, IUnknown **datasource) *datasource = NULL; } +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dest; + if (!src) return NULL; + dest = heap_alloc((strlenW(src)+1)*sizeof(WCHAR)); + if (dest) + strcpyW(dest, src); + return dest; +} + +static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) +{ + LPWSTR strlower, sublower, r; + strlower = CharLowerW(strdupW(str)); + sublower = CharLowerW(strdupW(sub)); + r = strstrW(strlower, sublower); + if (r) + r = (LPWSTR)str + (r - strlower); + heap_free(strlower); + heap_free(sublower); + return r; +} + static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) { @@ -565,7 +588,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o /* first get provider name */ provclsid = IID_NULL; - if (initstring && (prov = strstrW(initstring, providerW))) + if (initstring && (prov = strstriW(initstring, providerW))) { WCHAR *start, *progid; int len; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 5393a91..483454e 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -382,6 +382,8 @@ static void test_initializationstring(void) { static const WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static const WCHAR initstring_msdasql2[] = {'p','R','o','V','i','D','e','R','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; IDataInitialize *datainit = NULL; @@ -414,6 +416,13 @@ static void test_initializationstring(void) } IDBInitialize_Release(dbinit); + + /* mixed casing string */ + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR*)initstring_msdasql2, + &IID_IDBInitialize, (IUnknown**)&dbinit); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBInitialize_Release(dbinit); } else ok(dbinit == NULL, "got %p\n", dbinit);

1 0

Józef Kucia : wined3d: Set slice pitch in wined3d_map_desc to surface size.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 3f2fa96b982a7c43127602cd5d398901ee4c0217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2fa96b982a7c43127602cd5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:27 2015 +0100 wined3d: Set slice pitch in wined3d_map_desc to surface size. This behavior mimics D3D11 runtime. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3ab307..c3ddc84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2597,7 +2597,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, map_desc->row_pitch = surface->resource.width * format->byte_count; else map_desc->row_pitch = wined3d_surface_get_pitch(surface); - map_desc->slice_pitch = 0; + map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; if (!box) {

1 0