wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 630f5e97b12c1bc934e44a632d30e9129651bb06.

Browse Source 
[mmdevapi-AEV_Stubs]
Removed patches to improve various AudioEndpointVolume stubs (similar patch
accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-03-11 18:21:21 +01:00
parent 91aa96cd37
commit 577b0d91dc
6 changed files with 18 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch
View File

@@ -1,4 +1,4 @@
From da658e5cdaf5731bfbf776f7c0e95c64c0d25f83 Mon Sep 17 00:00:00 2001
From ec5f680e18fcd9cc1b601cec01fb2bc289b966ba Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 4 Nov 2015 19:31:30 +0100
Subject: wined3d: Rename wined3d_resource_(un)map to
@@ -21,7 +21,7 @@ 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 8b7d2f8..d9cb43d 100644
index 6ec154f..56fb86d 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -267,7 +267,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext
@@ -105,7 +105,7 @@ index 565f642..c0f20eb 100644
switch(hr)
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index f3a30a8..71a84ed 100644
index dd75fff..639988b 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -146,7 +146,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface,
@@ -125,7 +125,7 @@ index f3a30a8..71a84ed 100644
+ hr = wined3d_resource_sub_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx);
wined3d_mutex_unlock();
return hr;
if (hr == WINEDDERR_NOTLOCKED)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index a0a1f27..8a718a8 100644
--- a/dlls/d3d9/surface.c
@@ -149,7 +149,7 @@ index a0a1f27..8a718a8 100644
switch(hr)
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index d92f555..9a8ef54 100644
index c032a01..24067dd 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -146,7 +146,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
@@ -169,7 +169,7 @@ index d92f555..9a8ef54 100644
+ hr = wined3d_resource_sub_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx);
wined3d_mutex_unlock();
return hr;
if (hr == WINEDDERR_NOTLOCKED)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index d133e7e..09a3cca 100644
--- a/dlls/ddraw/surface.c
@@ -227,7 +227,7 @@ 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 f094752..2330ebe 100644
index d032184..c410a47 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,
@@ -248,7 +248,7 @@ index f094752..2330ebe 100644
goto done;
}
@@ -4236,7 +4236,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
@@ -4228,7 +4228,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
struct wined3d_texture *texture;
HRESULT hr;
@@ -257,7 +257,7 @@ index f094752..2330ebe 100644
{
ERR("Failed to map source texture.\n");
return NULL;
@@ -4259,7 +4259,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
@@ -4251,7 +4251,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 f094752..2330ebe 100644
if (FAILED(hr))
{
ERR("Failed to create cursor texture.\n");
@@ -4340,7 +4340,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
@@ -4332,7 +4332,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 f094752..2330ebe 100644
WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY);
cursor_info.fIcon = FALSE;
cursor_info.xHotspot = x_hotspot;
@@ -4349,7 +4349,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
@@ -4341,7 +4341,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 814d4ab..e156bd8 100644
index 1169c00..d09289c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2005,25 +2005,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
@@ -1997,25 +1997,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 814d4ab..e156bd8 100644
return dst_texture;
}
@@ -4120,7 +4120,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -4046,7 +4046,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 814d4ab..e156bd8 100644
src_map = dst_map;
src_format = dst_texture->resource.format;
dst_format = src_format;
@@ -4145,7 +4145,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -4071,7 +4071,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 814d4ab..e156bd8 100644
src_format = src_texture->resource.format;
src_fmt_flags = src_texture->resource.format_flags;
}
@@ -4155,7 +4155,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -4081,7 +4081,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
src_fmt_flags = dst_fmt_flags;
}
@@ -368,7 +368,7 @@ index 814d4ab..e156bd8 100644
}
bpp = dst_format->byte_count;
@@ -4573,9 +4573,9 @@ error:
@@ -4499,9 +4499,9 @@ error:
}
release: