From 7f17af3a420edfc37ea445b91bd532dd63d084ec Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 2 Dec 2021 10:14:53 +1100 Subject: [PATCH] Rebase against 6282718c73bdf1648f18764c51671a57cef3c526. --- ...rver-objects-for-eventfd-based-synch.patch | 2 +- ...ment-sortkey-generation-on-official-.patch | 20 ++++++++++--------- .../0003-nvcuda-First-implementation.patch | 4 ++-- ...wrap-stream-callbacks-by-forwarding-.patch | 6 +++--- .../0001-nvcuvid-First-implementation.patch | 2 +- ...001-nvencodeapi-First-implementation.patch | 2 +- patches/patchinstall.sh | 2 +- ...-implementation-of-SLTG-typelib-gene.patch | 2 +- staging/upstream-commit | 2 +- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch index 510f3666..d2982d22 100644 --- a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch +++ b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch @@ -53,7 +53,7 @@ index 00000000000..a571855c70a + */ + +#include "config.h" -+#include "wine/port.h" ++ + +#include +#include diff --git a/patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch b/patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch index 38196fbc..9609d99a 100644 --- a/patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch +++ b/patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch @@ -1,4 +1,4 @@ -From e5140396b7787d48d39f0b47876022c64fc1c2c7 Mon Sep 17 00:00:00 2001 +From 96bd1ab47a39d621c5f63264fb4bc415164d371c Mon Sep 17 00:00:00 2001 From: Fabian Maurer Date: Fri, 10 Apr 2020 18:47:18 +0200 Subject: [PATCH] kernelbase: Implement sortkey generation on official tables @@ -10,10 +10,10 @@ Signed-off-by: Fabian Maurer 2 files changed, 413 insertions(+), 123 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c -index c65c2cce3f2..a5d88288f27 100644 +index 94c9ce3ad1b..8447e67486c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c -@@ -2697,6 +2697,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f +@@ -2560,6 +2560,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); @@ -27,7 +27,7 @@ index c65c2cce3f2..a5d88288f27 100644 /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = func_ptr(0, upper_case, 0, buf, ARRAY_SIZE(buf)); -@@ -3126,6 +3133,135 @@ static void test_sorting(void) +@@ -2989,6 +2996,135 @@ static void test_sorting(void) } } @@ -163,14 +163,16 @@ index c65c2cce3f2..a5d88288f27 100644 static void test_FoldStringA(void) { int ret, i, j; -@@ -7191,4 +7327,5 @@ START_TEST(locale) +@@ -7201,6 +7337,7 @@ START_TEST(locale) test_NLSVersion(); test_geo_name(); test_sorting(); + test_unicode_sorting(); - } + test_EnumCalendarInfoA(); + test_EnumCalendarInfoW(); + test_EnumCalendarInfoExA(); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c -index 89b35775053..5da87e065f1 100644 +index 667d1a4dc65..095e0a68558 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2164,127 +2164,6 @@ static int wcstombs_codepage( UINT codepage, DWORD flags, const WCHAR *src, int @@ -582,7 +584,7 @@ index 89b35775053..5da87e065f1 100644 static const struct geoinfo *get_geoinfo_ptr( GEOID geoid ) { -@@ -5303,8 +5456,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co +@@ -5302,8 +5455,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co TRACE( "(%s,0x%08x,%s,%d,%p,%d)\n", debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen ); @@ -594,5 +596,5 @@ index 89b35775053..5da87e065f1 100644 } -- -2.30.2 +2.33.0 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index f48387d8..148af8cd 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -71,7 +71,7 @@ index 00000000000..664bdf84f51 + */ + +#include "config.h" -+#include "wine/port.h" ++#include + +#include +#include @@ -579,7 +579,7 @@ index f89ebc9d3e2..623c9f3c87a 100644 */ #include "config.h" -+#include "wine/port.h" ++#include + #include diff --git a/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch b/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch index c9134b29..74ceb374 100644 --- a/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch +++ b/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch @@ -1,4 +1,4 @@ -From c9ebf40c3752098c4366446467a544bbd2260ee6 Mon Sep 17 00:00:00 2001 +From eec8a6530c3bd63245571298d18d2cd31a85e220 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 22 Jan 2015 01:02:53 +0100 Subject: [PATCH] nvcuda: Properly wrap stream callbacks by forwarding them to @@ -21,11 +21,11 @@ index 20a66c90afb..7691c6aede3 100644 C_SRCS = \ internal.c \ diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 7b23abe6f90..117d78b6766 100644 +index 3618e746f35..a96db763754 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -21,10 +21,16 @@ - #include "wine/port.h" + #include #include +#include diff --git a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch index 4f27ed51..f96b3a8b 100644 --- a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch +++ b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch @@ -68,7 +68,7 @@ index 00000000000..616f883c329 + */ + +#include "config.h" -+#include "wine/port.h" ++#include + +#include + diff --git a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch index 5754cadd..5413ac46 100644 --- a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch +++ b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch @@ -69,7 +69,7 @@ index 00000000000..40be216485f + */ + +#include "config.h" -+#include "wine/port.h" ++#include + +#include + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6257f615..9610910e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "c0ea1ad37d3343c403d80ee18bf0d90c2699148b" + echo "6282718c73bdf1648f18764c51671a57cef3c526" } # Show version information diff --git a/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch b/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch index aee312f7..1abc3b1d 100644 --- a/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch +++ b/patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch @@ -93,7 +93,7 @@ index 00000000000..80e3b5f06a3 + */ + +#include "config.h" -+#include "wine/port.h" ++ + +#include +#include diff --git a/staging/upstream-commit b/staging/upstream-commit index 2af11706..da312080 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -c0ea1ad37d3343c403d80ee18bf0d90c2699148b +6282718c73bdf1648f18764c51671a57cef3c526