From 51cfdc619ef7c35f3e309675f6ca491a23013d21 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 30 Aug 2018 09:25:58 +1000 Subject: [PATCH] Rebase against a1e0a029b0ce80e6561e0656ae4530fb1a8d4316 --- ...ntoskrnl.exe-Implement-NtBuildNumber.patch | 29 +++++---- ...lement-ExInitializeNPagedLookasideLi.patch | 26 ++++---- ...-preparation-to-make-marshalling-com.patch | 62 +++++++++---------- patches/patchinstall.sh | 21 +------ ...-toolbar-bitmaps-compatible-with-IE6.patch | 10 +-- ...ice-Load-some-common-drivers-and-fix.patch | 16 ++--- patches/winedevice-Fix_Relocation/definition | 1 + 7 files changed, 73 insertions(+), 92 deletions(-) diff --git a/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch b/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch index 4bcd9b9a..9d2dc74a 100644 --- a/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch +++ b/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch @@ -1,4 +1,4 @@ -From 44e38cce5a02a0a5db60316270f33974f8d89400 Mon Sep 17 00:00:00 2001 +From b91595f9086dae3db6c37067fc31b31a6120c3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 6 Jun 2017 21:08:51 +0200 Subject: [PATCH] ntoskrnl.exe: Implement NtBuildNumber. @@ -6,14 +6,14 @@ Subject: [PATCH] ntoskrnl.exe: Implement NtBuildNumber. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++++++++++++++++++ - 3 files changed, 40 insertions(+), 3 deletions(-) + dlls/ntoskrnl.exe/tests/driver.c | 29 +++++++++++++++++++++++++++++ + 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 958bcdf..343033d 100644 +index 466962a..0fea91b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay); +@@ -57,6 +57,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay); BOOLEAN KdDebuggerEnabled = FALSE; ULONG InitSafeBootMode = 0; @@ -21,7 +21,7 @@ index 958bcdf..343033d 100644 extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ); -@@ -2724,6 +2725,13 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, +@@ -2939,6 +2940,13 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, return STATUS_NOT_IMPLEMENTED; } @@ -35,7 +35,7 @@ index 958bcdf..343033d 100644 /***************************************************** * DllMain -@@ -2731,7 +2739,6 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, +@@ -2946,7 +2954,6 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { static void *handler; @@ -43,7 +43,7 @@ index 958bcdf..343033d 100644 switch(reason) { -@@ -2740,7 +2747,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +@@ -2955,7 +2962,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) #if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif @@ -53,7 +53,7 @@ index 958bcdf..343033d 100644 case DLL_PROCESS_DETACH: if (reserved) break; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 5df4ae3..00d09dd 100644 +index 63c1b8e..72a9f7f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -743,7 +743,7 @@ @@ -66,7 +66,7 @@ index 5df4ae3..00d09dd 100644 @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall NtCreateEvent(ptr long ptr long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index cde78e5..f4bdb0b 100644 +index d424396..57aaa28 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -143,6 +143,22 @@ static void winetest_end_todo(void) @@ -92,8 +92,8 @@ index cde78e5..f4bdb0b 100644 static void test_currentprocess(void) { PEPROCESS current; -@@ -187,6 +203,19 @@ static void test_init_funcs(void) - ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); +@@ -210,6 +226,18 @@ static void test_load_driver(void) + ok(!ret, "got %#x\n", ret); } +static void test_version(void) @@ -106,16 +106,15 @@ index cde78e5..f4bdb0b 100644 + + PsGetVersion(NULL, NULL, &build, NULL); + ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); -+ return; +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -213,6 +242,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) - test_currentprocess(); +@@ -237,6 +265,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_mdl_map(); test_init_funcs(); + test_load_driver(); + test_version(); /* print process report */ diff --git a/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch b/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch index 9f3dfd90..07d8c3e7 100644 --- a/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch +++ b/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch @@ -1,4 +1,4 @@ -From 95d5fbf3bf582fb219d2de40c829a5c18fb27726 Mon Sep 17 00:00:00 2001 +From 36bd8e4497945604cda44057c9dbb500080700a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 6 Jun 2017 23:42:56 +0200 Subject: [PATCH] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList. @@ -11,10 +11,10 @@ Subject: [PATCH] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList. 4 files changed, 127 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 343033d..9fd7231 100644 +index 0fea91b..4bd0ff7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -1814,7 +1814,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside, +@@ -2029,7 +2029,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside, ULONG Tag, USHORT Depth) { @@ -41,7 +41,7 @@ index 343033d..9fd7231 100644 /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index f4bdb0b..f56e2dd 100644 +index 57aaa28..ab55b48 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -22,6 +22,9 @@ @@ -54,8 +54,8 @@ index f4bdb0b..f56e2dd 100644 #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -@@ -216,6 +219,33 @@ static void test_version(void) - return; +@@ -238,6 +241,33 @@ static void test_version(void) + ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); } +static void test_lookaside_list(void) @@ -88,15 +88,15 @@ index f4bdb0b..f56e2dd 100644 static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -243,6 +273,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) - test_mdl_map(); +@@ -266,6 +296,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_init_funcs(); + test_load_driver(); test_version(); + test_lookaside_list(); /* print process report */ if (test_input->winetest_debug) -@@ -277,7 +308,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * +@@ -317,7 +348,7 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { @@ -105,7 +105,7 @@ index f4bdb0b..f56e2dd 100644 IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } -@@ -299,14 +330,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) +@@ -342,14 +373,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) break; } @@ -123,7 +123,7 @@ index f4bdb0b..f56e2dd 100644 return STATUS_SUCCESS; } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h -index 5abe18b..175c07d 100644 +index 0cd1673..ed27180 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -144,20 +144,18 @@ typedef enum _KWAIT_REASON @@ -232,7 +232,7 @@ index 5abe18b..175c07d 100644 typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; -@@ -1372,8 +1440,10 @@ PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); +@@ -1373,8 +1441,10 @@ PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); @@ -244,7 +244,7 @@ index 5abe18b..175c07d 100644 PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); diff --git a/include/winnt.h b/include/winnt.h -index 45c3222..719cf84 100644 +index f1c49f2..90efd6a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -755,6 +755,8 @@ typedef struct _MEMORY_BASIC_INFORMATION diff --git a/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch b/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch index a7a60a4b..3bb954ee 100644 --- a/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch +++ b/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch @@ -1,8 +1,8 @@ -From 30a73575f846a045b78c6f67db6f39c6045bcc5c Mon Sep 17 00:00:00 2001 +From 66e6fc41a321121dd1b19de16b700ffa5ad52989 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 15 Nov 2015 04:25:27 +0100 -Subject: oleaut32: Initial preparation to make marshalling compatible with - x86_64. +Subject: [PATCH] oleaut32: Initial preparation to make marshalling compatible + with x86_64. --- dlls/oleaut32/tmarshal.c | 94 ++++++++++++++++++++++++++---------------------- @@ -11,7 +11,7 @@ Subject: oleaut32: Initial preparation to make marshalling compatible with 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c -index e0e1e083c48..9fd0f0374ba 100644 +index afb1b67..49cbf81 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -635,42 +635,51 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { @@ -130,7 +130,7 @@ index e0e1e083c48..9fd0f0374ba 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; -@@ -883,19 +892,19 @@ serialize_param( +@@ -886,19 +895,19 @@ serialize_param( if (debugout) TRACE_(olerelay)("NULL"); return S_OK; } @@ -153,7 +153,7 @@ index e0e1e083c48..9fd0f0374ba 100644 if (writeit) hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg); if (dealloc && *(IUnknown **)arg) -@@ -943,7 +952,7 @@ serialize_param( +@@ -976,7 +985,7 @@ serialize_param( debugout, dealloc, tdesc2, @@ -162,7 +162,7 @@ index e0e1e083c48..9fd0f0374ba 100644 buf ); ITypeInfo_ReleaseVarDesc(tinfo2, vdesc); -@@ -960,7 +969,7 @@ serialize_param( +@@ -993,7 +1002,7 @@ serialize_param( break; case TKIND_ENUM: hres = S_OK; @@ -171,7 +171,7 @@ index e0e1e083c48..9fd0f0374ba 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); break; -@@ -986,7 +995,7 @@ serialize_param( +@@ -1019,7 +1028,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("["); for (i=0;itdescElem, tinfo) ? (LPBYTE) *arg : (LPBYTE) arg; @@ -180,7 +180,7 @@ index e0e1e083c48..9fd0f0374ba 100644 if (hres) return hres; if (debugout && (ielemdescVar.tdesc, @@ -255,7 +255,7 @@ index e0e1e083c48..9fd0f0374ba 100644 buf ); ITypeInfo_ReleaseVarDesc(tinfo2, vdesc); -@@ -1250,7 +1259,7 @@ deserialize_param( +@@ -1314,7 +1323,7 @@ deserialize_param( hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD)); if (hres) ERR("Failed to read enum (4 byte)\n"); } @@ -264,7 +264,7 @@ index e0e1e083c48..9fd0f0374ba 100644 break; default: ERR("Unhandled typekind %d\n",tattr->typekind); -@@ -1276,7 +1285,7 @@ deserialize_param( +@@ -1340,7 +1349,7 @@ deserialize_param( if (_passbyref(&adesc->tdescElem, tinfo)) { base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); @@ -273,7 +273,7 @@ index e0e1e083c48..9fd0f0374ba 100644 } for (i=0;itdescElem, @@ -282,7 +282,7 @@ index e0e1e083c48..9fd0f0374ba 100644 buf ); return S_OK; -@@ -1415,7 +1424,7 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) +@@ -1479,7 +1488,7 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) static DWORD WINAPI xCall(int method, void **args) { TMProxyImpl *tpinfo = args[0]; @@ -291,8 +291,8 @@ index e0e1e083c48..9fd0f0374ba 100644 const FUNCDESC *fdesc; HRESULT hres; int i; -@@ -1475,7 +1484,7 @@ static DWORD WINAPI xCall(int method, void **args) - if (nrofnames > sizeof(names)/sizeof(names[0])) +@@ -1539,7 +1548,7 @@ static DWORD WINAPI xCall(int method, void **args) + if (nrofnames > ARRAY_SIZE(names)) ERR("Need more names!\n"); - xargs = (DWORD *)(args + 1); @@ -300,7 +300,7 @@ index e0e1e083c48..9fd0f0374ba 100644 for (i=0;icParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; if (TRACE_ON(olerelay)) { -@@ -1542,7 +1551,7 @@ static DWORD WINAPI xCall(int method, void **args) +@@ -1606,7 +1615,7 @@ static DWORD WINAPI xCall(int method, void **args) buf.curoff = 0; /* generic deserializer using typelib description */ @@ -309,7 +309,7 @@ index e0e1e083c48..9fd0f0374ba 100644 status = S_OK; for (i=0;icParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; -@@ -2069,7 +2078,8 @@ TMStubImpl_Invoke( +@@ -2133,7 +2142,8 @@ TMStubImpl_Invoke( const FUNCDESC *fdesc; TMStubImpl *This = impl_from_IRpcStubBuffer(iface); HRESULT hres; @@ -319,7 +319,7 @@ index e0e1e083c48..9fd0f0374ba 100644 marshal_state buf; UINT nrofnames = 0; BSTR names[10]; -@@ -2134,7 +2144,7 @@ TMStubImpl_Invoke( +@@ -2198,7 +2208,7 @@ TMStubImpl_Invoke( nrofargs = 0; for (i=0;icParams;i++) nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); @@ -328,7 +328,7 @@ index e0e1e083c48..9fd0f0374ba 100644 if (!args) { hres = E_OUTOFMEMORY; -@@ -2162,12 +2172,12 @@ TMStubImpl_Invoke( +@@ -2226,12 +2236,12 @@ TMStubImpl_Invoke( } } @@ -344,10 +344,10 @@ index e0e1e083c48..9fd0f0374ba 100644 (xargs-args), args diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index 311cca33520..f887684bdde 100644 +index a3b317a..9c575ba 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c -@@ -6349,15 +6349,15 @@ static double (* const call_double_method)(void*,int,const DWORD*,int*) = (void +@@ -6360,15 +6360,15 @@ __ASM_GLOBAL_FUNC( call_double_method, * Invokes a method, or accesses a property of an object, that implements the * interface described by the type description. */ @@ -366,7 +366,7 @@ index 311cca33520..f887684bdde 100644 if (nrargs > 30) TRACE("..."); TRACE(")\n"); } -@@ -6365,7 +6365,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { +@@ -6376,7 +6376,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { switch (callconv) { case CC_STDCALL: case CC_CDECL: @@ -376,10 +376,10 @@ index 311cca33520..f887684bdde 100644 default: FIXME("unsupported calling convention %d\n",callconv); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h -index d977dfb063f..c2e991d964d 100644 +index 629ed72..b91c66a 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h -@@ -618,7 +618,7 @@ static inline BOOL heap_free( LPVOID mem ) +@@ -597,7 +597,7 @@ WORD typeofarray HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; @@ -389,5 +389,5 @@ index d977dfb063f..c2e991d964d 100644 HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; -- -2.14.1 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1dde2d4e..a265c155 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "96a6053feda4e16480c21d01b3688a8d38e5ad6d" + echo "a1e0a029b0ce80e6561e0656ae4530fb1a8d4316" } # Show version information @@ -377,7 +377,6 @@ patch_enable_all () enable_wined3d_wined3d_guess_gl_vendor="$1" enable_winedbg_Process_Arguments="$1" enable_winedevice_Default_Drivers="$1" - enable_winedevice_Fix_Relocation="$1" enable_winemapi_user_xdg_mail="$1" enable_winemenubuilder_Desktop_Icon_Path="$1" enable_winemp3_acm_MPEG3_StreamOpen="$1" @@ -1309,9 +1308,6 @@ patch_enable () winedevice-Default_Drivers) enable_winedevice_Default_Drivers="$2" ;; - winedevice-Fix_Relocation) - enable_winedevice_Fix_Relocation="$2" - ;; winemapi-user-xdg-mail) enable_winemapi_user_xdg_mail="$2" ;; @@ -7754,21 +7750,6 @@ if test "$enable_winedevice_Default_Drivers" -eq 1; then ) >> "$patchlist" fi -# Patchset winedevice-Fix_Relocation -# | -# | This patchset fixes the following Wine bugs: -# | * [#28254] Fix crash of winedevice when relocation entry crosses page boundary -# | -# | Modified files: -# | * programs/winedevice/device.c -# | -if test "$enable_winedevice_Fix_Relocation" -eq 1; then - patch_apply winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "winedevice: Avoid invalid memory access when relocation block addresses memory outside of the current page.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winemapi-user-xdg-mail # | # | This patchset fixes the following Wine bugs: diff --git a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch index adec03cc..fc8cc0f3 100644 --- a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch +++ b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch @@ -1,4 +1,4 @@ -From b8e6db45765947ef23bbbbb080cd487170f4bbd6 Mon Sep 17 00:00:00 2001 +From e7592f4068371b5a8b17f25278de99d49e61e235 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 2 Mar 2016 16:36:33 +0800 Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6. @@ -21,7 +21,7 @@ ietoolbar_small.svg - 256x16 create mode 100644 dlls/shell32/resources/ietoolbar_small.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index 0664c85..9c15a71 100644 +index cf19029..6e8d277 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -76,6 +76,8 @@ SVG_SRCS = \ @@ -31,8 +31,8 @@ index 0664c85..9c15a71 100644 + resources/ietoolbar.svg \ + resources/ietoolbar_small.svg \ resources/internet.svg \ - resources/lock.svg \ resources/log_off.svg \ + resources/menu.svg \ diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241 @@ -3841,10 +3841,10 @@ index 0000000..2aa52cd + + diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index d586a05..dcb8f0a 100644 +index a13349c..e366eee 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -698,6 +698,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp +@@ -976,6 +976,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp /* @makedep: resources/idb_tb_small.bmp */ IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp 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 47b65ba0..7694b0ff 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 5eaebe8bd280d4a331911bfdc088b4f0e9b655b5 Mon Sep 17 00:00:00 2001 +From 5395e054188dd53c54632e28ff6fd0d089e363a7 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 @@ -11,7 +11,7 @@ Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr 3 files changed, 79 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index f56e2dd..c09099f 100644 +index ab55b48..a104d95 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -31,6 +31,7 @@ @@ -31,7 +31,7 @@ index f56e2dd..c09099f 100644 static HANDLE okfile; static LONG successes; static LONG failures; -@@ -246,6 +249,52 @@ static void test_lookaside_list(void) +@@ -268,6 +271,52 @@ static void test_lookaside_list(void) ExDeleteNPagedLookasideList(&list); } @@ -84,15 +84,15 @@ index f56e2dd..c09099f 100644 static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -274,6 +323,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) - test_init_funcs(); +@@ -297,6 +346,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) + test_load_driver(); test_version(); test_lookaside_list(); + test_default_modules(); /* print process report */ if (test_input->winetest_debug) -@@ -362,6 +412,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) +@@ -405,6 +455,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) DbgPrint("loading driver\n"); @@ -114,10 +114,10 @@ index 5c124ca..e76ccc9 100644 void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index fa8b268..aad5981 100644 +index 201a041..33b332d 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c -@@ -560,7 +560,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ +@@ -124,7 +124,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { diff --git a/patches/winedevice-Fix_Relocation/definition b/patches/winedevice-Fix_Relocation/definition index 98073111..0f523d63 100644 --- a/patches/winedevice-Fix_Relocation/definition +++ b/patches/winedevice-Fix_Relocation/definition @@ -1 +1,2 @@ Fixes: [28254] Fix crash of winedevice when relocation entry crosses page boundary +Disabled: True