From 28a14dc978e501e8088705d8f25d46f74a0be115 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 31 Oct 2023 10:54:56 +1100 Subject: [PATCH] Rebase against 28210162472459d2afe57e638e2f50ee37f2b63f. --- ...se-minimum-SetTimer-interval-to-5-ms.patch | 33 ++++--------------- ...Create-.desktop-files-for-programs-t.patch | 20 +++++------ staging/upstream-commit | 2 +- 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch index dd59a657..073009aa 100644 --- a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch +++ b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch @@ -1,38 +1,17 @@ -From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001 +From ebe00ceb4f2d24f2611dbec87486d6597a3466a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 2 May 2014 20:46:19 +0200 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2) --- - dlls/user32/tests/msg.c | 2 ++ - dlls/win32u/message.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) + dlls/win32u/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c -index 4519da6962d..304a3b87f46 100644 ---- a/dlls/user32/tests/msg.c -+++ b/dlls/user32/tests/msg.c -@@ -10709,6 +10709,7 @@ static void test_timers(void) - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) - DispatchMessageA(&msg); -+todo_wine - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, -@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void) - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) - DispatchMessageA(&msg); -+todo_wine - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c -index d00178e6aa4..513150a3d61 100644 +index d2909339983..337d4a2cc1d 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c -@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME +@@ -3975,7 +3975,7 @@ UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE ); @@ -42,5 +21,5 @@ index d00178e6aa4..513150a3d61 100644 SERVER_START_REQ( set_win_timer ) { -- -2.35.1 +2.42.0 diff --git a/patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch b/patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch index 02e84159..db7dfe04 100644 --- a/patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch +++ b/patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch @@ -1,4 +1,4 @@ -From 71e7aebe51554503f7f1837104cf178d8073cb41 Mon Sep 17 00:00:00 2001 +From 5b017c755ef97d319ea48a99cd30f8636a13eaf6 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Sun, 7 May 2023 22:34:15 -0600 Subject: [PATCH] winemenubuilder: Create .desktop files for programs that open @@ -10,7 +10,7 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22904 1 file changed, 92 insertions(+), 65 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c -index 82fece62eb5..e97a6612b63 100644 +index abc8edb2ce9..2135ded3cf8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1831,10 +1831,13 @@ static BOOL has_association_changed(LPCWSTR extensionW, const WCHAR *mimeType, c @@ -49,9 +49,9 @@ index 82fece62eb5..e97a6612b63 100644 { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ if (!wcsicmp(extension, L".bat") || -@@ -1970,6 +1973,10 @@ static BOOL is_extension_banned(LPCWSTR extension) - !wcsicmp(extension, L".exe") || - !wcsicmp(extension, L".msi")) +@@ -1971,6 +1974,10 @@ static BOOL is_extension_banned(LPCWSTR extension) + !wcsicmp(extension, L".msi") || + !wcsicmp(extension, L".url")) return TRUE; + /* Associating a program with the file URI scheme is like associating it with all file types, which is not allowed + * for the same reasons */ @@ -60,7 +60,7 @@ index 82fece62eb5..e97a6612b63 100644 return FALSE; } -@@ -2042,11 +2049,15 @@ static BOOL write_freedesktop_association_entry(const WCHAR *desktopPath, const +@@ -2043,11 +2050,15 @@ static BOOL write_freedesktop_association_entry(const WCHAR *desktopPath, const if (prefix) { char *path = wine_get_unix_file_name( prefix ); @@ -78,7 +78,7 @@ index 82fece62eb5..e97a6612b63 100644 fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); if (openWithIcon) -@@ -2074,12 +2085,19 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2075,12 +2086,19 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic for (i = 0; ; i++) { @@ -101,7 +101,7 @@ index 82fece62eb5..e97a6612b63 100644 { WCHAR *commandW = NULL; WCHAR *executableW = NULL; -@@ -2093,7 +2111,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2094,7 +2112,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; @@ -110,7 +110,7 @@ index 82fece62eb5..e97a6612b63 100644 if (commandW == NULL) /* no command => no application is associated */ goto end; -@@ -2102,78 +2120,87 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2103,78 +2121,87 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic /* command is on the exclude list => desktop integration is not desirable */ goto end; @@ -250,7 +250,7 @@ index 82fece62eb5..e97a6612b63 100644 } free(desktopPath); } -@@ -2190,7 +2217,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2191,7 +2218,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic free(mimeType); free(progIdW); } diff --git a/staging/upstream-commit b/staging/upstream-commit index 50ba8836..3cdccf6b 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -8b5a60d2d73252e3796cc86fa14d4e549421a104 +28210162472459d2afe57e638e2f50ee37f2b63f