wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 35f82ba444930b770684f0bd623c505d52c7b58f.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-07-12 12:22:15 +02:00
parent 3ebda6fa93
commit 4c1a8684a0
10 changed files with 117 additions and 924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch
View File

@ -1,4 +1,4 @@
From d29f7e7f2e435ffee61f69eb488884b6d7043d0e Mon Sep 17 00:00:00 2001
From 16bc1dc30e86d07223f4ae5cff1b2dc0626ee793 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Fri, 19 Dec 2014 22:31:46 +0100
Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
2 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 864c3902fde..2de2058666a 100644
index 333feaba204..9929a9a6b23 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3891,13 +3891,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3934,13 +3934,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@ -58,10 +58,10 @@ index 864c3902fde..2de2058666a 100644
static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index f3bc9e3c36a..6fb770eafcb 100644
index b966b42a9b5..cbac3e2475b 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -6290,6 +6290,65 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device)
@@ -6984,6 +6984,65 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
@ -127,14 +127,14 @@ index f3bc9e3c36a..6fb770eafcb 100644
START_TEST(effect)
{
HWND wnd;
@@ -6341,6 +6400,7 @@ START_TEST(effect)
test_effect_shared_parameters(device);
@@ -7036,6 +7095,7 @@ START_TEST(effect)
test_effect_large_address_aware_flag(device);
test_effect_get_pass_desc(device);
test_effect_skip_constants(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);
ok(count == 0, "The device was not properly freed: refcount %u\n", count);
--
2.12.2
2.13.1

22
patches/kernel32-SetFileCompletionNotificationModes/0006-server-Skip-async-completion-when-possible.patch
View File

@ -1,4 +1,4 @@
From fcc8dc4d71db746ccc4b974eae02edd222d23313 Mon Sep 17 00:00:00 2001
From af4b00a0e6afd5a6512386e821a000411ca41b39 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 9 Apr 2017 03:13:25 +0200
Subject: server: Skip async completion when possible.
@ -25,7 +25,7 @@ index bda9a144ade..aa240edea21 100644
CloseHandle(ov.hEvent);
diff --git a/server/async.c b/server/async.c
index 020580728de..08daa9a2304 100644
index 1cb020f7d42..210617c0014 100644
--- a/server/async.c
+++ b/server/async.c
@@ -53,6 +53,7 @@ struct async
@ -39,12 +39,12 @@ index 020580728de..08daa9a2304 100644
@@ -237,6 +238,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da
async->wait_handle = 0;
async->direct_result = 0;
async->completion = NULL;
async->completion = fd_get_completion( fd, &async->comp_key );
+ async->comp_flags = 0;
if (iosb) async->iosb = (struct iosb *)grab_object( iosb );
else async->iosb = NULL;
@@ -249,7 +251,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da
@@ -256,7 +258,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da
/* create an async associated with iosb for async-based requests
* returned async must be passed to async_handoff */
@ -53,7 +53,7 @@ index 020580728de..08daa9a2304 100644
{
struct async *async;
struct iosb *iosb;
@@ -267,6 +269,7 @@ struct async *create_request_async( struct fd *fd, const async_data_t *data )
@@ -274,6 +276,7 @@ struct async *create_request_async( struct fd *fd, const async_data_t *data )
return NULL;
}
async->direct_result = 1;
@ -61,7 +61,7 @@ index 020580728de..08daa9a2304 100644
}
return async;
}
@@ -368,8 +371,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota
@@ -375,8 +378,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota
data.user.args[2] = 0;
thread_queue_apc( async->thread, NULL, &data );
}
@ -75,10 +75,10 @@ index 020580728de..08daa9a2304 100644
if (async->event) set_event( async->event );
else if (async->fd) set_fd_signaled( async->fd, 1 );
diff --git a/server/fd.c b/server/fd.c
index 18b1e04d448..d8f066c7219 100644
index 51f4eac0cd5..d13068c8468 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2374,7 +2374,7 @@ DECL_HANDLER(flush)
@@ -2422,7 +2422,7 @@ DECL_HANDLER(flush)
if (!fd) return;
@ -87,7 +87,7 @@ index 18b1e04d448..d8f066c7219 100644
{
reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL );
release_object( async );
@@ -2449,7 +2449,7 @@ DECL_HANDLER(read)
@@ -2497,7 +2497,7 @@ DECL_HANDLER(read)
if (!fd) return;
@ -96,7 +96,7 @@ index 18b1e04d448..d8f066c7219 100644
{
reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL );
reply->options = fd->options;
@@ -2466,7 +2466,7 @@ DECL_HANDLER(write)
@@ -2514,7 +2514,7 @@ DECL_HANDLER(write)
if (!fd) return;
@ -105,7 +105,7 @@ index 18b1e04d448..d8f066c7219 100644
{
reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size );
reply->options = fd->options;
@@ -2484,7 +2484,7 @@ DECL_HANDLER(ioctl)
@@ -2532,7 +2532,7 @@ DECL_HANDLER(ioctl)
if (!fd) return;

