From 6d78916f986ebd057ab82ca2805b624694bea594 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 19 Jan 2016 19:33:28 +0100 Subject: [PATCH] Rebase against d1841f496b423afa0e29cd7da87cfd297e5e8054. --- ...Fix-most-problems-with-CompareString.patch | 12 ++--- ...b-for-_SetWinRTOutOfMemoryExceptionC.patch | 12 ++--- ...l-Use-wrapper-functions-for-syscalls.patch | 48 +++++++++---------- patches/patchinstall.sh | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch b/patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch index 6b6c0ed7..c3d4fc20 100644 --- a/patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch +++ b/patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch @@ -1,4 +1,4 @@ -From 9a4f8fae5a735a8ceeec6136b548420abb69f336 Mon Sep 17 00:00:00 2001 +From a72962dc4ff3d6126e105aec97cfcb88da535b81 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 28 Jul 2003 07:39:25 -0500 Subject: libs: Fix most problems with CompareString. @@ -9,10 +9,10 @@ Subject: libs: Fix most problems with CompareString. 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c -index 7b0212e..cba3ebc 100644 +index b760e9a..6317112 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c -@@ -1759,13 +1759,13 @@ static void test_CompareStringA(void) +@@ -1761,13 +1761,13 @@ static void test_CompareStringA(void) todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n"); ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1); @@ -29,10 +29,10 @@ index 7b0212e..cba3ebc 100644 lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT); -@@ -4600,6 +4600,5 @@ START_TEST(locale) - test_GetGeoInfo(); +@@ -4801,6 +4801,5 @@ START_TEST(locale) test_EnumSystemGeoID(); test_invariant(); + test_GetSystemPreferredUILanguages(); - /* this requires collation table patch to make it MS compatible */ - if (0) test_sorting(); + test_sorting(); @@ -168,5 +168,5 @@ index 465d740..f354a75 100644 0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121, 0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161, -- -2.6.2 +2.6.4 diff --git a/patches/msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch b/patches/msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch index 48688481..2be0655e 100644 --- a/patches/msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch +++ b/patches/msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch @@ -1,4 +1,4 @@ -From 9bbb0f1cc3c59fad8fce55cf004583cc8a86a825 Mon Sep 17 00:00:00 2001 +From e10eaddb1261c79cb80fc99172e1f53b1b7daf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 12:58:17 +0100 Subject: msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. @@ -10,7 +10,7 @@ Subject: msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec -index b738155..a46e1ac 100644 +index 461b529..67c7fc4 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -844,7 +844,7 @@ @@ -23,7 +23,7 @@ index b738155..a46e1ac 100644 @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec -index ec18f21..b7424a0 100644 +index 425c839..ff71998 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -838,7 +838,7 @@ @@ -36,12 +36,12 @@ index ec18f21..b7424a0 100644 @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c -index 4e9f288..cc6891b 100644 +index c1510ef..6842f1e 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c -@@ -498,3 +498,11 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) +@@ -506,3 +506,11 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { - __ms_va_copy(*dest, src); + WARN("(%x)\n", reserved); } + +/********************************************************************* diff --git a/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch b/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch index e35de3cf..49c22cb1 100644 --- a/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch +++ b/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch @@ -1,4 +1,4 @@ -From 1c1594071a0ab0aadcf7a5f0b422dc46b66745d8 Mon Sep 17 00:00:00 2001 +From a6e5e1a95b0879808e629e6e2ba617c2e68d7608 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 16 Oct 2015 02:32:58 +0200 Subject: ntdll: Use wrapper functions for syscalls. @@ -950,10 +950,10 @@ index 5a5c3ef..c7a0a8a 100644 { NTSTATUS status; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c -index be95a2a..3831d56 100644 +index 9223cb4..eec1db0 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c -@@ -51,7 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +@@ -49,7 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); * NtCreateKey [NTDLL.@] * ZwCreateKey [NTDLL.@] */ @@ -992,8 +992,8 @@ index be95a2a..3831d56 100644 +NTSTATUS WINAPI SYSCALL(NtOpenKeyEx)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; - DWORD len; -@@ -161,19 +165,22 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT + +@@ -157,19 +161,22 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT * IN ACCESS_MASK access * IN POBJECT_ATTRIBUTES attr */ @@ -1019,7 +1019,7 @@ index be95a2a..3831d56 100644 HANDLE transaction ) { return NtOpenKeyTransactedEx( retkey, access, attr, 0, transaction ); -@@ -195,7 +202,8 @@ NTSTATUS WINAPI RtlpNtOpenKey( PHANDLE retkey, ACCESS_MASK access, OBJECT_ATTRIB +@@ -191,7 +198,8 @@ NTSTATUS WINAPI RtlpNtOpenKey( PHANDLE retkey, ACCESS_MASK access, OBJECT_ATTRIB * NtDeleteKey [NTDLL.@] * ZwDeleteKey [NTDLL.@] */ @@ -1029,7 +1029,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; -@@ -224,7 +232,8 @@ NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HANDLE hkey ) +@@ -220,7 +228,8 @@ NTSTATUS WINAPI RtlpNtMakeTemporaryKey( HANDLE hkey ) * NtDeleteValueKey [NTDLL.@] * ZwDeleteValueKey [NTDLL.@] */ @@ -1039,7 +1039,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; -@@ -368,7 +377,8 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i +@@ -364,7 +373,8 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i * NOTES * the name copied into the buffer is NOT 0-terminated */ @@ -1049,7 +1049,7 @@ index be95a2a..3831d56 100644 void *info, DWORD length, DWORD *result_len ) { /* -1 means query key, so avoid it here */ -@@ -427,7 +437,8 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG +@@ -423,7 +433,8 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG * NtQueryKey [NTDLL.@] * ZwQueryKey [NTDLL.@] */ @@ -1059,7 +1059,7 @@ index be95a2a..3831d56 100644 void *info, DWORD length, DWORD *result_len ) { return enumerate_key( handle, -1, info_class, info, length, result_len ); -@@ -482,7 +493,8 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i +@@ -478,7 +489,8 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i * NtEnumerateValueKey [NTDLL.@] * ZwEnumerateValueKey [NTDLL.@] */ @@ -1069,7 +1069,7 @@ index be95a2a..3831d56 100644 KEY_VALUE_INFORMATION_CLASS info_class, void *info, DWORD length, DWORD *result_len ) { -@@ -530,7 +542,8 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, +@@ -526,7 +538,8 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, * NOTES * the name in the KeyValueInformation is never set */ @@ -1079,7 +1079,7 @@ index be95a2a..3831d56 100644 KEY_VALUE_INFORMATION_CLASS info_class, void *info, DWORD length, DWORD *result_len ) { -@@ -632,7 +645,8 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE de +@@ -628,7 +641,8 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE de * NtFlushKey [NTDLL.@] * ZwFlushKey [NTDLL.@] */ @@ -1089,7 +1089,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; -@@ -652,7 +666,8 @@ NTSTATUS WINAPI NtFlushKey(HANDLE key) +@@ -648,7 +662,8 @@ NTSTATUS WINAPI NtFlushKey(HANDLE key) * NtLoadKey [NTDLL.@] * ZwLoadKey [NTDLL.@] */ @@ -1099,7 +1099,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; HANDLE hive; -@@ -682,7 +697,8 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil +@@ -681,7 +696,8 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil * NtNotifyChangeMultipleKeys [NTDLL.@] * ZwNotifyChangeMultipleKeys [NTDLL.@] */ @@ -1109,7 +1109,7 @@ index be95a2a..3831d56 100644 HANDLE KeyHandle, ULONG Count, OBJECT_ATTRIBUTES *SubordinateObjects, -@@ -738,7 +754,8 @@ NTSTATUS WINAPI NtNotifyChangeMultipleKeys( +@@ -737,7 +753,8 @@ NTSTATUS WINAPI NtNotifyChangeMultipleKeys( * NtNotifyChangeKey [NTDLL.@] * ZwNotifyChangeKey [NTDLL.@] */ @@ -1119,7 +1119,7 @@ index be95a2a..3831d56 100644 IN HANDLE KeyHandle, IN HANDLE Event, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, -@@ -760,7 +777,8 @@ NTSTATUS WINAPI NtNotifyChangeKey( +@@ -759,7 +776,8 @@ NTSTATUS WINAPI NtNotifyChangeKey( * ZwQueryMultipleValueKey */ @@ -1129,7 +1129,7 @@ index be95a2a..3831d56 100644 HANDLE KeyHandle, PKEY_MULTIPLE_VALUE_INFORMATION ListOfValuesToQuery, ULONG NumberOfItems, -@@ -778,7 +796,8 @@ NTSTATUS WINAPI NtQueryMultipleValueKey( +@@ -777,7 +795,8 @@ NTSTATUS WINAPI NtQueryMultipleValueKey( * NtReplaceKey [NTDLL.@] * ZwReplaceKey [NTDLL.@] */ @@ -1139,7 +1139,7 @@ index be95a2a..3831d56 100644 IN POBJECT_ATTRIBUTES ObjectAttributes, IN HANDLE Key, IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) -@@ -791,7 +810,8 @@ NTSTATUS WINAPI NtReplaceKey( +@@ -790,7 +809,8 @@ NTSTATUS WINAPI NtReplaceKey( * NtRestoreKey [NTDLL.@] * ZwRestoreKey [NTDLL.@] */ @@ -1149,7 +1149,7 @@ index be95a2a..3831d56 100644 HANDLE KeyHandle, HANDLE FileHandle, ULONG RestoreFlags) -@@ -804,7 +824,8 @@ NTSTATUS WINAPI NtRestoreKey( +@@ -803,7 +823,8 @@ NTSTATUS WINAPI NtRestoreKey( * NtSaveKey [NTDLL.@] * ZwSaveKey [NTDLL.@] */ @@ -1159,7 +1159,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; -@@ -824,7 +845,8 @@ NTSTATUS WINAPI NtSaveKey(IN HANDLE KeyHandle, IN HANDLE FileHandle) +@@ -823,7 +844,8 @@ NTSTATUS WINAPI NtSaveKey(IN HANDLE KeyHandle, IN HANDLE FileHandle) * NtSetInformationKey [NTDLL.@] * ZwSetInformationKey [NTDLL.@] */ @@ -1169,7 +1169,7 @@ index be95a2a..3831d56 100644 IN HANDLE KeyHandle, IN const int KeyInformationClass, IN PVOID KeyInformation, -@@ -844,7 +866,8 @@ NTSTATUS WINAPI NtSetInformationKey( +@@ -843,7 +865,8 @@ NTSTATUS WINAPI NtSetInformationKey( * win95 does not care about count for REG_SZ and finds out the len by itself (js) * NT does definitely care (aj) */ @@ -1179,7 +1179,7 @@ index be95a2a..3831d56 100644 ULONG type, const void *data, ULONG count ) { NTSTATUS ret; -@@ -883,7 +906,8 @@ NTSTATUS WINAPI RtlpNtSetValueKey( HANDLE hkey, ULONG type, const void *data, +@@ -882,7 +905,8 @@ NTSTATUS WINAPI RtlpNtSetValueKey( HANDLE hkey, ULONG type, const void *data, * NtUnloadKey [NTDLL.@] * ZwUnloadKey [NTDLL.@] */ @@ -1189,7 +1189,7 @@ index be95a2a..3831d56 100644 { NTSTATUS ret; -@@ -1490,7 +1514,8 @@ NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR nam +@@ -1489,7 +1513,8 @@ NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR nam * unless there is some app which explicitly depends on that, there is * no good reason to reproduce that. */ @@ -1381,7 +1381,7 @@ index 0c64541..ad00eb6 100644 NTSTATUS status = raise_exception( rec, context, first_chance ); if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c -index a6de6a1..9004c75 100644 +index 47b27d3..91f1396 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -157,7 +157,8 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4440f6c6..791e28a2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4083af404b2ef9e0b0928a6f685f2efa8567c80b" + echo "d1841f496b423afa0e29cd7da87cfd297e5e8054" } # Show version information