From 98284e0a1e169c2e90b6ef0250522f6593ff5781 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 30 Mar 2016 19:03:37 +0200 Subject: [PATCH] Rebase against f34fd257c6c83804075914ee2b82cc42eadc683f. --- ...out-stream-creation-from-OleLoadPict.patch | 12 ++--- ...leaut32-Implement-OleLoadPictureFile.patch | 40 ++++++++------- patches/patchinstall.sh | 4 +- ...ort-for-DXTn-software-decoding-throu.patch | 16 +++--- ...DXTn-support-and-export-conversion-f.patch | 18 +++---- ...ined3d_resource_-un-map-to-wined3d_r.patch | 50 +++++++++---------- 6 files changed, 71 insertions(+), 69 deletions(-) diff --git a/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch b/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch index bfbd5e46..26c5e831 100644 --- a/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch +++ b/patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch @@ -1,4 +1,4 @@ -From 80a5db695f22b94335d3945354c1e28c519f81ff Mon Sep 17 00:00:00 2001 +From 5032303d405720a099c0279127148d2d6e278b7b Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 27 Mar 2016 16:26:47 +0800 Subject: oleaut32: Factor out stream creation from OleLoadPicturePath. @@ -8,11 +8,11 @@ Subject: oleaut32: Factor out stream creation from OleLoadPicturePath. 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index 285afba..9badf31 100644 +index eeb3269..765711d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -2315,6 +2315,45 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, - return hr; +@@ -2324,6 +2324,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) + return E_NOTIMPL; } +static HRESULT create_stream(const WCHAR *filename, IStream **stream) @@ -57,7 +57,7 @@ index 285afba..9badf31 100644 /*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ -@@ -2332,12 +2371,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +@@ -2341,12 +2380,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, LPVOID *ppvRet ) { static const WCHAR file[] = { 'f','i','l','e',':',0 }; @@ -70,7 +70,7 @@ index 285afba..9badf31 100644 HRESULT hRes; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; -@@ -2366,36 +2400,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +@@ -2375,36 +2409,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, /* Handle candidate DOS paths separately. */ if (file_candidate[1] == ':') { diff --git a/patches/oleaut32-OleLoadPictureFile/0003-oleaut32-Implement-OleLoadPictureFile.patch b/patches/oleaut32-OleLoadPictureFile/0003-oleaut32-Implement-OleLoadPictureFile.patch index 59172071..a469d88f 100644 --- a/patches/oleaut32-OleLoadPictureFile/0003-oleaut32-Implement-OleLoadPictureFile.patch +++ b/patches/oleaut32-OleLoadPictureFile/0003-oleaut32-Implement-OleLoadPictureFile.patch @@ -1,32 +1,34 @@ -From d6e0caff3ae762f25517309b93ac3b706f2e7958 Mon Sep 17 00:00:00 2001 +From c5cb6a3fabbc59568fcd0794473b94ea61127a85 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Sun, 27 Mar 2016 16:28:33 +0800 Subject: oleaut32: Implement OleLoadPictureFile. (v2) --- - dlls/oleaut32/oleaut32.spec | 2 +- - dlls/oleaut32/olepicture.c | 27 ++++++++++++++++++++ + dlls/oleaut32/olepicture.c | 36 ++++++++++++++++++++------- dlls/oleaut32/tests/olepicture.c | 53 ++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 81 insertions(+), 1 deletion(-) + 2 files changed, 80 insertions(+), 9 deletions(-) -diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec -index f5ad0ef..97aec54 100644 ---- a/dlls/oleaut32/oleaut32.spec -+++ b/dlls/oleaut32/oleaut32.spec -@@ -390,7 +390,7 @@ - 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) - 420 stdcall OleCreateFontIndirect(ptr ptr ptr) - 421 stdcall OleTranslateColor(long long long) --422 stub OleLoadPictureFile -+422 stdcall OleLoadPictureFile(int128 ptr) - 423 stdcall OleSavePictureFile(ptr wstr) - 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) - 425 stdcall VarUI4FromI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index 9badf31..29a091f 100644 +index 765711d..29a091f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -2355,6 +2355,33 @@ static HRESULT create_stream(const WCHAR *filename, IStream **stream) +@@ -2315,15 +2315,6 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, + return hr; + } + +-/*********************************************************************** +- * OleLoadPictureFile (OLEAUT32.422) +- */ +-HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) +-{ +- FIXME("(%s %p): stub\n", wine_dbgstr_variant(&file), picture); +- return E_NOTIMPL; +-} +- + static HRESULT create_stream(const WCHAR *filename, IStream **stream) + { + HANDLE hFile; +@@ -2364,6 +2355,33 @@ static HRESULT create_stream(const WCHAR *filename, IStream **stream) } /*********************************************************************** diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 505ad8ad..6147f7a5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "5b3681f62ddd2977924424d6f326ce729de9102a" + echo "f34fd257c6c83804075914ee2b82cc42eadc683f" } # Show version information @@ -5628,7 +5628,7 @@ fi # | * [#39786] Implement oleaut32.OleLoadPictureFile # | # | Modified files: -# | * dlls/oleaut32/oleaut32.spec, dlls/oleaut32/olepicture.c, dlls/oleaut32/tests/olepicture.c +# | * dlls/oleaut32/olepicture.c, dlls/oleaut32/tests/olepicture.c # | if test "$enable_oleaut32_OleLoadPictureFile" -eq 1; then patch_apply oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch diff --git a/patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch b/patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch index 6715ffbc..a9a0506d 100644 --- a/patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch +++ b/patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch @@ -1,4 +1,4 @@ -From befa34d0d694caed1a57eb006769aa7da4f6d08d Mon Sep 17 00:00:00 2001 +From b14633555358bcce6ab3dbef2573f19f72a5b2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 20 Sep 2014 02:48:07 +0200 Subject: wined3d: Add support for DXTn software decoding through libtxc_dxtn. @@ -353,7 +353,7 @@ index 0000000..ce98949 + wine_dlclose(txc_dxtn_handle, NULL, 0); +} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c -index ceea4fe..d66f873 100644 +index abbab26..3668c25 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1697,6 +1697,66 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, @@ -458,10 +458,10 @@ index ceea4fe..d66f873 100644 } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c -index 71dc180..fdb260e 100644 +index d584664..cb55ef8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c -@@ -330,6 +330,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) +@@ -333,6 +333,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); @@ -470,7 +470,7 @@ index 71dc180..fdb260e 100644 return TRUE; } -@@ -361,6 +363,9 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) +@@ -364,6 +366,9 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) DeleteCriticalSection(&wined3d_wndproc_cs); DeleteCriticalSection(&wined3d_cs); @@ -481,11 +481,11 @@ index 71dc180..fdb260e 100644 } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 7b7b65b..294a33b 100644 +index 9a7dff4..e14786c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -3441,6 +3441,19 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info - && !is_scaling_fixup(format->color_fixup); +@@ -3483,6 +3483,19 @@ static inline struct wined3d_surface *context_get_rt_surface(const struct wined3 + return texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; } +BOOL wined3d_dxt1_decode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, diff --git a/patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch b/patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch index 641678af..6aecaf9e 100644 --- a/patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch +++ b/patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch @@ -1,4 +1,4 @@ -From 694bf8f53066b05b60ffa0f54ca642d3482e61da Mon Sep 17 00:00:00 2001 +From 31990eb50ee15e12d709efcf1e21d3a9a2c20fb9 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Tue, 4 Nov 2014 22:41:45 +0100 Subject: wined3d: Improve DXTn support and export conversion functions for @@ -153,7 +153,7 @@ index ce98949..77f7d55 100644 #undef LOAD_FUNCPTR diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c -index d66f873..0126ff3 100644 +index 3668c25..1e9e02c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1709,6 +1709,30 @@ static void convert_dxt1_x8r8g8b8(const BYTE *src, BYTE *dst, @@ -204,10 +204,10 @@ index d66f873..0126ff3 100644 {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_DXT1, convert_x8r8g8b8_dxt1}, {WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_DXT1, convert_a1r5g5b5_dxt1}, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec -index 7c90d60..00bd34d 100644 +index 21cb0db..b7bf46d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec -@@ -268,3 +268,11 @@ +@@ -269,3 +269,11 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) @@ -220,11 +220,11 @@ index 7c90d60..00bd34d 100644 +@ cdecl wined3d_dxt5_decode(ptr ptr long long long long long) +@ cdecl wined3d_dxt5_encode(ptr ptr long long long long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 294a33b..aa9126f 100644 +index e14786c..e0696e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -3441,17 +3441,7 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info - && !is_scaling_fixup(format->color_fixup); +@@ -3483,17 +3483,7 @@ static inline struct wined3d_surface *context_get_rt_surface(const struct wined3 + return texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; } -BOOL wined3d_dxt1_decode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, @@ -242,10 +242,10 @@ index 294a33b..aa9126f 100644 /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index c681c78..8ff15ce 100644 +index cb057ab..baad228 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -2512,4 +2512,18 @@ static inline unsigned int wined3d_log2i(unsigned int x) +@@ -2514,4 +2514,18 @@ static inline unsigned int wined3d_log2i(unsigned int x) #endif } diff --git a/patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch b/patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch index 09f7c15e..980479fe 100644 --- a/patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch +++ b/patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch @@ -1,4 +1,4 @@ -From c81211b6fa3814abbb6e1aa27a4c3c7913f6cf53 Mon Sep 17 00:00:00 2001 +From 5163b8b210cd569b06937be135140e393faa4661 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 4 Nov 2015 19:31:30 +0100 Subject: wined3d: Rename wined3d_resource_(un)map to @@ -21,10 +21,10 @@ To avoid name conflicts in the CSMT patchset. 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index 6ec154f..56fb86d 100644 +index 8a53e89..935b1ee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c -@@ -267,7 +267,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext +@@ -273,7 +273,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); @@ -33,7 +33,7 @@ index 6ec154f..56fb86d 100644 &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); wined3d_mutex_unlock(); -@@ -288,7 +288,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext +@@ -294,7 +294,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); @@ -43,7 +43,7 @@ index 6ec154f..56fb86d 100644 } diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c -index 11bda45..e24f945 100644 +index c6cdc29..a3f56b8 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -366,7 +366,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN @@ -171,10 +171,10 @@ index 0346f98..5b01fa7 100644 if (hr == WINEDDERR_NOTLOCKED) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c -index d133e7e..09a3cca 100644 +index 83457fc..7f51a1d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c -@@ -984,7 +984,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, +@@ -991,7 +991,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); if (SUCCEEDED(hr)) @@ -183,7 +183,7 @@ index d133e7e..09a3cca 100644 surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); if (FAILED(hr)) { -@@ -1159,7 +1159,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface +@@ -1166,7 +1166,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(pRect)); wined3d_mutex_lock(); @@ -227,10 +227,10 @@ index d133e7e..09a3cca 100644 if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index d032184..c410a47 100644 +index a9b9f0d..b772a9b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -3570,7 +3570,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, +@@ -3561,7 +3561,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { @@ -239,7 +239,7 @@ index d032184..c410a47 100644 src_level + i, &src, NULL, WINED3D_MAP_READONLY))) goto done; -@@ -3579,7 +3579,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, +@@ -3570,7 +3570,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data); wined3d_volume_invalidate_location(dst_texture->sub_resources[i].u.volume, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -248,7 +248,7 @@ index d032184..c410a47 100644 goto done; } -@@ -4228,7 +4228,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined +@@ -4282,7 +4282,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined struct wined3d_texture *texture; HRESULT hr; @@ -257,7 +257,7 @@ index d032184..c410a47 100644 { ERR("Failed to map source texture.\n"); return NULL; -@@ -4251,7 +4251,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined +@@ -4305,7 +4305,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, &data, NULL, &wined3d_null_parent_ops, &texture); @@ -266,7 +266,7 @@ index d032184..c410a47 100644 if (FAILED(hr)) { ERR("Failed to create cursor texture.\n"); -@@ -4332,7 +4332,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device +@@ -4386,7 +4386,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return E_OUTOFMEMORY; memset(mask_bits, 0xff, mask_size); @@ -275,7 +275,7 @@ index d032184..c410a47 100644 WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); cursor_info.fIcon = FALSE; cursor_info.xHotspot = x_hotspot; -@@ -4341,7 +4341,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device +@@ -4395,7 +4395,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device cursor_image->resource.height, 1, 1, mask_bits); cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, 1, 32, map_desc.data); @@ -307,10 +307,10 @@ index 423d162..0821fde 100644 TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c -index 574069b..da8b61c 100644 +index abbab26..4b17d32 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c -@@ -1997,25 +1997,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr +@@ -1759,25 +1759,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); @@ -341,7 +341,7 @@ index 574069b..da8b61c 100644 return dst_texture; } -@@ -3893,7 +3893,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int +@@ -3683,7 +3683,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) { same_sub_resource = TRUE; @@ -350,7 +350,7 @@ index 574069b..da8b61c 100644 src_map = dst_map; src_format = dst_texture->resource.format; dst_format = src_format; -@@ -3918,7 +3918,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int +@@ -3708,7 +3708,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_texture = converted_texture; src_sub_resource_idx = 0; } @@ -359,7 +359,7 @@ index 574069b..da8b61c 100644 src_format = src_texture->resource.format; src_fmt_flags = src_texture->resource.format_flags; } -@@ -3928,7 +3928,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int +@@ -3718,7 +3718,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_fmt_flags = dst_fmt_flags; } @@ -368,8 +368,8 @@ index 574069b..da8b61c 100644 } bpp = dst_format->byte_count; -@@ -4346,9 +4346,9 @@ error: - } +@@ -4134,9 +4134,9 @@ error: + FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_resource_unmap(&dst_texture->resource, dst_sub_resource_idx); @@ -381,7 +381,7 @@ index 574069b..da8b61c 100644 wined3d_texture_decref(converted_texture); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec -index 247e4de..48e2016 100644 +index 21cb0db..cfdc1c6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -181,10 +181,10 @@ @@ -398,10 +398,10 @@ index 247e4de..48e2016 100644 @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index e678c39..f8636a2 100644 +index cb057ab..cc35a2a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -2347,11 +2347,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, +@@ -2348,11 +2348,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc); void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);