From 0c295023f1c88f6c153e4745b72590afd569ca18 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 6 Apr 2021 17:41:23 -0500 Subject: [PATCH] Rebase against 8d076bc5e46cc11ec94db631e7c608f62d75cee2. --- ...ediag-message-to-show-warning-that-t.patch | 16 +++--- ...t-Allow-multiple-backends-to-coexist.patch | 20 +++---- .../0001-ntdll-Add-dummy-apiset-to-PEB.patch | 30 +++++----- ...t-HashLinks-field-in-LDR-module-data.patch | 57 +++++++------------ ...temInformation-support-SystemCodeInt.patch | 14 ++--- ...ement-NvAPI_D3D11_SetDepthBoundsTest.patch | 28 ++++----- patches/patchinstall.sh | 2 +- ...ice-Load-some-common-drivers-and-fix.patch | 20 +++---- staging/upstream-commit | 2 +- 9 files changed, 85 insertions(+), 104 deletions(-) diff --git a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch index d120deb7..9f7fd4b3 100644 --- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch +++ b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch @@ -1,4 +1,4 @@ -From 0cf6433af95363c5fbba2af482b2ba50b863dfb7 Mon Sep 17 00:00:00 2001 +From a4d9189613ecacb289595663302c1db8676c8d9d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:44:31 +0200 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging @@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 20bc3f977d1..c2187a19397 100644 +index 7a714a5aa6d..e5325ec31ff 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -20,15 +20,15 @@ index 20bc3f977d1..c2187a19397 100644 #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -@@ -3456,6 +3457,7 @@ static void process_breakpoint(void) - __ENDTRY +@@ -3235,6 +3236,7 @@ void WINAPI LdrShutdownProcess(void) + process_detach(); } +extern const char * CDECL wine_get_version(void); /****************************************************************** - * LdrInitializeThunk (NTDLL.@) -@@ -3465,6 +3467,9 @@ static void process_breakpoint(void) + * RtlExitUserProcess (NTDLL.@) +@@ -3597,6 +3599,9 @@ static void init_wow64(void) */ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { @@ -38,7 +38,7 @@ index 20bc3f977d1..c2187a19397 100644 static int attach_done; int i; NTSTATUS status; -@@ -3483,6 +3488,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR +@@ -3614,6 +3619,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR entry = (void **)&context->u.s.X0; #endif @@ -56,5 +56,5 @@ index 20bc3f977d1..c2187a19397 100644 RtlEnterCriticalSection( &loader_section ); -- -2.28.0 +2.30.2 diff --git a/patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch b/patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch index a9885c3f..70184f19 100644 --- a/patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch +++ b/patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch @@ -1,4 +1,4 @@ -From 3478a4e41c07a66e7e913c54bcf5ad52e16a8fee Mon Sep 17 00:00:00 2001 +From 6d925cb20409888ada3e469a2a09b1bfc726fa79 Mon Sep 17 00:00:00 2001 From: Derek Lesho Date: Fri, 2 Oct 2020 11:29:24 -0500 Subject: [PATCH] bcrypt: Allow multiple backends to coexist. @@ -14,7 +14,7 @@ Signed-off-by: Derek Lesho create mode 100644 dlls/bcrypt/unixlib.c diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in -index 24803fb2d7cb..46a20d473dd7 100644 +index 24803fb2d7c..46a20d473dd 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ @@ -27,7 +27,7 @@ index 24803fb2d7cb..46a20d473dd7 100644 RC_SRCS = version.rc diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h -index eb1361115093..3c7110d05f84 100644 +index eb136111509..3c7110d05f8 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -218,4 +218,7 @@ struct key_funcs @@ -39,10 +39,10 @@ index eb1361115093..3c7110d05f84 100644 + #endif /* __BCRYPT_INTERNAL_H */ diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c -index c065ac31fba3..9490ea8612a8 100644 +index 2f0c62bc6da..4a9dcf9de8a 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c -@@ -371,9 +371,12 @@ fail: +@@ -372,9 +372,12 @@ fail: static void gnutls_uninitialize(void) { @@ -58,7 +58,7 @@ index c065ac31fba3..9490ea8612a8 100644 } struct buffer -@@ -1949,19 +1952,28 @@ static const struct key_funcs key_funcs = +@@ -1899,19 +1902,28 @@ static const struct key_funcs key_funcs = key_import_rsa }; @@ -74,7 +74,7 @@ index c065ac31fba3..9490ea8612a8 100644 + if (!gnutls_initialize()) return NULL; + return &key_funcs; case DLL_PROCESS_DETACH: - gnutls_uninitialize(); + if (libgnutls_handle) gnutls_uninitialize(); - break; } - return STATUS_SUCCESS; @@ -95,7 +95,7 @@ index c065ac31fba3..9490ea8612a8 100644 +} +#endif diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c -index 44906519cef0..2a88aec8362c 100644 +index 44906519cef..2a88aec8362 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -302,11 +302,21 @@ static const struct key_funcs key_funcs = @@ -126,7 +126,7 @@ index 44906519cef0..2a88aec8362c 100644 #endif diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c new file mode 100644 -index 000000000000..9cbb25f5740c +index 00000000000..9cbb25f5740 --- /dev/null +++ b/dlls/bcrypt/unixlib.c @@ -0,0 +1,211 @@ @@ -342,5 +342,5 @@ index 000000000000..9cbb25f5740c + +#endif -- -2.29.2 +2.30.2 diff --git a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch index aa3ebbb8..bd7ec6cc 100644 --- a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch +++ b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch @@ -1,4 +1,4 @@ -From 658a24832ee3e9a04a311600fd00b91b6d5cfb5f Mon Sep 17 00:00:00 2001 +From 5b1520dd617c454ac8e482260b6b437f6f98d185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 3 Apr 2017 01:06:26 +0200 Subject: [PATCH] ntdll: Add dummy apiset to PEB. @@ -12,27 +12,27 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB. create mode 100644 include/apiset.h diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index c7da728964c..addc5e0adfc 100644 +index 7a714a5aa6d..62d1b38f4c0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -169,6 +169,7 @@ static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 }; - static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE }; +@@ -164,6 +164,7 @@ static PEB_LDR_DATA ldr = + static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; +static API_SET_NAMESPACE_ARRAY apiset_map; static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; -@@ -4025,6 +4026,7 @@ static NTSTATUS process_init(void) +@@ -3626,6 +3627,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR - peb->LdrData = &ldr; - peb->FastPebLock = &peb_lock; -+ peb->ApiSetMap = &apiset_map; - peb->TlsBitmap = &tls_bitmap; - peb->TlsExpansionBitmap = &tls_expansion_bitmap; - peb->LoaderLock = &loader_section; + peb->LdrData = &ldr; + peb->FastPebLock = &peb_lock; ++ peb->ApiSetMap = &apiset_map; + peb->TlsBitmap = &tls_bitmap; + peb->TlsExpansionBitmap = &tls_expansion_bitmap; + peb->LoaderLock = &loader_section; diff --git a/include/Makefile.in b/include/Makefile.in -index 87cc175739b..ff9f0f692d9 100644 +index 9133e5c6315..f56a60fae5e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -15,6 +15,7 @@ SOURCES = \ @@ -87,7 +87,7 @@ index 00000000000..6801cd5f509 + +#endif diff --git a/include/winternl.h b/include/winternl.h -index cff261b6d7c..ca7a85d9578 100644 +index 298ebbc2d36..163b7737e00 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -23,6 +23,7 @@ @@ -98,7 +98,7 @@ index cff261b6d7c..ca7a85d9578 100644 #ifdef __cplusplus extern "C" { -@@ -316,7 +317,7 @@ typedef struct _PEB +@@ -321,7 +322,7 @@ typedef struct _PEB PVOID KernelCallbackTable; /* 02c/058 */ ULONG Reserved; /* 030/060 */ ULONG AtlThunkSListPtr32; /* 034/064 */ @@ -108,5 +108,5 @@ index cff261b6d7c..ca7a85d9578 100644 PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ -- -2.28.0 +2.30.2 diff --git a/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch b/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch index b2ffc667..15508d88 100644 --- a/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch +++ b/patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch @@ -1,13 +1,13 @@ -From 7357cb7a11d785aca554e255bc5c672c279d948f Mon Sep 17 00:00:00 2001 +From 78e8d51910a41db9a31ec350228989a0c65cf899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 3 Apr 2017 05:30:27 +0200 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data. --- dlls/kernel32/tests/loader.c | 75 ++++++++++++++++++++++++++++++++++++ - dlls/ntdll/loader.c | 65 +++++++++++++++++++++++++++++++ + dlls/ntdll/loader.c | 60 +++++++++++++++++++++++++++++ include/winternl.h | 2 +- - 3 files changed, 141 insertions(+), 1 deletion(-) + 3 files changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1db68a191a3..bec46088518 100644 @@ -110,7 +110,7 @@ index 1db68a191a3..bec46088518 100644 test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index daee7675196..659cba51768 100644 +index 7a714a5aa6d..996a749ebaa 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -113,6 +113,9 @@ struct file_id @@ -123,7 +123,7 @@ index daee7675196..659cba51768 100644 /* internal representation of loaded modules */ typedef struct _wine_modref { -@@ -451,6 +454,52 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module ) +@@ -458,6 +461,52 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module ) } } @@ -176,7 +176,7 @@ index daee7675196..659cba51768 100644 /************************************************************************* * get_modref * -@@ -1197,7 +1246,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name +@@ -1204,7 +1253,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name &wm->ldr.InLoadOrderLinks); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderLinks); @@ -189,7 +189,7 @@ index daee7675196..659cba51768 100644 if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { -@@ -1877,6 +1931,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, +@@ -1884,6 +1938,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, /* the module has only be inserted in the load & memory order lists */ RemoveEntryList(&wm->ldr.InLoadOrderLinks); RemoveEntryList(&wm->ldr.InMemoryOrderLinks); @@ -197,7 +197,7 @@ index daee7675196..659cba51768 100644 /* FIXME: there are several more dangling references * left. Including dlls loaded by this dll before the -@@ -3307,6 +3362,7 @@ static void free_modref( WINE_MODREF *wm ) +@@ -3314,6 +3369,7 @@ static void free_modref( WINE_MODREF *wm ) { RemoveEntryList(&wm->ldr.InLoadOrderLinks); RemoveEntryList(&wm->ldr.InMemoryOrderLinks); @@ -205,41 +205,22 @@ index daee7675196..659cba51768 100644 if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); -@@ -4024,6 +4080,7 @@ static NTSTATUS process_init(void) - { - TEB *teb = NtCurrentTeb(); - PEB *peb = teb->Peb; -+ DWORD i; +@@ -3641,6 +3697,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR + sizeof(peb->TlsExpansionBitmapBits) * 8 ); + RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ - peb->LdrData = &ldr; - peb->FastPebLock = &peb_lock; -@@ -4047,6 +4104,10 @@ static NTSTATUS process_init(void) - InitializeListHead( &ldr.InMemoryOrderModuleList ); - InitializeListHead( &ldr.InInitializationOrderModuleList ); - -+ /* initialize hash table */ -+ for (i = 0; i < HASH_MAP_SIZE; i++) -+ InitializeListHead(&hash_table[i]); ++ /* initialize hash table */ ++ for (i = 0; i < HASH_MAP_SIZE; i++) ++ InitializeListHead( &hash_table[i] ); + - init_user_process_params(); - load_global_options(); - version_init(); -@@ -4064,6 +4125,10 @@ static NTSTATUS process_init(void) - map_wow64cpu(); - } - #endif -+ -+ /* the windows version was not set yet when ntdll and kernel32 were loaded */ -+ recompute_hash_map(); -+ - return STATUS_SUCCESS; - } - + init_user_process_params(); + load_global_options(); + version_init(); diff --git a/include/winternl.h b/include/winternl.h -index 9e6bde25569..0fa75e676fe 100644 +index 298ebbc2d36..64aac3f955d 100644 --- a/include/winternl.h +++ b/include/winternl.h -@@ -3181,8 +3181,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY +@@ -3183,8 +3183,8 @@ typedef struct _LDR_DATA_TABLE_ENTRY ULONG Flags; SHORT LoadCount; SHORT TlsIndex; diff --git a/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch b/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch index 14147465..78935ebb 100644 --- a/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch +++ b/patches/ntdll-SystemCodeIntegrityInformation/0001-ntdll-NtQuerySystemInformation-support-SystemCodeInt.patch @@ -1,4 +1,4 @@ -From d0f1e23c56e0c4b1fa01f73dc0ed8fa4b6141710 Mon Sep 17 00:00:00 2001 +From 2d1f48433946ac413d78bc3e4b0750d26a56b353 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 22 May 2020 16:37:37 +1000 Subject: [PATCH] ntdll: NtQuerySystemInformation support @@ -12,12 +12,12 @@ Signed-off-by: Alistair Leslie-Hughes 2 files changed, 43 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c -index 56f31e4147f..be8f1d74fe3 100644 +index 2b316095f4a..72fd47b6c39 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c -@@ -2809,6 +2809,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, - ret = STATUS_SUCCESS; +@@ -2827,6 +2827,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; + } + case SystemCodeIntegrityInformation: + { @@ -45,11 +45,11 @@ index 56f31e4147f..be8f1d74fe3 100644 FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h -index 9e6bde25569..6bbf7fdbe99 100644 +index 298ebbc2d36..7632cfcb999 100644 --- a/include/winternl.h +++ b/include/winternl.h -@@ -1696,6 +1696,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { - SystemInformationClassMax +@@ -1698,6 +1698,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { + #endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION diff --git a/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch b/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch index 68bd6de7..32e4952f 100644 --- a/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch +++ b/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch @@ -1,4 +1,4 @@ -From dab5f521ad21f95aeedde39f0625541fe39d8bdf Mon Sep 17 00:00:00 2001 +From 61b1b94434e2aaf3565051d49f1c7ebdecd8f1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 7 Jul 2017 23:56:16 +0200 Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2) @@ -11,10 +11,10 @@ Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2) 4 files changed, 59 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index 751afc1..ad91cdb 100644 +index 2738ff1a5bd..3e8f90297c7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c -@@ -49,6 +49,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De +@@ -347,6 +347,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De REFIID iid, void **out) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); @@ -22,7 +22,7 @@ index 751afc1..ad91cdb 100644 TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); -@@ -63,6 +64,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De +@@ -361,6 +362,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De { *out = &context->ID3D11Multithread_iface; } @@ -34,7 +34,7 @@ index 751afc1..ad91cdb 100644 else { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); -@@ -3942,6 +3948,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface +@@ -4268,6 +4274,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface { *out = &device->IWineDXGIDeviceParent_iface; } @@ -47,10 +47,10 @@ index 751afc1..ad91cdb 100644 { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c -index b67b414..ad8266b 100644 +index 8e1a9a40cce..6f2fc56b20a 100644 --- a/dlls/nvapi/nvapi.c +++ b/dlls/nvapi/nvapi.c -@@ -23,6 +23,7 @@ +@@ -20,6 +20,7 @@ #include #define COBJMACROS @@ -58,7 +58,7 @@ index b67b414..ad8266b 100644 #include "windef.h" #include "winbase.h" #include "winternl.h" -@@ -682,6 +683,33 @@ static NvAPI_Status CDECL NvAPI_GPU_GetGpuCoreCount(NvPhysicalGpuHandle hPhysica +@@ -680,6 +681,33 @@ static NvAPI_Status CDECL NvAPI_GPU_GetGpuCoreCount(NvPhysicalGpuHandle hPhysica return NVAPI_OK; } @@ -92,7 +92,7 @@ index b67b414..ad8266b 100644 void* CDECL nvapi_QueryInterface(unsigned int offset) { static const struct -@@ -727,6 +755,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset) +@@ -725,6 +753,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset) {0x46fbeb03, NvAPI_GPU_GetPhysicalFrameBufferSize}, {0x5a04b644, NvAPI_GPU_GetVirtualFrameBufferSize}, {0xc7026a87, NvAPI_GPU_GetGpuCoreCount}, @@ -101,7 +101,7 @@ index b67b414..ad8266b 100644 unsigned int i; TRACE("(%x)\n", offset); diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c -index c8b66ac..87327c0 100644 +index c8b66ac2fa3..87327c0e79b 100644 --- a/dlls/nvapi/tests/nvapi.c +++ b/dlls/nvapi/tests/nvapi.c @@ -45,6 +45,7 @@ static NvAPI_Status (CDECL* pNvAPI_EnumNvidiaDisplayHandle)(NvU32 thisEnum, NvDi @@ -150,11 +150,11 @@ index c8b66ac..87327c0 100644 /* d3d9 tests */ wc.lpfnWndProc = DefWindowProcA; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index 958ade1..4828f9c 100644 +index 18dab157834..188c2a3cad1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -32,6 +32,8 @@ - +@@ -29,6 +29,8 @@ + #include #include "wine/list.h" +DEFINE_GUID(IID_IWineD3DDevice, 0xd56e2a4c, 0x5127, 0x8437, 0x65, 0x8a, 0x98, 0xc5, 0xbb, 0x78, 0x94, 0x98); @@ -163,5 +163,5 @@ index 958ade1..4828f9c 100644 #define _FACWINED3D 0x876 -- -1.9.1 +2.30.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index bee4c70b..b1989c08 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "2fcc1d0ecdebc55a5f515b1390ce715303f6a6ad" + echo "8d076bc5e46cc11ec94db631e7c608f62d75cee2" } # Show version information diff --git a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch index 408c9c20..427470e1 100644 --- a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch +++ b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch @@ -1,4 +1,4 @@ -From be83f47da548774293bf47411d6e128a1aa5d817 Mon Sep 17 00:00:00 2001 +From 39314cbad0b085a913d829ce4f264edf76af4ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:50:03 +0200 Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr @@ -10,7 +10,7 @@ Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr 2 files changed, 76 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index d9d712418ee..808f304b258 100644 +index 179d2d5e02d..505641d9f87 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) @@ -21,7 +21,7 @@ index d9d712418ee..808f304b258 100644 static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType; static PEPROCESS *pPsInitialSystemProcess; -@@ -1592,6 +1593,7 @@ static void test_resource(void) +@@ -1584,6 +1585,7 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } @@ -29,7 +29,7 @@ index d9d712418ee..808f304b258 100644 static void test_lookup_thread(void) { NTSTATUS status; -@@ -2119,6 +2121,52 @@ static void test_permanence(void) +@@ -2111,6 +2113,52 @@ static void test_permanence(void) ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); } @@ -82,15 +82,15 @@ index d9d712418ee..808f304b258 100644 static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -2165,6 +2213,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st +@@ -2158,6 +2206,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); - test_ob_reference(test_input->path); + test_ob_reference(); + test_default_modules(); test_resource(); test_lookup_thread(); test_IoAttachDeviceToDeviceStack(); -@@ -2560,6 +2609,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) +@@ -2553,6 +2602,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) DbgPrint("loading driver\n"); driver_obj = driver; @@ -99,10 +99,10 @@ index d9d712418ee..808f304b258 100644 /* Allow unloading of the driver */ driver->DriverUnload = driver_Unload; diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index 3acc5e8a799..adaabedf68f 100644 +index 509cab96308..14f8c9e4704 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c -@@ -115,8 +115,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ +@@ -121,8 +121,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { @@ -119,7 +119,7 @@ index 3acc5e8a799..adaabedf68f 100644 if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return; -@@ -129,6 +137,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +@@ -135,6 +143,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) wcscat( driver_dir, L"\\drivers" ); AddDllDirectory( driver_dir ); diff --git a/staging/upstream-commit b/staging/upstream-commit index 26252b1d..f9b281dc 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -97b420224e767b24d89722ff5efeca38a8ecf1e2 +8d076bc5e46cc11ec94db631e7c608f62d75cee2