winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2015
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
623 discussions
Start a n
N
ew thread
Nikolay Sivov : oledb32: Allow case-insensitive match for Provider keyword.
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Dmitry Timoshkov : ole32: Add more traces to the storage methods.
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Piotr Caban : comctl32/tests: Flush events in listview tests after setting foreground window.
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Marcus Meissner : d3dx9_36: Remove unneeded vertex_remap variable ( Coverity).
by Alexandre Julliard
04 Nov '15
04 Nov '15
Module: wine Branch: master Commit: d17341dbd0976363bad70c0d06202e8968606133 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d17341dbd0976363bad70c0d0…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 31 10:03:17 2015 +0100 d3dx9_36: Remove unneeded vertex_remap variable (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c597e8e..606a088 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7016,7 +7016,6 @@ HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSI DWORD *point_reps = NULL; struct d3dx9_mesh *This = impl_from_ID3DXMesh(mesh); DWORD *vertex_face_map = NULL; - ID3DXBuffer *vertex_remap = NULL; BYTE *vertices = NULL; TRACE("mesh %p, flags %#x, epsilons %p, adjacency %p, adjacency_out %p, face_remap_out %p, vertex_remap_out %p.\n", @@ -7183,7 +7182,6 @@ cleanup: HeapFree(GetProcessHeap(), 0, vertex_face_map); if (attributes) mesh->lpVtbl->UnlockAttributeBuffer(mesh); if (indices) mesh->lpVtbl->UnlockIndexBuffer(mesh); - if (vertex_remap) ID3DXBuffer_Release(vertex_remap); if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); return hr;
1
0
0
0
Riccardo Bortolato : ddraw: Remove unused mipmap_level from ddraw_surface.
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Józef Kucia : d3d11: Implement d3d11_immediate_context_Unmap().
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Józef Kucia : d3d11: Implement d3d11_immediate_context_Map().
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Józef Kucia : wined3d: Set slice pitch in wined3d_map_desc to surface size.
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Józef Kucia : wined3d: Introduce wined3d_resource_unmap().
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
Józef Kucia : wined3d: Introduce wined3d_resource_map ().
by Alexandre Julliard
04 Nov '15
04 Nov '15
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
0
0
← Newer
1
...
51
52
53
54
55
56
57
...
63
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
Results per page:
10
25
50
100
200