wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 192d335facd5ec6ff2b9acec615efff16385a416.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-10-01 16:58:46 -05:00
parent 78a888cd3d
commit 9c06e8eab3
8 changed files with 30 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
patches/ddraw-Device_Caps/0002-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch
View File

@@ -1,54 +0,0 @@
From 826f68ed53563b81d225b49131bbd3595c6d885b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 6 Sep 2015 20:21:42 +0200
Subject: [PATCH] ddraw: Set dwZBufferBitDepth in ddraw7_GetCaps.
---
dlls/ddraw/ddraw.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 8d608656143..cc8adccf049 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1434,6 +1434,28 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps)
return DD_OK;
}
+HRESULT CALLBACK enum_zbuffer(DDPIXELFORMAT *format, void *ctx)
+{
+ DDCAPS *caps = ctx;
+
+ switch (format->dwZBufferBitDepth)
+ {
+ case 8:
+ caps->dwZBufferBitDepths |= DDBD_8;
+ break;
+ case 16:
+ caps->dwZBufferBitDepths |= DDBD_16;
+ break;
+ case 24:
+ caps->dwZBufferBitDepths |= DDBD_24;
+ break;
+ case 32:
+ caps->dwZBufferBitDepths |= DDBD_32;
+ break;
+ }
+ return D3DENUMRET_OK;
+}
+
/*****************************************************************************
* IDirectDraw7::GetCaps
*
@@ -1514,6 +1536,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
+ IDirect3D7_EnumZBufferFormats(&ddraw->IDirect3D7_iface, &IID_IDirect3DHALDevice, enum_zbuffer, &caps);
+
caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps;
if(DriverCaps)
--
2.20.1

2
patches/ddraw-Device_Caps/definition
View File

@@ -1,2 +0,0 @@
Fixes: [37019] Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device
Fixes: [27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps

1
patches/ddraw-version-check/definition
View File

@@ -7,4 +7,3 @@
# Carmageddon 2 demo
# The Sims Online
Fixes: [19153] Resident Evil 1 fails to start (needs IDirect3D3::EnumDevices() to return a device named "RGB Emulation")
Depends: ddraw-Device_Caps

38
patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch
View File

@@ -1,4 +1,4 @@
From d1f7a457006ab95ec23b0dad5979daa7169fb832 Mon Sep 17 00:00:00 2001
From de5dc4769ee2493fbfc157d5b565c72d56613151 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 15 Mar 2015 01:05:48 +0100
Subject: [PATCH] server: Fix handling of GetMessage after previous PeekMessage
@@ -93,10 +93,10 @@ index c8a12a6f998..618eba3419a 100644
* because both messages are in the same queue. */
diff --git a/server/queue.c b/server/queue.c
index 268c921a914..70d9991e698 100644
index ffb1d441e60..60537685dc2 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -135,6 +135,7 @@ struct msg_queue
@@ -138,6 +138,7 @@ struct msg_queue
struct hook_table *hooks; /* hook table */
int keystate_lock; /* owns an input keystate lock */
queue_shm_t *shared; /* queue in session shared memory */
@@ -104,7 +104,7 @@ index 268c921a914..70d9991e698 100644
};
struct hotkey
@@ -318,6 +319,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
@@ -320,6 +321,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
queue->input = (struct thread_input *)grab_object( input );
queue->hooks = NULL;
queue->keystate_lock = 0;
@@ -113,7 +113,7 @@ index 268c921a914..70d9991e698 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -816,13 +819,21 @@ static inline struct msg_queue *get_current_queue(void)
@@ -827,13 +830,21 @@ static inline struct msg_queue *get_current_queue(void)
}
/* get a (pseudo-)unique id to tag hardware messages */
@@ -136,7 +136,7 @@ index 268c921a914..70d9991e698 100644
/* lookup an already queued mouse message that matches the message, window and type */
static struct message *find_mouse_message( struct thread_input *input, const struct message *msg )
{
@@ -1173,7 +1184,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
@@ -1184,7 +1195,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
}
/* retrieve a posted message */
@@ -145,7 +145,7 @@ index 268c921a914..70d9991e698 100644
unsigned int first, unsigned int last, unsigned int flags,
struct get_message_reply *reply )
{
@@ -1184,6 +1195,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
@@ -1195,6 +1206,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
{
if (!match_window( win, msg->win )) continue;
if (!check_msg_filter( msg->msg, first, last )) continue;
@@ -153,7 +153,7 @@ index 268c921a914..70d9991e698 100644
goto found; /* found one */
}
return 0;
@@ -1842,6 +1854,7 @@ found:
@@ -1857,6 +1869,7 @@ found:
msg->msg = WM_HOTKEY;
msg->wparam = hotkey->id;
msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@@ -161,7 +161,7 @@ index 268c921a914..70d9991e698 100644
free( msg->data );
msg->data = NULL;
@@ -2828,7 +2841,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -2843,7 +2856,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
}
/* now we can return it */
@@ -170,7 +170,7 @@ index 268c921a914..70d9991e698 100644
reply->type = MSG_HARDWARE;
reply->win = win;
reply->msg = msg_code;
@@ -2935,6 +2948,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
@@ -2950,6 +2963,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
msg->result = NULL;
msg->data = NULL;
msg->data_size = 0;
@@ -178,7 +178,7 @@ index 268c921a914..70d9991e698 100644
get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
@@ -3239,6 +3253,7 @@ DECL_HANDLER(send_message)
@@ -3254,6 +3268,7 @@ DECL_HANDLER(send_message)
set_queue_bits( recv_queue, QS_SENDMESSAGE );
break;
case MSG_POSTED:
@@ -186,7 +186,7 @@ index 268c921a914..70d9991e698 100644
list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry );
set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE );
if (msg->msg == WM_HOTKEY)
@@ -3379,12 +3394,12 @@ DECL_HANDLER(get_message)
@@ -3394,12 +3409,12 @@ DECL_HANDLER(get_message)
/* then check for posted messages */
if ((filter & QS_POSTMESSAGE) &&
@@ -201,7 +201,7 @@ index 268c921a914..70d9991e698 100644
return;
/* only check for quit messages if not posted messages pending */
@@ -3395,7 +3410,7 @@ DECL_HANDLER(get_message)
@@ -3410,7 +3425,7 @@ DECL_HANDLER(get_message)
if ((filter & QS_INPUT) &&
filter_contains_hw_range( req->get_first, req->get_last ) &&
get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply ))
@@ -210,7 +210,7 @@ index 268c921a914..70d9991e698 100644
/* now check for WM_PAINT */
if ((filter & QS_PAINT) &&
@@ -3408,7 +3423,7 @@ DECL_HANDLER(get_message)
@@ -3423,7 +3438,7 @@ DECL_HANDLER(get_message)
reply->wparam = 0;
reply->lparam = 0;
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@@ -219,7 +219,7 @@ index 268c921a914..70d9991e698 100644
}
/* now check for timer */
@@ -3424,9 +3439,19 @@ DECL_HANDLER(get_message)
@@ -3439,9 +3454,19 @@ DECL_HANDLER(get_message)
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
if (!(req->flags & PM_NOYIELD) && current->process->idle_event)
set_event( current->process->idle_event );
@@ -240,9 +240,9 @@ index 268c921a914..70d9991e698 100644
if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event );
SHARED_WRITE_BEGIN( queue_shm, queue_shm_t )
@@ -3438,6 +3463,13 @@ DECL_HANDLER(get_message)
reset_queue_sync( queue );
@@ -3454,6 +3479,13 @@ DECL_HANDLER(get_message)
if (!get_queue_status( queue )) reset_queue_sync( queue );
else signal_queue_sync( queue );
set_error( STATUS_PENDING ); /* FIXME */
+ return;
+
@@ -254,7 +254,7 @@ index 268c921a914..70d9991e698 100644
}
@@ -3455,7 +3487,10 @@ DECL_HANDLER(reply_message)
@@ -3471,7 +3503,10 @@ DECL_HANDLER(reply_message)
DECL_HANDLER(accept_hardware_message)
{
if (current->queue)

20
patches/server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch
View File

@@ -1,4 +1,4 @@
From f4a1348aaf4998e1d5c5a8014d38326982ce5f3d Mon Sep 17 00:00:00 2001
From 9af8e0fc4883258d1aa04179bcabed5057dd8af4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 12 Nov 2018 18:10:32 +0200
Subject: [PATCH] server: Do not signal violently terminated threads until they
@@ -27,10 +27,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/server/thread.c b/server/thread.c
index 05ec6a4ec00..b3b971548bc 100644
index 853aff4cc84..0943266457f 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -422,6 +422,7 @@ static inline void init_thread_structure( struct thread *thread )
@@ -426,6 +426,7 @@ static inline void init_thread_structure( struct thread *thread )
thread->token = NULL;
thread->desc = NULL;
thread->desc_len = 0;
@@ -38,15 +38,15 @@ index 05ec6a4ec00..b3b971548bc 100644
thread->creation_time = current_time;
thread->exit_time = 0;
@@ -642,6 +643,7 @@ static void destroy_thread( struct object *obj )
@@ -654,6 +655,7 @@ static void destroy_thread( struct object *obj )
list_remove( &thread->entry );
cleanup_thread( thread );
release_object( thread->process );
+ if (thread->exit_poll) remove_timeout_user( thread->exit_poll );
if (thread->id) free_ptid( thread->id );
if (thread->token) release_object( thread->token );
if (thread->sync) release_object( thread->sync );
@@ -1549,6 +1551,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
if (thread->alert_sync) release_object( thread->alert_sync );
@@ -1574,6 +1576,26 @@ int thread_get_inflight_fd( struct thread *thread, int client )
return -1;
}
@@ -73,7 +73,7 @@ index 05ec6a4ec00..b3b971548bc 100644
/* kill a thread on the spot */
void kill_thread( struct thread *thread, int violent_death )
{
@@ -1568,8 +1590,13 @@ void kill_thread( struct thread *thread, int violent_death )
@@ -1593,8 +1615,13 @@ void kill_thread( struct thread *thread, int violent_death )
}
kill_console_processes( thread, 0 );
abandon_mutexes( thread );
@@ -90,10 +90,10 @@ index 05ec6a4ec00..b3b971548bc 100644
remove_process_thread( thread->process, thread );
release_object( thread );
diff --git a/server/thread.h b/server/thread.h
index 58081be7481..d87f84603ef 100644
index 9c552a88ed2..c7e52d86672 100644
--- a/server/thread.h
+++ b/server/thread.h
@@ -95,6 +95,7 @@ struct thread
@@ -98,6 +98,7 @@ struct thread
data_size_t desc_len; /* thread description length in bytes */
WCHAR *desc; /* thread description string */
struct completion_wait *completion_wait; /* completion port wait object the thread is associated with */
@@ -102,5 +102,5 @@ index 58081be7481..d87f84603ef 100644
extern struct thread *current;
--
2.47.2
2.51.0