56
patches/patchinstall.sh
View File

@ -52,13 +52,13 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "a94938819280aa52fbc545911ca70a6c3a83ab49"
echo "35f82ba444930b770684f0bd623c505d52c7b58f"
}
# Show version information
version()
{
echo "Wine Staging 2.12"
echo "Wine Staging 2.13 (unreleased)"
echo "Copyright (C) 2014-2017 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
@ -407,6 +407,7 @@ patch_enable_all ()
enable_wbemdisp_ISWbemSecurity="$1"
enable_wbemprox_Printer="$1"
enable_wbemprox_Win32_VideoController="$1"
enable_webservices_Dead_Code="$1"
enable_wevtapi_EvtNext="$1"
enable_widl_SLTG_Typelib_Support="$1"
enable_windowscodecs_32bppGrayFloat="$1"
@ -444,8 +445,8 @@ patch_enable_all ()
enable_wined3d_Silence_FIXMEs="$1"
enable_wined3d_WINED3DFMT_R32G32_UINT="$1"
enable_wined3d_buffer_create="$1"
enable_wined3d_buffer_sync_apple="$1"
enable_wined3d_sample_c_lz="$1"
enable_wined3d_wined3d_event_query_create="$1"
enable_wined3d_wined3d_guess_gl_vendor="$1"
enable_winedbg_Process_Arguments="$1"
enable_winedevice_Default_Drivers="$1"
@ -1476,6 +1477,9 @@ patch_enable ()
wbemprox-Win32_VideoController)
enable_wbemprox_Win32_VideoController="$2"
;;
webservices-Dead_Code)
enable_webservices_Dead_Code="$2"
;;
wevtapi-EvtNext)
enable_wevtapi_EvtNext="$2"
;;
@ -1587,12 +1591,12 @@ patch_enable ()
wined3d-buffer_create)
enable_wined3d_buffer_create="$2"
;;
wined3d-buffer_sync_apple)
enable_wined3d_buffer_sync_apple="$2"
;;
wined3d-sample_c_lz)
enable_wined3d_sample_c_lz="$2"
;;
wined3d-wined3d_event_query_create)
enable_wined3d_wined3d_event_query_create="$2"
;;
wined3d-wined3d_guess_gl_vendor)
enable_wined3d_wined3d_guess_gl_vendor="$2"
;;
@ -8623,6 +8627,18 @@ if test "$enable_wbemprox_Win32_VideoController" -eq 1; then
) >> "$patchlist"
fi
# Patchset webservices-Dead_Code
# |
# | Modified files:
# | * dlls/webservices/reader.c
# |
if test "$enable_webservices_Dead_Code" -eq 1; then
patch_apply webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "webservices: Remove dead code in read_attribute_value_bin.", 1 },';
) >> "$patchlist"
fi
# Patchset wevtapi-EvtNext
# |
# | This patchset fixes the following Wine bugs:
@ -9285,22 +9301,6 @@ if test "$enable_wined3d_buffer_create" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-buffer_sync_apple
# |
# | This patchset fixes the following Wine bugs:
# | * [#43196] Fix regression related to buffer_sync_apple handling
# |
# | Modified files:
# | * dlls/wined3d/buffer.c, dlls/wined3d/context.c, dlls/wined3d/drawprim.c, dlls/wined3d/query.c,
# | dlls/wined3d/wined3d_private.h
# |
if test "$enable_wined3d_buffer_sync_apple" -eq 1; then
patch_apply wined3d-buffer_sync_apple/0001-wined3d-Fix-buffer_sync_apple-handling.patch
(
printf '%s\n' '+ { "Józef Kucia", "wined3d: Fix regression related to buffer_sync_apple handling.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-sample_c_lz
# |
# | This patchset fixes the following Wine bugs:
@ -9318,6 +9318,18 @@ if test "$enable_wined3d_sample_c_lz" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-wined3d_event_query_create
# |
# | Modified files:
# | * dlls/wined3d/query.c
# |
if test "$enable_wined3d_wined3d_event_query_create" -eq 1; then
patch_apply wined3d-wined3d_event_query_create/0001-wined3d-Return-hr-result-in-wined3d_event_query_crea.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Return hr result in wined3d_event_query_create.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-wined3d_guess_gl_vendor
# |
# | This patchset fixes the following Wine bugs:

28
patches/webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch Normal file
View File

@ -0,0 +1,28 @@
From 497be9c7987e7cd08a70cd33864729d06b8d1882 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 12 Jul 2017 05:26:04 +0200
Subject: webservices: Remove dead code in read_attribute_value_bin.
---
dlls/webservices/reader.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index 5bc862e5bf1..b94c35947c4 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -1582,11 +1582,6 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE
return WS_E_NOT_SUPPORTED;
}
- if (type >= RECORD_INT8_TEXT && type <= RECORD_INT64_TEXT)
- {
- attr->value = &text_int64->text;
- return S_OK;
- }
if (type >= RECORD_BYTES8_TEXT && type <= RECORD_BYTES32_TEXT)
{
attr->value = &text_base64->text;
--
2.13.1

12
patches/windowscodecs-GIF_Encoder/0009-gdiplus-Fix-a-typo-in-GIF-container-format-passed-to.patch
View File

@ -1,4 +1,4 @@
From bddc58a7a0c3bb53e46f107449c776b86e34aa80 Mon Sep 17 00:00:00 2001
From b20d8d374c84cd6fc2056c24b92832e9279ffaca Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 17 Oct 2016 15:23:39 +0800
Subject: gdiplus: Fix a typo in GIF container format passed to
@ -9,19 +9,19 @@ Subject: gdiplus: Fix a typo in GIF container format passed to
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 74fad29..af87236 100644
index 80ad65f050d..5ff48f8131e 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4512,7 +4512,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
@@ -4579,7 +4579,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
static GpStatus encode_image_gif(GpImage *image, IStream* stream,
GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)
GDIPCONST EncoderParameters* params)
{
- return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params);
+ return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params);
}
/*****************************************************************************
@@ -4525,7 +4525,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
@@ -4592,7 +4592,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
encode_image_func encode_image;
int i;
@ -31,5 +31,5 @@ index 74fad29..af87236 100644
if(!image || !stream)
return InvalidParameter;
--
2.9.0
2.13.1

8
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -619,7 +619,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2773,6 +2773,16 @@ struct wined3d_state
@@ -2771,6 +2771,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@ -636,7 +636,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
#define WINED3D_UNMAPPED_STAGE ~0u
/* Multithreaded flag. Removed from the public header to signal that
@@ -2884,6 +2894,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2882,6 +2892,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
@ -649,7 +649,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
{
@@ -3071,7 +3087,11 @@ struct wined3d_texture
@@ -3069,7 +3085,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@ -661,7 +661,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3386,6 +3406,9 @@ struct wined3d_cs_queue
@@ -3384,6 +3404,9 @@ struct wined3d_cs_queue
struct wined3d_cs_ops
{

871
patches/wined3d-buffer_sync_apple/0001-wined3d-Fix-buffer_sync_apple-handling.patch
View File

File diff suppressed because it is too large Load Diff

1
patches/wined3d-buffer_sync_apple/definition
View File

@ -1 +0,0 @@
Fixes: [43196] Fix regression related to buffer_sync_apple handling

25
patches/wined3d-wined3d_event_query_create/0001-wined3d-Return-hr-result-in-wined3d_event_query_crea.patch Normal file
View File

@ -0,0 +1,25 @@
From 7ba4a4ba6a474f812418040fc7e9aaafd0fb5c6c Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 12 Jul 2017 04:02:26 +0200
Subject: wined3d: Return hr result in wined3d_event_query_create.
---
dlls/wined3d/query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 7d726d08832..f1e780396bc 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -945,7 +945,7 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device,
{
WARN("Event queries not supported.\n");
HeapFree(GetProcessHeap(), 0, object);
- return WINED3DERR_NOTAVAILABLE;
+ return hr;
}
wined3d_query_init(&object->query, device, type, &object->signalled,
--
2.13.1

2
staging/VERSION
View File

@ -1 +1 @@
Wine Staging 2.12
Wine Staging 2.13 (unreleased)