wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 60d1d6f5952e8b5d6fb0327a28c047058851fa70.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-09-19 00:59:38 +02:00
parent 8ba35e61d8
commit ff889f6cdc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch
View File

@ -28,9 +28,9 @@ index f4a5c29..158491e 100644
+
+ wined3d = This->adapter->parent->wined3d;
+
+ EnterCriticalSection(&dxgi_cs);
+ wined3d_mutex_lock();
+ desc->Monitor = wined3d_get_adapter_monitor(wined3d, This->adapter->ordinal);
+ LeaveCriticalSection(&dxgi_cs);
+ wined3d_mutex_unlock();
+
+ if (!desc->Monitor)
+ return DXGI_ERROR_INVALID_CALL;

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "8fdcc239ba784894eed0f5c08ec56441db783e5e"
echo "60d1d6f5952e8b5d6fb0327a28c047058851fa70"
}
# Show version information