diff --git a/patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch b/patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch index 575f177e..22d16244 100644 --- a/patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch +++ b/patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch @@ -121,7 +121,7 @@ index cacb7ea7751..19a807c1624 100644 + WINE_TRACE("Process still running, but returning anyway\n"); + errorlevel = 0; + } else { -+ WINE_TRACE("Process ended, errorlevel %d\n", errorlevel); ++ WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel); + } + + CloseHandle(pe.hProcess); @@ -160,7 +160,7 @@ index cacb7ea7751..19a807c1624 100644 - GetExitCodeProcess (pe.hProcess, &errorlevel); - if (errorlevel == STILL_ACTIVE) errorlevel = 0; + if (!status) { -+ WINE_TRACE("Failed to launch via CreateProcess, rc %d (%d)\n", ++ WINE_TRACE("Failed to launch via CreateProcess, rc %d (%ld)\n", + status, GetLastError()); + break; + } @@ -180,7 +180,7 @@ index cacb7ea7751..19a807c1624 100644 + WINE_TRACE("Process still running, but returning anyway\n"); + errorlevel = 0; + } else { -+ WINE_TRACE("Process ended, errorlevel %d\n", errorlevel); ++ WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel); + } + + CloseHandle(pe.hProcess); diff --git a/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch b/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch index 088a8094..c559436f 100644 --- a/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch +++ b/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch @@ -1,4 +1,4 @@ -From a5045503cf3310058cc64814ff9626f4877a13bb Mon Sep 17 00:00:00 2001 +From 12a9a9cb506aede4748611c8fa3339afcee7c070 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 5 Jul 2019 13:20:23 +0800 Subject: [PATCH] cryptext: Implement CryptExtOpenCER. @@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov create mode 100644 dlls/cryptext/tests/cryptext.c diff --git a/configure b/configure -index db592f0868d..ba13abacc46 100755 +index 20bcb96a2a6..b8fd60dbb53 100755 --- a/configure +++ b/configure -@@ -20291,6 +20291,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests +@@ -20910,6 +20910,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg wine_fn_config_makefile dlls/cryptdll enable_cryptdll wine_fn_config_makefile dlls/cryptext enable_cryptext @@ -29,10 +29,10 @@ index db592f0868d..ba13abacc46 100755 wine_fn_config_makefile dlls/cryptnet/tests enable_tests wine_fn_config_makefile dlls/cryptsp enable_cryptsp diff --git a/configure.ac b/configure.ac -index d449b88fb19..af75e0e80ab 100644 +index 6cbd947bf31..c68c5975e63 100644 --- a/configure.ac +++ b/configure.ac -@@ -3029,6 +3029,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests) +@@ -2361,6 +2361,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests) WINE_CONFIG_MAKEFILE(dlls/cryptdlg) WINE_CONFIG_MAKEFILE(dlls/cryptdll) WINE_CONFIG_MAKEFILE(dlls/cryptext) @@ -113,7 +113,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644 + PCCERT_CONTEXT ctx; + CRYPTUI_VIEWCERTIFICATE_STRUCTW info; + -+ TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_w(filename), showcmd); ++ TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_w(filename), showcmd); + + if (!CryptQueryObject(CERT_QUERY_OBJECT_FILE, filename, CERT_QUERY_CONTENT_FLAG_CERT, + CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, @@ -142,7 +142,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644 + HRESULT hr; + LPWSTR filenameW; + -+ TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_a(filename), showcmd); ++ TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_a(filename), showcmd); + + filenameW = heap_strdupAtoW(filename); + hr = CryptExtOpenCERW(hwnd, hinst, filenameW, showcmd); @@ -212,10 +212,10 @@ index 00000000000..cc62a772b59 + + SetLastError(0xdeadbeef); + hr = pCryptExtOpenCER(0, 0, "dead.beef", SW_HIDE); -+ ok(hr == S_OK, "got %#x\n", hr); ++ ok(hr == S_OK, "got %#lx\n", hr); + + hr = pCryptExtOpenCER(0, 0, "VeriSign Class 3 Public Primary Certification Authority - G4.txt", SW_SHOW); -+ ok(hr == S_OK, "got %#x\n", hr); ++ ok(hr == S_OK, "got %#lx\n", hr); +} + +START_TEST(cryptext) @@ -227,5 +227,5 @@ index 00000000000..cc62a772b59 + test_CryptExtOpenCER(); +} -- -2.33.0 +2.34.1 diff --git a/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch b/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch index 6191ab6f..086aded0 100644 --- a/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch +++ b/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch @@ -44,7 +44,7 @@ index e826cc89c1e..a4815f24958 100644 + else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + + obj = dataformat_to_odf_by_type(df, inst, type); -+ TRACE("obj %p, inst 0x%08x, type 0x%08x\n", obj, inst, type); ++ TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type); + if(obj) + { + memcpy(&obj_df[action], obj, df->dwObjSize); diff --git a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch index 4214a388..db22c02b 100644 --- a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch +++ b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch @@ -2493,7 +2493,7 @@ index c72a12955b8..87d11472ff0 100644 + This->hr = S_OK; + else + { -+ ERR("CopyFile failed: %u\n", GetLastError()); ++ ERR("CopyFile failed: %lu\n", GetLastError()); + This->hr = E_FAIL; + } + @@ -3076,7 +3076,7 @@ index c72a12955b8..87d11472ff0 100644 InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%d %p)\n", This, index, id); + -+ FIXME("(%p)->(%lu %p): stub\n", This, index, id); ++ FIXME("(%p)->(%u %p): stub\n", This, index, id); + return E_NOTIMPL; } @@ -3090,7 +3090,7 @@ index c72a12955b8..87d11472ff0 100644 + ICifComponent *comp; + HRESULT hr; + -+ TRACE("(%p)->(%lu %p)\n", This, index, id); ++ TRACE("(%p)->(%u %p)\n", This, index, id); + + if (!This->icif || !id) + return E_FAIL; diff --git a/patches/kernel32-CopyFileEx/0001-kernel32-Add-support-for-progress-callback-in-CopyFi.patch b/patches/kernel32-CopyFileEx/0001-kernel32-Add-support-for-progress-callback-in-CopyFi.patch index 1eab26a3..dea2089e 100644 --- a/patches/kernel32-CopyFileEx/0001-kernel32-Add-support-for-progress-callback-in-CopyFi.patch +++ b/patches/kernel32-CopyFileEx/0001-kernel32-Add-support-for-progress-callback-in-CopyFi.patch @@ -1,4 +1,4 @@ -From f29eb0b6a2b555beea0c29e9202c218ef31311b6 Mon Sep 17 00:00:00 2001 +From 519a979a6d7c304c65f198b64495f4fd36482fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 26 Feb 2015 06:41:26 +0100 Subject: [PATCH] kernelbase: Add support for progress callback in CopyFileEx. @@ -9,38 +9,38 @@ Subject: [PATCH] kernelbase: Add support for progress callback in CopyFileEx. 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c -index f8e49491a7d..74c13ff11d0 100644 +index 77174d43d5b..4bd9f790cc0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c -@@ -1169,23 +1169,17 @@ static void test_CopyFileEx(void) - ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); +@@ -1170,23 +1170,17 @@ static void test_CopyFileEx(void) + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine - ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file was deleted\n"); hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); - todo_wine - ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine - ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); - todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); retok = CopyFileExA(source, NULL, copy_progress_cb, hfile, NULL, 0); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c -index c6dc904044a..b9ba1bd7c26 100644 +index 02c2e841f85..cabbe2d17c1 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c -@@ -499,11 +499,16 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -500,11 +500,16 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; @@ -58,7 +58,7 @@ index c6dc904044a..b9ba1bd7c26 100644 if (!source || !dest) { -@@ -518,7 +523,15 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -519,7 +524,15 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); @@ -75,7 +75,7 @@ index c6dc904044a..b9ba1bd7c26 100644 NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open source %s\n", debugstr_w(source)); -@@ -526,7 +539,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -527,7 +540,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } @@ -84,7 +84,7 @@ index c6dc904044a..b9ba1bd7c26 100644 { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); -@@ -552,7 +565,11 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -553,7 +566,11 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT } } @@ -97,7 +97,7 @@ index c6dc904044a..b9ba1bd7c26 100644 (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE) { -@@ -562,6 +579,29 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -563,6 +580,29 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } @@ -127,7 +127,7 @@ index c6dc904044a..b9ba1bd7c26 100644 while (ReadFile( h1, buffer, buffer_size, &count, NULL ) && count) { char *p = buffer; -@@ -571,13 +611,38 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT +@@ -572,13 +612,38 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if (!WriteFile( h2, p, count, &res, NULL ) || !res) goto done; p += res; count -= res; diff --git a/patches/mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch b/patches/mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch index 4210606c..8b5c92ae 100644 --- a/patches/mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch +++ b/patches/mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch @@ -28,7 +28,7 @@ index 274db8c22b..ba02e811cc 100644 + break; + case WM_KEYUP: + { -+ TRACE("Processing key %ld\n", lpmsg->wParam); ++ TRACE("Processing key %I64d\n", lpmsg->wParam); + if (lpmsg->wParam == VK_F5) + hres = IOleCommandTarget_Exec(&This->IOleCommandTarget_iface, NULL, OLECMDID_REFRESH, 0, NULL, NULL); + @@ -38,7 +38,7 @@ index 274db8c22b..ba02e811cc 100644 + FIXME("Unsupported message %04x\n", lpmsg->message); + } + -+ TRACE("result 0x%08x\n", hres); ++ TRACE("result 0x%08lx\n", hres); + return hres; } diff --git a/patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch b/patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch index 1376d9a2..a6400660 100644 --- a/patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch +++ b/patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch @@ -1,4 +1,4 @@ -From a1b46c58e7663a0c17d5dd2fbb3cc82fde40a06c Mon Sep 17 00:00:00 2001 +From 7acf9c0e6c7f4bf86b1946778366b529a42fa660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 1 Jun 2017 06:04:53 +0200 Subject: [PATCH] ntdll: Fix holes in ELF mappings. (v2) @@ -10,10 +10,10 @@ Based on a patch by Andrew Wesie. 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c -index 209a2647d16..2fbb5922359 100644 +index 0c1c91750ea..c4fcf43543f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c -@@ -1021,6 +1021,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size ) +@@ -1210,6 +1210,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size ) } @@ -30,7 +30,7 @@ index 209a2647d16..2fbb5922359 100644 /*********************************************************************** * find_view_range * -@@ -3051,6 +3061,19 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) +@@ -3416,6 +3426,19 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) /* ignore fault if page is writable now */ if (get_unix_prot( get_page_vprot( page ) ) & PROT_WRITE) ret = STATUS_SUCCESS; } @@ -51,10 +51,10 @@ index 209a2647d16..2fbb5922359 100644 return ret; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c -index d85099455aa..be12af58311 100644 +index 519e39c3df0..c29168646e8 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c -@@ -195,6 +195,7 @@ todo_wine +@@ -194,6 +194,7 @@ static void test_EnumProcessModules(void) static void test_GetModuleInformation(void) { HMODULE hMod = GetModuleHandleA(NULL); @@ -62,29 +62,29 @@ index d85099455aa..be12af58311 100644 MODULEINFO info; DWORD ret; -@@ -214,10 +215,21 @@ static void test_GetModuleInformation(void) +@@ -213,10 +214,21 @@ static void test_GetModuleInformation(void) GetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %ld\n", GetLastError()); - SetLastError(0xdeadbeef); ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info)); - ok(ret == 1, "failed with %d\n", GetLastError()); + ok(ret == 1, "failed with %ld\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); + + hMod = LoadLibraryA("shell32.dll"); -+ ok(hMod != NULL, "Failed to load shell32.dll, error: %u\n", GetLastError()); ++ ok(hMod != NULL, "Failed to load shell32.dll, error: %lu\n", GetLastError()); + + ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info)); -+ ok(ret == 1, "failed with %d\n", GetLastError()); ++ ok(ret == 1, "failed with %lu\n", GetLastError()); + info.SizeOfImage /= sizeof(DWORD); + for (tmp = (DWORD *)hMod; info.SizeOfImage; info.SizeOfImage--) + counter ^= *tmp++; -+ trace("xor of shell32: %08x\n", counter); ++ trace("xor of shell32: %08lx\n", counter); + + FreeLibrary(hMod); } static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin) -- -2.28.0 +2.34.1 diff --git a/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch b/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch index 86c66140..b1ebb38e 100644 --- a/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch +++ b/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch @@ -1,4 +1,4 @@ -From 11107a30f5ddc2065d2b254fad2d10bc158a1ebb Mon Sep 17 00:00:00 2001 +From 80cb1bf9077b1e754fc2f3426229733c3417c397 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 19 Aug 2014 22:10:49 -0600 Subject: [PATCH] ntdll: Implement retrieving DOS attributes in @@ -10,18 +10,18 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d621ae6e712..3ddff238d74 100644 +index c68c5975e63..84efc670ca4 100644 --- a/configure.ac +++ b/configure.ac -@@ -65,6 +65,7 @@ AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb lib +@@ -64,6 +64,7 @@ AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwi + AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb library])) AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) - AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) +AC_ARG_WITH(xattr, AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), -@@ -642,6 +643,17 @@ AC_CHECK_HEADERS([libprocstat.h],,, +@@ -634,6 +635,17 @@ AC_CHECK_HEADERS([libprocstat.h],,, #include #endif]) @@ -40,7 +40,7 @@ index d621ae6e712..3ddff238d74 100644 AC_SUBST(DLLFLAGS,"") diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index e459087af76..0b6e5d3b6a7 100644 +index a29b5cbb980..1ae4645c6fb 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -98,6 +98,9 @@ @@ -118,5 +118,5 @@ index e459087af76..0b6e5d3b6a7 100644 } -- -2.33.0 +2.34.1 diff --git a/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch b/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch index 8b4edd8c..99c714b8 100644 --- a/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch +++ b/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch @@ -1,4 +1,4 @@ -From f444edc19e67ef0a903728804f50e13ccbfac16e Mon Sep 17 00:00:00 2001 +From 82663e728099ca8f0127dcdf8d62d551eda6902c Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 28 Apr 2016 18:14:36 +0800 Subject: [PATCH] ntdll: Implement NtSetLdtEntries. @@ -9,18 +9,18 @@ Subject: [PATCH] ntdll: Implement NtSetLdtEntries. 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c -index a9869863b44..2c2a0fda843 100644 +index 3cf58d928ae..78f9bbeb493 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c -@@ -99,6 +99,7 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP - static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); - static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); +@@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); + static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); + static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); +static NTSTATUS (WINAPI *pNtSetLdtEntries)(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); static HANDLE create_target_process(const char *arg) { -@@ -1278,6 +1279,82 @@ static void test_GetThreadSelectorEntry(void) +@@ -1299,6 +1300,82 @@ static void test_GetThreadSelectorEntry(void) ok(entry.HighWord.Bits.Granularity == 1, "expected 1, got %u\n", entry.HighWord.Bits.Granularity); } @@ -103,15 +103,15 @@ index a9869863b44..2c2a0fda843 100644 #endif /* __i386__ */ static HANDLE finish_event; -@@ -2340,6 +2417,7 @@ static void init_funcs(void) - X(NtQueryInformationThread); - X(RtlGetThreadErrorMode); +@@ -2617,6 +2694,7 @@ static void init_funcs(void) X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); + X(NtSetLdtEntries); } #undef X } -@@ -2396,6 +2474,7 @@ START_TEST(thread) +@@ -2673,6 +2751,7 @@ START_TEST(thread) test_SetThreadContext(); test_GetThreadSelectorEntry(); test_GetThreadContext(); @@ -120,10 +120,10 @@ index a9869863b44..2c2a0fda843 100644 test_QueueUserWorkItem(); test_RegisterWaitForSingleObject(); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c -index 320ffa68407..a52490a096b 100644 +index f8d8dd9bf28..194e9c3f3e6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c -@@ -480,7 +480,7 @@ NTSTATUS CDECL get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG +@@ -2207,7 +2207,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ if (reply->flags) info->Entry = ldt_make_entry( (void *)reply->base, reply->limit, reply->flags ); else @@ -133,5 +133,5 @@ index 320ffa68407..a52490a096b 100644 } SERVER_END_REQ; -- -2.26.2 +2.34.1 diff --git a/patches/ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch b/patches/ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch index 866eefaa..3a17b2a0 100644 --- a/patches/ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch +++ b/patches/ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch @@ -1,4 +1,4 @@ -From aea7dcfb0b09794b4925c5e8f0ca2a28b783e8f1 Mon Sep 17 00:00:00 2001 +From ed30d93e063cb68111dc8f64d125f3f48cf3098e Mon Sep 17 00:00:00 2001 From: Andrew Wesie Date: Mon, 27 Apr 2020 15:32:22 +0300 Subject: [PATCH] kernel32/tests, psapi/tests: Update tests. @@ -9,10 +9,10 @@ Subject: [PATCH] kernel32/tests, psapi/tests: Update tests. 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c -index f576d132d8b..70824d771ed 100644 +index a3b2d365c33..45f79903ddd 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c -@@ -3572,9 +3572,7 @@ static void test_CreateFileMapping_protection(void) +@@ -3604,9 +3604,7 @@ static void test_CreateFileMapping_protection(void) SetLastError(0xdeadbeef); ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); @@ -23,7 +23,7 @@ index f576d132d8b..70824d771ed 100644 } } else -@@ -3588,9 +3586,7 @@ static void test_CreateFileMapping_protection(void) +@@ -3620,9 +3618,7 @@ static void test_CreateFileMapping_protection(void) SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); @@ -34,7 +34,7 @@ index f576d132d8b..70824d771ed 100644 UnmapViewOfFile(base); } -@@ -3943,15 +3939,12 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) +@@ -3975,15 +3971,12 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) continue; } @@ -50,7 +50,7 @@ index f576d132d8b..70824d771ed 100644 ok(info.Protect == actual_prot, "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); -@@ -4006,15 +3999,12 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) +@@ -4038,15 +4031,12 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) { ret = VirtualProtect(base, sec_flags & SEC_IMAGE ? si.dwPageSize : 2*si.dwPageSize, PAGE_WRITECOPY, &old_prot); @@ -66,7 +66,7 @@ index f576d132d8b..70824d771ed 100644 ok(info.RegionSize == si.dwPageSize, "wrong region size %#lx after write, map %#x, view %#x got %#x\n", info.RegionSize, page_prot[i], view[j].prot, info.Protect ); -@@ -4025,7 +4015,6 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) +@@ -4057,7 +4047,6 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) { ret = VirtualQuery((char*)base + si.dwPageSize, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); @@ -74,7 +74,7 @@ index f576d132d8b..70824d771ed 100644 ok(info.Protect == PAGE_WRITECOPY, "wrong prot, map %#x, view %#x got %#x\n", page_prot[i], view[j].prot, info.Protect); } -@@ -4045,14 +4034,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) +@@ -4077,14 +4066,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) continue; } @@ -89,7 +89,7 @@ index f576d132d8b..70824d771ed 100644 ok(info.Protect == map_prot_written( page_prot[k] ), "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); -@@ -4093,7 +4079,6 @@ static void test_mappings(void) +@@ -4125,7 +4111,6 @@ static void test_mappings(void) SetFilePointer(hfile, 0, NULL, FILE_BEGIN); ok(ReadFile(hfile, &data, sizeof(data), &num_bytes, NULL), "ReadFile failed\n"); ok(num_bytes == sizeof(data), "num_bytes = %d\n", num_bytes); @@ -98,10 +98,10 @@ index f576d132d8b..70824d771ed 100644 CloseHandle( hfile ); diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c -index c92423ee193..d85099455aa 100644 +index 185a4062092..519e39c3df0 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c -@@ -830,6 +830,8 @@ static void test_QueryWorkingSetEx(void) +@@ -803,6 +803,8 @@ static void test_QueryWorkingSetEx(void) DWORD prot; BOOL ret; @@ -110,16 +110,16 @@ index c92423ee193..d85099455aa 100644 if (pQueryWorkingSetEx == NULL) { win_skip("QueryWorkingSetEx not found, skipping tests\n"); -@@ -848,6 +850,9 @@ static void test_QueryWorkingSetEx(void) +@@ -821,6 +823,9 @@ static void test_QueryWorkingSetEx(void) check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE); *(volatile char *)addr; + check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE); + + ret = VirtualProtect(addr, 0x1000, PAGE_EXECUTE_READWRITE, &prot); - ok(ret, "VirtualProtect failed with %d\n", GetLastError()); + ok(ret, "VirtualProtect failed with %ld\n", GetLastError()); check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE); -- -2.27.0 +2.34.1 diff --git a/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch b/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch index 67844c11..99c53968 100644 --- a/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch +++ b/patches/ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch @@ -1,4 +1,4 @@ -From 31cfae4fcd5b142a4d1b70ad33159c3bddd42181 Mon Sep 17 00:00:00 2001 +From 1fbb361023f9474a3522762aae32ad64d056e37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Fri, 24 May 2019 15:09:35 +0300 Subject: [PATCH] ntdll/server: Mark drive_c as case-insensitive when created @@ -9,27 +9,25 @@ Content-Transfer-Encoding: 8bit Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu --- - dlls/ntdll/unix/server.c | 45 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) + dlls/ntdll/unix/server.c | 43 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c -index 0952b54f4ef..f998ce35dd0 100644 +index ab9d99c4f47..f40897757e3 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c -@@ -49,6 +49,12 @@ +@@ -49,6 +49,10 @@ #ifdef HAVE_SYS_UN_H #include #endif -+#ifdef HAVE_SYS_IOCTL_H +#include -+#endif +#ifdef HAVE_LINUX_IOCTL_H +#include +#endif #ifdef HAVE_SYS_PRCTL_H # include #endif -@@ -83,6 +89,22 @@ +@@ -83,6 +87,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); @@ -52,7 +50,7 @@ index 0952b54f4ef..f998ce35dd0 100644 #ifndef MSG_CMSG_CLOEXEC #define MSG_CMSG_CLOEXEC 0 #endif -@@ -1140,6 +1162,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino ) +@@ -1137,6 +1157,28 @@ static const char *init_server_dir( dev_t dev, ino_t ino ) } @@ -81,7 +79,7 @@ index 0952b54f4ef..f998ce35dd0 100644 /*********************************************************************** * setup_config_dir * -@@ -1176,6 +1220,7 @@ static int setup_config_dir(void) +@@ -1173,6 +1215,7 @@ static int setup_config_dir(void) if (!mkdir( "dosdevices", 0777 )) { mkdir( "drive_c", 0777 ); @@ -90,5 +88,5 @@ index 0952b54f4ef..f998ce35dd0 100644 symlink( "/", "dosdevices/z:" ); } -- -2.33.0 +2.34.1 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 148af8cd..20726af1 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -108,7 +108,7 @@ index 00000000000..664bdf84f51 +{ + struct list *ptr; + -+ TRACE("(%d)\n", reason); ++ TRACE("(%u)\n", reason); + + if (reason != DLL_THREAD_DETACH) + return; @@ -2665,7 +2665,7 @@ index f89ebc9d3e2..623c9f3c87a 100644 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { -+ TRACE("(%p, %u, %p)\n", instance, reason, reserved); ++ TRACE("(%p, %lx, %p)\n", instance, reason, reserved); + switch (reason) { @@ -3324,7 +3324,7 @@ index 00000000000..fc8f300a28b +static void CDECL tls_callback_test(DWORD reason, void *data) +{ + struct tls_test_data *test_data = data; -+ trace("reason: %d, data: %p\n", reason, data); ++ trace("reason: %ld, data: %p\n", reason, data); + + test_data->count++; + test_data->reason = reason; @@ -3378,12 +3378,12 @@ index 00000000000..fc8f300a28b + res = iface->Set(&handle, &tls_callback_test, &test_data); + ok(!res, "Failed to set TLS callback, got error %d\n", res); + thread = CreateThread(NULL, 0, test_thread, &test_data, 0, &threadid); -+ ok(thread != NULL, "Failed to create Thread, error: %d\n", GetLastError()); ++ ok(thread != NULL, "Failed to create Thread, error: %ld\n", GetLastError()); + thread_res = WaitForSingleObject(thread, 2000); -+ ok(thread_res == WAIT_OBJECT_0, "Waiting for thread failed: %d\n", thread_res); ++ ok(thread_res == WAIT_OBJECT_0, "Waiting for thread failed: %ld\n", thread_res); + ok(test_data.count == 1, "Expected 1 callback execution, got %d\n", test_data.count); -+ ok(test_data.reason == 0, "Expected reason 0, got %d\n", test_data.reason); -+ ok(test_data.threadid == threadid, "Expected thread id %d, got %d\n", threadid, test_data.threadid); ++ ok(test_data.reason == 0, "Expected reason 0, got %lu\n", test_data.reason); ++ ok(test_data.threadid == threadid, "Expected thread id %lu, got %lu\n", threadid, test_data.threadid); + res = iface->Remove(handle, NULL); + ok(!res, "Failed to remove TLS callback, got error %d\n", res); + diff --git a/patches/nvcuda-CUDA_Support/0004-nvcuda-Implement-new-functions-added-in-CUDA-6.5.patch b/patches/nvcuda-CUDA_Support/0004-nvcuda-Implement-new-functions-added-in-CUDA-6.5.patch index 8ebf558f..a032a1e6 100644 --- a/patches/nvcuda-CUDA_Support/0004-nvcuda-Implement-new-functions-added-in-CUDA-6.5.patch +++ b/patches/nvcuda-CUDA_Support/0004-nvcuda-Implement-new-functions-added-in-CUDA-6.5.patch @@ -1,19 +1,19 @@ -From e08627884ed59ebbac09a1182428718ed0ec1cbe Mon Sep 17 00:00:00 2001 +From 265cfe21ee2412df0e31ea19717c0f5469feeb30 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 9 Jan 2015 04:39:49 +0100 -Subject: nvcuda: Implement new functions added in CUDA 6.5. +Subject: [PATCH] nvcuda: Implement new functions added in CUDA 6.5. --- - dlls/nvcuda/nvcuda.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ - dlls/nvcuda/nvcuda.spec | 11 +++++ + dlls/nvcuda/nvcuda.c | 113 ++++++++++++++++++++++++++++++++++++++++ + dlls/nvcuda/nvcuda.spec | 11 ++++ include/cuda.h | 1 + 3 files changed, 125 insertions(+) diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 3ef7c35..3118c49 100644 +index c76ec2b6a48..e5675db863e 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c -@@ -293,6 +293,20 @@ static CUresult (*pcuTexRefSetMipmapLevelBias)(CUtexref hTexRef, float bias); +@@ -292,6 +292,20 @@ static CUresult (*pcuTexRefSetMipmapLevelBias)(CUtexref hTexRef, float bias); static CUresult (*pcuTexRefSetMipmapLevelClamp)(CUtexref hTexRef, float minMipmapLevelClamp, float maxMipmapLevelClamp); static CUresult (*pcuTexRefSetMipmappedArray)(CUtexref hTexRef, CUmipmappedArray hMipmappedArray, unsigned int Flags); @@ -34,7 +34,7 @@ index 3ef7c35..3118c49 100644 static void *cuda_handle = NULL; static BOOL load_functions(void) -@@ -306,6 +320,7 @@ static BOOL load_functions(void) +@@ -305,6 +319,7 @@ static BOOL load_functions(void) } #define LOAD_FUNCPTR(f) if((p##f = dlsym(cuda_handle, #f)) == NULL){FIXME("Can't find symbol %s\n", #f); return FALSE;} @@ -42,7 +42,7 @@ index 3ef7c35..3118c49 100644 LOAD_FUNCPTR(cuArray3DCreate); LOAD_FUNCPTR(cuArray3DCreate_v2); -@@ -554,7 +569,18 @@ static BOOL load_functions(void) +@@ -553,7 +568,18 @@ static BOOL load_functions(void) LOAD_FUNCPTR(cuTexRefSetMipmapLevelClamp); LOAD_FUNCPTR(cuTexRefSetMipmappedArray); @@ -61,7 +61,7 @@ index 3ef7c35..3118c49 100644 return TRUE; } -@@ -2101,6 +2127,93 @@ CUresult WINAPI wine_cuTexRefSetMipmappedArray(CUtexref hTexRef, CUmipmappedArra +@@ -2100,6 +2126,93 @@ CUresult WINAPI wine_cuTexRefSetMipmappedArray(CUtexref hTexRef, CUmipmappedArra return pcuTexRefSetMipmappedArray(hTexRef, hMipmappedArray, Flags); } @@ -154,9 +154,9 @@ index 3ef7c35..3118c49 100644 + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %u, %p)\n", instance, reason, reserved); + TRACE("(%p, %lx, %p)\n", instance, reason, reserved); diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec -index 621b8d5..c23faa4 100644 +index 621b8d59cf0..c23faa42d0d 100644 --- a/dlls/nvcuda/nvcuda.spec +++ b/dlls/nvcuda/nvcuda.spec @@ -306,3 +306,14 @@ @@ -175,7 +175,7 @@ index 621b8d5..c23faa4 100644 +@ stub cuOccupancyMaxPotentialBlockSize +#@ stdcall cuOccupancyMaxPotentialBlockSize(ptr ptr ptr ptr long long) wine_cuOccupancyMaxPotentialBlockSize diff --git a/include/cuda.h b/include/cuda.h -index 1f20f5b..0f7b11d 100644 +index 1f20f5b94c7..0f7b11d823d 100644 --- a/include/cuda.h +++ b/include/cuda.h @@ -22,6 +22,7 @@ @@ -187,5 +187,5 @@ index 1f20f5b..0f7b11d 100644 #define CU_IPC_HANDLE_SIZE 64 -- -2.2.1 +2.34.1 diff --git a/patches/nvcuda-CUDA_Support/0006-nvcuda-Emulate-two-d3d9-initialization-functions.patch b/patches/nvcuda-CUDA_Support/0006-nvcuda-Emulate-two-d3d9-initialization-functions.patch index 9cf9064a..36a7e5a3 100644 --- a/patches/nvcuda-CUDA_Support/0006-nvcuda-Emulate-two-d3d9-initialization-functions.patch +++ b/patches/nvcuda-CUDA_Support/0006-nvcuda-Emulate-two-d3d9-initialization-functions.patch @@ -1,7 +1,7 @@ -From fec925b4517cc16ac478927a361a3260a917a898 Mon Sep 17 00:00:00 2001 +From 9580c958e616d6d0254e38697d8fd9034d351228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 00:25:08 +0100 -Subject: nvcuda: Emulate two d3d9 initialization functions. +Subject: [PATCH] nvcuda: Emulate two d3d9 initialization functions. --- dlls/nvcuda/nvcuda.c | 30 ++++++++++++++++++++++++++++++ @@ -9,10 +9,10 @@ Subject: nvcuda: Emulate two d3d9 initialization functions. 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index bd39547..826c30b 100644 +index e5675db863e..b330e06fc2b 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "wine/wgl.h" #include "cuda.h" #include "nvcuda.h" @@ -20,7 +20,7 @@ index bd39547..826c30b 100644 #if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) #define DEV_PTR "%llu" -@@ -2214,6 +2215,35 @@ CUresult WINAPI wine_cuOccupancyMaxPotentialBlockSize(int *minGridSize, int *blo +@@ -2213,6 +2214,35 @@ CUresult WINAPI wine_cuOccupancyMaxPotentialBlockSize(int *minGridSize, int *blo } */ @@ -55,9 +55,9 @@ index bd39547..826c30b 100644 + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %u, %p)\n", instance, reason, reserved); + TRACE("(%p, %lx, %p)\n", instance, reason, reserved); diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec -index c23faa4..5ca921e 100644 +index c23faa42d0d..5ca921e0ffc 100644 --- a/dlls/nvcuda/nvcuda.spec +++ b/dlls/nvcuda/nvcuda.spec @@ -58,11 +58,11 @@ @@ -75,5 +75,5 @@ index c23faa4..5ca921e 100644 @ stub cuD3D9GetDirect3DDevice @ stub cuD3D9MapResources -- -2.2.1 +2.34.1 diff --git a/patches/nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch b/patches/nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch index 13472443..43f6c22b 100644 --- a/patches/nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch +++ b/patches/nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch @@ -1,7 +1,7 @@ -From 522bff38d261a682e25ad42d36cbc4dff19e7275 Mon Sep 17 00:00:00 2001 +From 9efc33cbd22c1d7778cc6d2f311a63dabe83f965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 2 Oct 2017 05:27:55 +0200 -Subject: nvcuda: Add semi stub for cuD3D10GetDevice. +Subject: [PATCH] nvcuda: Add semi stub for cuD3D10GetDevice. --- dlls/nvcuda/nvcuda.c | 8 ++++++++ @@ -9,10 +9,10 @@ Subject: nvcuda: Add semi stub for cuD3D10GetDevice. 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 99fcacf561e..219567abe1f 100644 +index 421d2e1bc7a..fcffd94f1b4 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c -@@ -37,6 +37,7 @@ +@@ -36,6 +36,7 @@ #include "cuda.h" #include "nvcuda.h" #include "d3d9.h" @@ -20,7 +20,7 @@ index 99fcacf561e..219567abe1f 100644 #if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) #define DEV_PTR "%llu" -@@ -2958,6 +2959,13 @@ CUresult WINAPI wine_cuD3D9GetDevice(CUdevice *pCudaDevice, const char *pszAdapt +@@ -2933,6 +2934,13 @@ CUresult WINAPI wine_cuD3D9GetDevice(CUdevice *pCudaDevice, const char *pszAdapt return pcuDeviceGet(pCudaDevice, 0); } @@ -33,7 +33,7 @@ index 99fcacf561e..219567abe1f 100644 + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %u, %p)\n", instance, reason, reserved); + TRACE("(%p, %lx, %p)\n", instance, reason, reserved); diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec index 492d6c129c1..4a06881f0b5 100644 --- a/dlls/nvcuda/nvcuda.spec @@ -48,5 +48,5 @@ index 492d6c129c1..4a06881f0b5 100644 @ stub cuD3D10GetDirect3DDevice @ stub cuD3D10MapResources -- -2.14.1 +2.34.1 diff --git a/patches/nvcuda-CUDA_Support/0012-nvcuda-Add-semi-stub-for-cuD3D11GetDevice-and-cuGrap.patch b/patches/nvcuda-CUDA_Support/0012-nvcuda-Add-semi-stub-for-cuD3D11GetDevice-and-cuGrap.patch index ad1b1b36..c9fb9b09 100644 --- a/patches/nvcuda-CUDA_Support/0012-nvcuda-Add-semi-stub-for-cuD3D11GetDevice-and-cuGrap.patch +++ b/patches/nvcuda-CUDA_Support/0012-nvcuda-Add-semi-stub-for-cuD3D11GetDevice-and-cuGrap.patch @@ -1,4 +1,4 @@ -From 807f2b26083148f194dbc90887174a0f70921d88 Mon Sep 17 00:00:00 2001 +From a117c35a7ee0a6a786d2fe0f8cbf0cebbf9f5ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinar=20S=C3=B8pler?= Date: Mon, 26 Jul 2021 14:59:18 +0200 Subject: [PATCH] nvcuda Add semi-stub for cuD3D11GetDevice and @@ -13,7 +13,7 @@ Requires: Tested with nVidia PhysX 9.19 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 1ffcb341518..184784c7004 100644 +index fcffd94f1b4..633c38b206b 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -37,6 +37,7 @@ @@ -48,7 +48,7 @@ index 1ffcb341518..184784c7004 100644 + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %u, %p)\n", instance, reason, reserved); + TRACE("(%p, %lx, %p)\n", instance, reason, reserved); diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec index 4a06881f0b5..70bcc6db833 100644 --- a/dlls/nvcuda/nvcuda.spec @@ -72,5 +72,5 @@ index 4a06881f0b5..70bcc6db833 100644 @ stdcall cuGraphicsGLRegisterBuffer(ptr long long) wine_cuGraphicsGLRegisterBuffer @ stdcall cuGraphicsGLRegisterImage(ptr long long long) wine_cuGraphicsGLRegisterImage -- -2.30.2 +2.34.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b48357e8..a70dbb95 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "df0566d531b4454673eb71a0903986d215988e40" + echo "1b9d48a7b01e2b715af46bc1f8d5fe6f1529782c" } # Show version information diff --git a/patches/programs-findstr/0001-findstr-add-basic-functionality-also-support-literal.patch b/patches/programs-findstr/0001-findstr-add-basic-functionality-also-support-literal.patch index 6dc3548a..a5c35151 100644 --- a/patches/programs-findstr/0001-findstr-add-basic-functionality-also-support-literal.patch +++ b/patches/programs-findstr/0001-findstr-add-basic-functionality-also-support-literal.patch @@ -90,8 +90,8 @@ index d25e1965f6e..dc73fbba666 100644 +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; -+ static UINT buffer_max = 0; -+ static UINT buffer_pos = 0; ++ static DWORD buffer_max = 0; ++ static DWORD buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) diff --git a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch index 37633a1a..749f0029 100644 --- a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch +++ b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch @@ -274,7 +274,7 @@ index 176ce6061e6..57d0904af23 100644 +{ + struct FileSecurity *This = impl_from_ISecurityInformation(iface); + -+ TRACE("(%p, %u, %p, %u)\n", This, info, sd, default_sd); ++ TRACE("(%p, %lu, %p, %u)\n", This, info, sd, default_sd); + + if (default_sd) + FIXME("Returning a default sd is not implemented\n"); @@ -292,7 +292,7 @@ index 176ce6061e6..57d0904af23 100644 + PSID owner, group; + ACL *dacl, *sacl; + -+ TRACE("(%p, %u, %p)\n", This, info, sd); ++ TRACE("(%p, %lu, %p)\n", This, info, sd); + + if (!GetSecurityDescriptorOwner(sd, &owner, &defaulted)) + return E_FAIL; @@ -319,7 +319,7 @@ index 176ce6061e6..57d0904af23 100644 +{ + struct FileSecurity *This = impl_from_ISecurityInformation(iface); + -+ TRACE("(%p, %s, %x, %p, %p, %p)\n", This, debugstr_guid(type), flags, access, count, default_access); ++ TRACE("(%p, %s, %lx, %p, %p, %p)\n", This, debugstr_guid(type), flags, access, count, default_access); + + if (This->directory) + { diff --git a/patches/winemapi-user-xdg-mail/0001-winemapi-Directly-use-xdg-email-if-available-enablin.patch b/patches/winemapi-user-xdg-mail/0001-winemapi-Directly-use-xdg-email-if-available-enablin.patch index 8a66ce03..7776e358 100644 --- a/patches/winemapi-user-xdg-mail/0001-winemapi-Directly-use-xdg-email-if-available-enablin.patch +++ b/patches/winemapi-user-xdg-mail/0001-winemapi-Directly-use-xdg-email-if-available-enablin.patch @@ -94,7 +94,7 @@ index ca1b6c59df1..e288837a33d 100644 +ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved) +{ -+ TRACE("(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, ++ TRACE("(0x%I64xx 0x%I64xx %p 0x%08x 0x%08lx)\n", session, uiparam, + message, flags, reserved); + + if (XDGMailAvailable()) @@ -238,7 +238,7 @@ index 00000000000..08a9b49cc7f + break; + + default: -+ TRACE("Unknown recipient class: %d\n", class); ++ TRACE("Unknown recipient class: %ld\n", class); + } +} + diff --git a/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch b/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch index 9b4919e7..e8401df2 100644 --- a/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch +++ b/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch @@ -109,7 +109,7 @@ index 623a1c97db8..aadeba735f5 100644 + xparams.pGlobalSettingsBuffer = ptr; + hr = IXACT3Engine_Initialize(engine, &xparams); + ok(hr == S_OK || -+ hr == XAUDIO2_E_INVALID_CALL /* Vista */, "got 0x%08x\n", hr); ++ hr == XAUDIO2_E_INVALID_CALL /* Vista */, "got 0x%08lx\n", hr); + if (FAILED(hr)) + goto end; + @@ -118,18 +118,18 @@ index 623a1c97db8..aadeba735f5 100644 + + value = 0.1f; + hr = IXACT3Engine_GetGlobalVariable(engine, index, &value); -+ ok(hr == S_OK, "got 0x%08x\n", hr); ++ ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(value == 0.0f, "got %f\n", value); + + hr = IXACT3Engine_GetFinalMixFormat(engine, &format); -+ ok(hr == S_OK, "got 0x%08x\n", hr); ++ ok(hr == S_OK, "got 0x%08lx\n", hr); + + /* Invalid SpeedOfSound value */ + X3DAudioInitialize(format.dwChannelMask, value, instance); + ok(instance[0] != 0, "got 0x%08x\n", instance[0]); + + hr = IXACT3Engine_GetGlobalVariable(engine, index, &value); -+ ok(hr == S_OK, "got 0x%08x\n", hr); ++ ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(value == 0.0f, "got %f\n", value); + +end: diff --git a/staging/upstream-commit b/staging/upstream-commit index c34ffd50..ebf12303 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -df0566d531b4454673eb71a0903986d215988e40 +1b9d48a7b01e2b715af46bc1f8d5fe6f1529782c