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 81c8c73de299c0d61d1fff8ad9b88a9deb5b9479.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-09-26 09:26:16 +10:00
parent d2cf83298d
commit 8bfcd6ad7d
3 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/d3dx9_36-D3DXStubs/0003-d3dx9-Implement-D3DXComputeTangent.patch
View File

@ -210,7 +210,7 @@ index 984b2f6..a206e06 100644
+HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx,
+ DWORD binorm_idx, DWORD wrap, const DWORD *adjacency)
+{
+ TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n",
+ TRACE("mesh %p, stage_idx %ld, tangent_idx %ld, binorm_idx %ld, wrap %ld, adjacency %p.\n",
+ mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency);
+
+ return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx,

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

@ -1,4 +1,4 @@
From 8207b28257d14ec36812ce1a846a7ac62f453b0e Mon Sep 17 00:00:00 2001
From 64bdd8316ca10dd8bd474abb1fe7377dfd678762 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
@ -10,60 +10,63 @@ Changes in v2:
Changes in v3:
* Fix remaining todo_wine.
---
dlls/user32/tests/msg.c | 29 ++++++++++++++++--------
dlls/user32/tests/msg.c | 32 ++++++++++++++++++--------
server/queue.c | 50 ++++++++++++++++++++++++++++++++++-------
2 files changed, 62 insertions(+), 17 deletions(-)
2 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 03ab672f910..0943ee8e99b 100644
index 8b89d92cbf1..e7f133899ed 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -13808,13 +13808,10 @@ static void test_PeekMessage3(void)
@@ -14012,13 +14012,10 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE);
ret = PeekMessageA(&msg, hwnd, 0, 0, PM_NOREMOVE);
- todo_wine
ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -13824,10 +13821,8 @@ static void test_PeekMessage3(void)
@@ -14028,10 +14025,8 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE);
ret = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE);
- todo_wine
ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE);
ret = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE);
- todo_wine
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -13839,10 +13834,8 @@ static void test_PeekMessage3(void)
@@ -14043,10 +14038,11 @@ static void test_PeekMessage3(void)
ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
PostMessageA(hwnd, WM_USER, 0, 0);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
+ ret = GetMessageA(&msg, NULL, 0, 0);
+ ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
+ ret = GetMessageA(&msg, NULL, 0, 0);
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
@@ -13870,14 +13863,32 @@ static void test_PeekMessage3(void)
ret = GetMessageA(&msg, NULL, 0, 0);
@@ -14074,14 +14070,32 @@ static void test_PeekMessage3(void)
ret = GetMessageA(&msg, hwnd, 0, 0);
ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
ret = GetMessageA(&msg, NULL, 0, 0);
ret = GetMessageA(&msg, hwnd, 0, 0);
- todo_wine
ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message);
ret = PeekMessageA(&msg, NULL, 0, 0, 0);
ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
+ /* Newer messages are still returned when specifying a message range. */
@ -90,7 +93,7 @@ index 03ab672f910..0943ee8e99b 100644
* because both messages are in the same queue. */
diff --git a/server/queue.c b/server/queue.c
index 1e2647aac27..b3390f17ba5 100644
index fcc946ff0cb..348fdac3214 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -142,6 +142,7 @@ struct msg_queue
@ -109,7 +112,7 @@ index 1e2647aac27..b3390f17ba5 100644
list_init( &queue->send_result );
list_init( &queue->callback_result );
list_init( &queue->pending_timers );
@@ -592,13 +594,21 @@ static inline struct msg_queue *get_current_queue(void)
@@ -634,13 +636,21 @@ static inline struct msg_queue *get_current_queue(void)
}
/* get a (pseudo-)unique id to tag hardware messages */
@ -132,7 +135,7 @@ index 1e2647aac27..b3390f17ba5 100644
/* try to merge a WM_MOUSEMOVE message with the last in the list; return 1 if successful */
static int merge_mousemove( struct thread_input *input, const struct message *msg )
{
@@ -908,7 +918,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
@@ -951,7 +961,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
}
/* retrieve a posted message */
@ -141,7 +144,7 @@ index 1e2647aac27..b3390f17ba5 100644
unsigned int first, unsigned int last, unsigned int flags,
struct get_message_reply *reply )
{
@@ -919,6 +929,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
@@ -962,6 +972,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;
@ -149,7 +152,7 @@ index 1e2647aac27..b3390f17ba5 100644
goto found; /* found one */
}
return 0;
@@ -1536,6 +1547,7 @@ found:
@@ -1576,6 +1587,7 @@ found:
msg->msg = WM_HOTKEY;
msg->wparam = hotkey->id;
msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@ -157,7 +160,7 @@ index 1e2647aac27..b3390f17ba5 100644
free( msg->data );
msg->data = NULL;
@@ -2226,7 +2238,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -2267,7 +2279,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
}
/* now we can return it */
@ -166,7 +169,7 @@ index 1e2647aac27..b3390f17ba5 100644
reply->type = MSG_HARDWARE;
reply->win = win;
reply->msg = msg_code;
@@ -2364,6 +2376,7 @@ void send_notify_message( user_handle_t win, unsigned int message, lparam_t wpar
@@ -2373,6 +2385,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;
@ -174,7 +177,7 @@ index 1e2647aac27..b3390f17ba5 100644
get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
@@ -2576,6 +2589,7 @@ DECL_HANDLER(send_message)
@@ -2617,6 +2630,7 @@ DECL_HANDLER(send_message)
set_queue_bits( recv_queue, QS_SENDMESSAGE );
break;
case MSG_POSTED:
@ -182,7 +185,7 @@ index 1e2647aac27..b3390f17ba5 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)
@@ -2694,12 +2708,12 @@ DECL_HANDLER(get_message)
@@ -2735,12 +2749,12 @@ DECL_HANDLER(get_message)
/* then check for posted messages */
if ((filter & QS_POSTMESSAGE) &&
@ -197,7 +200,7 @@ index 1e2647aac27..b3390f17ba5 100644
return;
/* only check for quit messages if not posted messages pending */
@@ -2710,7 +2724,7 @@ DECL_HANDLER(get_message)
@@ -2751,7 +2765,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 ))
@ -206,7 +209,7 @@ index 1e2647aac27..b3390f17ba5 100644
/* now check for WM_PAINT */
if ((filter & QS_PAINT) &&
@@ -2723,7 +2737,7 @@ DECL_HANDLER(get_message)
@@ -2764,7 +2778,7 @@ DECL_HANDLER(get_message)
reply->wparam = 0;
reply->lparam = 0;
get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@ -215,7 +218,7 @@ index 1e2647aac27..b3390f17ba5 100644
}
/* now check for timer */
@@ -2739,13 +2753,30 @@ DECL_HANDLER(get_message)
@@ -2780,13 +2794,30 @@ 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 );
@ -247,7 +250,7 @@ index 1e2647aac27..b3390f17ba5 100644
}
@@ -2763,7 +2794,10 @@ DECL_HANDLER(reply_message)
@@ -2804,7 +2835,10 @@ DECL_HANDLER(reply_message)
DECL_HANDLER(accept_hardware_message)
{
if (current->queue)

2
staging/upstream-commit
View File

@ -1 +1 @@
56e58cbed19bb5307598d4f433d5b3f01af91a1b
81c8c73de299c0d61d1fff8ad9b88a9deb5b9479