134
patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch
View File

@@ -1,134 +0,0 @@
From 98419c58be94ecff277ad08c503affd6ffa133ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 16 Mar 2014 03:19:39 +0100
Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config
Manager\Enum
---
programs/wineboot/wineboot.c | 100 +++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index dfa3f6dd738..77708b40122 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -912,16 +912,116 @@ static void create_hardware_registry_keys(void)
free( buf );
}
+struct dyndata_enum_key{
+ WCHAR id[9];
+ WCHAR hardwarekey[64];
+ char problem[4];
+ char status[4];
+ char allocation[12];
+ char child[4];
+ char sibling[4];
+ char parent[4];
+};
+
+static struct dyndata_enum_key predefined_enums[] =
+{
+ {
+ {'C','2','9','A','2','3','D','0',0},
+ {'H','T','R','E','E','\\','R','O','O','T','\\','0',0},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x4e, 0x08, 0x08, 0x1a},
+ {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x40, 0x5a, 0x9a, 0xc2},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x00, 0x00, 0x00, 0x00}
+ },
+ {
+ {'C','2','9','A','5','A','4','0',0},
+ {'H','T','R','E','E','\\','R','E','S','E','R','V','E','D','\\','0',0},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x4e, 0x08, 0x08, 0x18},
+ {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x60, 0x5c, 0x9a, 0xc2},
+ {0xd0, 0x23, 0x9a, 0xc2}
+ },
+ {
+ {'C','2','9','A','5','C','6','0',0},
+ {'R','O','O','T','\\','N','E','T','\\','0','0','0','0',0},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x4f, 0x6a, 0x08, 0x18},
+ {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0xf0, 0x93, 0x9b, 0xc2},
+ {0xc0, 0x5d, 0x9a, 0xc2},
+ {0xd0, 0x23, 0x9a, 0xc2}
+ },
+ {
+ {'C','2','9','A','5','D','C','0',0},
+ {'R','O','O','T','\\','P','R','O','C','E','S','S','O','R','_','U','P','D','A','T','E','\\','0','0','0','0',0},
+ {0x00, 0x00, 0x00, 0x00},
+ {0xcf, 0x6a, 0x88, 0x19},
+ {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x20, 0x5f, 0x9a, 0xc2},
+ {0xd0, 0x23, 0x9a, 0xc2}
+ },
+ {
+ {'C','2','9','A','5','F','2','0',0},
+ {'R','O','O','T','\\','S','W','E','N','U','M','\\','0','0','0','0',0},
+ {0x00, 0x00, 0x00, 0x00},
+ {0xcf, 0x6a, 0x88, 0x19},
+ {0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+ {0x00, 0x00, 0x00, 0x00},
+ {0x20, 0x5f, 0x9a, 0xc2},
+ {0xd0, 0x23, 0x9a, 0xc2}
+ }
+};
+
+/* add entry to HKEY_DYN_DATA\Config Manager\Enum */
+static void add_dynamic_enum_keys(HKEY key, struct dyndata_enum_key *entry)
+{
+ static const WCHAR HardWareKeyW[] = {'H','a','r','d','W','a','r','e','K','e','y',0};
+ static const WCHAR ProblemW[] = {'P','r','o','b','l','e','m',0};
+ static const WCHAR StatusW[] = {'S','t','a','t','u','s',0};
+ static const WCHAR AllocationW[] = {'A','l','l','o','c','a','t','i','o','n',0};
+ static const WCHAR ChildW[] = {'C','h','i','l','d',0};
+ static const WCHAR SiblingW[] = {'S','i','b','l','i','n','g',0};
+ static const WCHAR ParentW[] = {'P','a','r','e','n','t',0};
+
+ HKEY subkey;
+
+ if (!entry)
+ return;
+
+ if (RegCreateKeyExW( key, entry->id, 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL ))
+ return;
+
+ set_reg_value( subkey, HardWareKeyW, entry->hardwarekey );
+ RegSetValueExW( subkey, ProblemW, 0, REG_BINARY, (const BYTE *)entry->problem, sizeof(entry->problem) );
+ RegSetValueExW( subkey, StatusW, 0, REG_BINARY, (const BYTE *)entry->status, sizeof(entry->status) );
+ RegSetValueExW( subkey, AllocationW, 0, REG_BINARY, (const BYTE *)entry->allocation, sizeof(entry->allocation) );
+ RegSetValueExW( subkey, ChildW, 0, REG_BINARY, (const BYTE *)entry->child, sizeof(entry->child) );
+ RegSetValueExW( subkey, SiblingW, 0, REG_BINARY, (const BYTE *)entry->sibling, sizeof(entry->sibling) );
+ RegSetValueExW( subkey, ParentW, 0, REG_BINARY, (const BYTE *)entry->parent, sizeof(entry->parent) );
+
+ RegCloseKey( subkey );
+}
/* create the DynData registry keys */
static void create_dynamic_registry_keys(void)
{
HKEY key;
+ int entry;
if (!RegCreateKeyExW( HKEY_DYN_DATA, L"PerfStats\\StatData", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL ))
RegCloseKey( key );
if (!RegCreateKeyExW( HKEY_DYN_DATA, L"Config Manager\\Enum", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL ))
+ {
+ for (entry = 0; entry < sizeof(predefined_enums) / sizeof(predefined_enums[0]); entry++)
+ add_dynamic_enum_keys( key, &predefined_enums[entry] );
+
RegCloseKey( key );
+ }
}
/* create the ComputerName registry keys */
--
2.43.0

1
patches/wineboot-HKEY_DYN_DATA/definition
View File

@@ -1 +0,0 @@
Fixes: [7115] Need for Speed 3 installer requires devices in HKEY_DYN_DATA

2
staging/upstream-commit
View File

@@ -1 +1 @@
bcd3e1a4de9d6efb177b932a937412bfb962d149
192d335facd5ec6ff2b9acec615efff16385a416