From e0c5f8a2b91892143b99c71dc09733591c342868 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 13 Feb 2016 04:52:20 +0100 Subject: [PATCH] Rebase against 0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7. [kernel32-CompareString_Length] Removed patch to ensure CompareStringW aborts on the first nonmatching character (accepted upstream). [ntdll-SystemRecommendedSharedDataAlignment] Removed patch to implement SystemRecommendedSharedDataAlignment class (accepted upstream). [vmm.vxd-PageReserve] Removed patch to fix protection flags passed to VirtualAlloc call (accepted upstream). --- ...anging-strict-drawing-through-an-exp.patch | 10 +- ...1-api-ms-win-core-com-l1-1-1-Add-dll.patch | 136 -------------- ...dll-and-add-stub-for-QuirkIsEnabled.patch} | 0 ...i-ms-win-core-quirks-l1-1-0-Add-dll.patch} | 0 ...appmodel-runtime-l1-1-1-Add-new-dll.patch} | 0 ...ms-win-core-apiquery-l1-1-0-Add-dll.patch} | 0 ...ms-win-core-delayload-l1-1-1-Add-dll.patch | 57 ------ ...api-ms-win-core-heap-l2-1-0-Add-dll.patch} | 0 ...dd-dll-and-add-stub-for-ordinal-811.patch} | 0 ...in-core-libraryloader-l1-2-0-Add-dll.patch | 83 --------- ...dd-dll.patch => 0007-shcore-Add-dll.patch} | 0 ...-core-kernel32-legacy-l1-1-1-Add-dll.patch | 69 ------- ...-win-shcore-obsolete-l1-1-0-Add-dll.patch} | 0 ...al-l1-1-0-Add-dll-and-add-stub-for-.patch} | 0 ...nting-classicprovider-l1-1-0-Add-dll.patch | 62 ------ ...el-usercontext-l1-1-0-Add-dll-and-a.patch} | 0 ...ms-win-shcore-thread-l1-1-0-Add-dll.patch} | 0 ...re-winrt-registration-l1-1-0-Add-dll.patch | 56 ------ ...al-l1-1-0-Add-stub-for-GetThemeServ.patch} | 0 ...i-ms-win-core-memory-l1-1-2-Add-dll.patch} | 0 ...pi-ms-win-core-wow64-l1-1-0-Add-dll.patch} | 0 ...ore-shlwapi-obsolete-l1-2-0-Add-dll.patch} | 0 ...-win-core-threadpool-l1-2-0-Add-dll.patch} | 0 ...ms-win-shcore-stream-l1-1-0-Add-dll.patch} | 0 ...-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch} | 0 ...s-win-uxtheme-themes-l1-1-0-Add-dll.patch} | 12 +- ...rtcore-ntuser-window-l1-1-0-Add-dll.patch} | 0 ...ore-ntuser-syscolors-l1-1-0-Add-dll.patch} | 0 ...n-rtcore-ntuser-draw-l1-1-0-Add-dll.patch} | 0 ...ore-ntuser-sysparams-l1-1-0-Add-dll.patch} | 0 ...el32-package-current-l1-1-0-Add-dll.patch} | 0 ...ore-Add-SetProcessDpiAwareness-stub.patch} | 0 ...Implement-stub-for-GetDpiForMonitor.patch} | 0 ...elbase-Add-stub-for-QuirkIsEnabled3.patch} | 0 ...Add-stub-for-GetProcessDpiAwareness.patch} | 0 ...bs-for-MakeWindowAssociation-and-Get.patch | 17 +- ...StringW-should-abort-on-the-first-no.patch | 92 --------- ...dd-some-more-tests-for-NORM_IGNORESY.patch | 31 --- ...dd-further-tests-for-comparing-strin.patch | 32 ---- .../kernel32-CompareString_Length/definition | 1 - .../0001-ntdll-Implement-NtQuerySection.patch | 32 ++-- ...-constants-to-SYSTEM_INFORMATION_CLA.patch | 21 +-- ...SystemRecommendedSharedDataAlignment.patch | 70 ------- .../definition | 1 - patches/patchinstall.sh | 176 ++++++------------ ...eference-to-the-parent-object-for-pi.patch | 53 ++++-- ...-support-for-global-and-local-shared.patch | 30 +-- ...tection-flags-passed-to-VirtualAlloc.patch | 25 --- patches/vmm.vxd-PageReserve/definition | 1 - 49 files changed, 155 insertions(+), 912 deletions(-) delete mode 100644 patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch => 0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch => 0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch => 0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch => 0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch} (100%) delete mode 100644 patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch => 0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch => 0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch} (100%) delete mode 100644 patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0013-shcore-Add-dll.patch => 0007-shcore-Add-dll.patch} (100%) delete mode 100644 patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch => 0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch => 0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch} (100%) delete mode 100644 patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch => 0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0017-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch => 0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch} (100%) delete mode 100644 patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch rename patches/api-ms-win-Stub_DLLs/{0018-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch => 0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0019-api-ms-win-core-memory-l1-1-2-Add-dll.patch => 0013-api-ms-win-core-memory-l1-1-2-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0020-api-ms-win-core-wow64-l1-1-0-Add-dll.patch => 0014-api-ms-win-core-wow64-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0021-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch => 0015-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0022-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch => 0016-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0023-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch => 0017-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0024-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch => 0018-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0025-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch => 0019-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch} (94%) rename patches/api-ms-win-Stub_DLLs/{0026-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch => 0020-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0027-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch => 0021-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0028-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch => 0022-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0029-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch => 0023-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0030-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch => 0024-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0031-shcore-Add-SetProcessDpiAwareness-stub.patch => 0025-shcore-Add-SetProcessDpiAwareness-stub.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0032-shcore-Implement-stub-for-GetDpiForMonitor.patch => 0026-shcore-Implement-stub-for-GetDpiForMonitor.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0033-kernelbase-Add-stub-for-QuirkIsEnabled3.patch => 0027-kernelbase-Add-stub-for-QuirkIsEnabled3.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0034-shcore-Add-stub-for-GetProcessDpiAwareness.patch => 0028-shcore-Add-stub-for-GetProcessDpiAwareness.patch} (100%) delete mode 100644 patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch delete mode 100644 patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch delete mode 100644 patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch delete mode 100644 patches/kernel32-CompareString_Length/definition delete mode 100644 patches/ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch delete mode 100644 patches/ntdll-SystemRecommendedSharedDataAlignment/definition delete mode 100644 patches/vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch delete mode 100644 patches/vmm.vxd-PageReserve/definition diff --git a/patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch b/patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch index 2eb03e21..18441640 100644 --- a/patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch +++ b/patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch @@ -1,4 +1,4 @@ -From 646ed3caf72acf69a95ec771e01930a029228f57 Mon Sep 17 00:00:00 2001 +From b0a0388503a1576fb9b1b91ca764251b30f7dd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 20 Jul 2014 22:22:14 +0200 Subject: wined3d: allow changing strict drawing through an exported function @@ -9,7 +9,7 @@ Subject: wined3d: allow changing strict drawing through an exported function 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec -index 5933b48..e3b954d 100644 +index bbd2fb5..2fd0c0e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -220,6 +220,8 @@ @@ -18,9 +18,9 @@ index 5933b48..e3b954d 100644 +@ cdecl wined3d_strictdrawing_set(long) + - @ cdecl wined3d_surface_get_pitch(ptr) - @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) + @ cdecl wined3d_swapchain_decref(ptr) + @ cdecl wined3d_swapchain_get_back_buffer(ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0543d97..6a62697 100644 --- a/dlls/wined3d/wined3d_main.c @@ -38,5 +38,5 @@ index 0543d97..6a62697 100644 BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { -- -2.7.0 +2.7.1 diff --git a/patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch deleted file mode 100644 index c66f7b9f..00000000 --- a/patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 06a2d09b5e443d01c7177d6e74e7e5a43fb4ce26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 15 Jan 2016 12:20:06 +0100 -Subject: api-ms-win-core-com-l1-1-1: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-com-l1-1-1/Makefile.in | 1 + - .../api-ms-win-core-com-l1-1-1.spec | 82 ++++++++++++++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 85 insertions(+) - create mode 100644 dlls/api-ms-win-core-com-l1-1-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec - -diff --git a/configure.ac b/configure.ac -index 8aca9a1..09d62ae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2617,6 +2617,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) - WINE_CONFIG_DLL(amstream,,[clean]) - WINE_CONFIG_TEST(dlls/amstream/tests) - WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) -diff --git a/dlls/api-ms-win-core-com-l1-1-1/Makefile.in b/dlls/api-ms-win-core-com-l1-1-1/Makefile.in -new file mode 100644 -index 0000000..a37f743 ---- /dev/null -+++ b/dlls/api-ms-win-core-com-l1-1-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-com-l1-1-1.dll -diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec -new file mode 100644 -index 0000000..d2914f0 ---- /dev/null -+++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec -@@ -0,0 +1,82 @@ -+@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID -+@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString -+@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess -+@ stub CoAllowUnmarshalerCLSID -+@ stub CoCancelCall -+@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy -+@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler -+@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid -+@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance -+@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx -+@ stub CoCreateInstanceFromApp -+@ stub CoDecodeProxy -+@ stub CoDecrementMTAUsage -+@ stub CoDisableCallCancellation -+@ stub CoDisconnectContext -+@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -+@ stub CoEnableCallCancellation -+@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries -+@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -+@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType -+@ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext -+@ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID -+@ stub CoGetCancelObject -+@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject -+@ stdcall CoGetContextToken(ptr) ole32.CoGetContextToken -+@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId -+@ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess -+@ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext -+@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream -+@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc -+@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax -+@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext -+@ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid -+@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal -+@ stub CoGetStdMarshalEx -+@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass -+@ stdcall CoImpersonateClient() ole32.CoImpersonateClient -+@ stub CoIncrementMTAUsage -+@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx -+@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity -+@ stub CoInvalidateRemoteMachineBindings -+@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected -+@ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal -+@ stdcall CoMarshalHresult(ptr long) ole32.CoMarshalHresult -+@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream -+@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface -+@ stub CoQueryAuthenticationServices -+@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryClientBlanket -+@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket -+@ stub CoRegisterActivationFilter -+@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject -+@ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -+@ stub CoRegisterSurrogate -+@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData -+@ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess -+@ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects -+@ stdcall CoRevertToSelf() ole32.CoRevertToSelf -+@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject -+@ stub CoSetCancelObject -+@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket -+@ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects -+@ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext -+@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc -+@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree -+@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc -+@ stub CoTestCancel -+@ stdcall CoUninitialize() ole32.CoUninitialize -+@ stdcall CoUnmarshalHresult(ptr ptr) ole32.CoUnmarshalHresult -+@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface -+@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles -+@ stub CoWaitForMultipleObjects -+@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal -+@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray -+@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream -+@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString -+@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID -+@ stdcall PropVariantClear(ptr) ole32.PropVariantClear -+@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy -+@ stub RoGetAgileReference -+@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID -+@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 -+@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 16db908..e50ba18 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -224,6 +224,7 @@ my @dll_groups = - "ole32", - "api-ms-win-downlevel-ole32-l1-1-0", - "api-ms-win-core-com-l1-1-0", -+ "api-ms-win-core-com-l1-1-1", - "combase", - ], - [ --- -2.6.4 - diff --git a/patches/api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch rename to patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch diff --git a/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch b/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch rename to patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch deleted file mode 100644 index e1f4b82c..00000000 --- a/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4535655125fb462a4a3651f3ecbfab07d35c5ba7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 15 Jan 2016 13:31:22 +0100 -Subject: api-ms-win-core-delayload-l1-1-1: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in | 1 + - .../api-ms-win-core-delayload-l1-1-1.spec | 3 +++ - tools/make_specfiles | 1 + - 4 files changed, 6 insertions(+) - create mode 100644 dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec - -diff --git a/configure.ac b/configure.ac -index 462850e..01afeda 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2700,6 +2700,7 @@ WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) -+WINE_CONFIG_DLL(api-ms-win-core-delayload-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-2) -diff --git a/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in b/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in -new file mode 100644 -index 0000000..bccec10 ---- /dev/null -+++ b/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-delayload-l1-1-1.dll -diff --git a/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec b/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec -new file mode 100644 -index 0000000..fe2b354 ---- /dev/null -+++ b/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec -@@ -0,0 +1,3 @@ -+@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook -+@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI -+@ stub ResolveDelayLoadsFromDll -diff --git a/tools/make_specfiles b/tools/make_specfiles -index e62c2cd..05010cc 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -165,6 +165,7 @@ my @dll_groups = - "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-debug-l1-1-0", - "api-ms-win-core-debug-l1-1-1", -+ "api-ms-win-core-delayload-l1-1-1", - "api-ms-win-core-errorhandling-l1-1-0", - "api-ms-win-core-errorhandling-l1-1-1", - "api-ms-win-core-interlocked-l1-1-0", --- -2.6.4 - diff --git a/patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch rename to patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch diff --git a/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch deleted file mode 100644 index cbc5169d..00000000 --- a/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 4ed59d0fd1b3e80073d39eb18155b8e8149ec687 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 15 Jan 2016 13:48:54 +0100 -Subject: api-ms-win-core-libraryloader-l1-2-0: Add dll. - ---- - configure.ac | 1 + - .../Makefile.in | 1 + - .../api-ms-win-core-libraryloader-l1-2-0.spec | 29 ++++++++++++++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 32 insertions(+) - create mode 100644 dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec - -diff --git a/configure.ac b/configure.ac -index bedf093..a2a4f84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2664,6 +2664,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) -+WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) -diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in -new file mode 100644 -index 0000000..5552133 ---- /dev/null -+++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-libraryloader-l1-2-0.dll -diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec -new file mode 100644 -index 0000000..6c385b6 ---- /dev/null -+++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec -@@ -0,0 +1,29 @@ -+@ stub AddDllDirectory -+@ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls -+@ stdcall EnumResourceLanguagesExA(long str str ptr long long long) kernel32.EnumResourceLanguagesExA -+@ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long) kernel32.EnumResourceLanguagesExW -+@ stub EnumResourceNamesExA -+@ stub EnumResourceNamesExW -+@ stub EnumResourceTypesExA -+@ stub EnumResourceTypesExW -+@ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW -+@ stub FindStringOrdinal -+@ stdcall FreeLibrary(long) kernel32.FreeLibrary -+@ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread -+@ stdcall FreeResource(long) kernel32.FreeResource -+@ stdcall GetModuleFileNameA(long ptr long) kernel32.GetModuleFileNameA -+@ stdcall GetModuleFileNameW(long ptr long) kernel32.GetModuleFileNameW -+@ stdcall GetModuleHandleA(str) kernel32.GetModuleHandleA -+@ stdcall GetModuleHandleExA(long ptr ptr) kernel32.GetModuleHandleExA -+@ stdcall GetModuleHandleExW(long ptr ptr) kernel32.GetModuleHandleExW -+@ stdcall GetModuleHandleW(wstr) kernel32.GetModuleHandleW -+@ stdcall GetProcAddress(long str) kernel32.GetProcAddress -+@ stdcall LoadLibraryExA( str long long) kernel32.LoadLibraryExA -+@ stdcall LoadLibraryExW(wstr long long) kernel32.LoadLibraryExW -+@ stdcall LoadResource(long long) kernel32.LoadResource -+@ stdcall LoadStringA(long long ptr long) user32.LoadStringA -+@ stdcall LoadStringW(long long ptr long) user32.LoadStringW -+@ stdcall LockResource(long) kernel32.LockResource -+@ stub RemoveDllDirectory -+@ stub SetDefaultDllDirectories -+@ stdcall SizeofResource(long long) kernel32.SizeofResource -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 5018987..3d912ff 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -215,6 +215,7 @@ my @dll_groups = - "user32", - "api-ms-win-core-libraryloader-l1-1-0", - "api-ms-win-core-libraryloader-l1-1-1", -+ "api-ms-win-core-libraryloader-l1-2-0", - ], - [ - "kernel32", --- -2.7.0 - diff --git a/patches/api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch deleted file mode 100644 index 36fec5d6..00000000 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 753cae8f8c0bdca9cba110c36a59952032fb5ec2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 Jan 2016 20:01:49 +0100 -Subject: api-ms-win-core-kernel32-legacy-l1-1-1: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in | 1 + - .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 15 +++++++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 18 insertions(+) - create mode 100644 dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec - -diff --git a/configure.ac b/configure.ac -index a2a4f84..8303468 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) -diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in -new file mode 100644 -index 0000000..c4a5c44 ---- /dev/null -+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-kernel32-legacy-l1-1-1.dll -diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec -new file mode 100644 -index 0000000..579e254 ---- /dev/null -+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec -@@ -0,0 +1,15 @@ -+@ stdcall FindFirstVolumeMountPointW(wstr ptr long) kernel32.FindFirstVolumeMountPointW -+@ stub FindNextVolumeMountPointW -+@ stdcall FindVolumeMountPointClose(ptr) kernel32.FindVolumeMountPointClose -+@ stub GetFileAttributesTransactedW -+@ stub GetFirmwareType -+@ stub GetNumaAvailableMemoryNodeEx -+@ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask -+@ stub GetNumaProcessorNodeEx -+@ stdcall PowerClearRequest(long long) kernel32.PowerClearRequest -+@ stdcall PowerCreateRequest(ptr) kernel32.PowerCreateRequest -+@ stdcall PowerSetRequest(long long) kernel32.PowerSetRequest -+@ stdcall SetDllDirectoryW(wstr) kernel32.SetDllDirectoryW -+@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor -+@ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW -+@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 3d912ff..df6254b 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -188,6 +188,7 @@ my @dll_groups = - "api-ms-win-core-heap-obsolete-l1-1-0", - "api-ms-win-core-io-l1-1-1", - "api-ms-win-core-kernel32-legacy-l1-1-0", -+ "api-ms-win-core-kernel32-legacy-l1-1-1", - "api-ms-win-core-localization-l1-1-0", - "api-ms-win-core-localization-l1-2-0", - "api-ms-win-core-localization-obsolete-l1-1-0", --- -2.7.0 - diff --git a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch rename to patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch diff --git a/patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch deleted file mode 100644 index 7efc9122..00000000 --- a/patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fb5ae0f86e24be8fb4ec8f6210d3a5dd9fb0bff9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 Jan 2016 20:09:22 +0100 -Subject: api-ms-win-eventing-classicprovider-l1-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in | 1 + - .../api-ms-win-eventing-classicprovider-l1-1-0.spec | 8 ++++++++ - tools/make_specfiles | 1 + - 4 files changed, 11 insertions(+) - create mode 100644 dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in - create mode 100644 dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec - -diff --git a/configure.ac b/configure.ac -index 4fe0992..5c1e959 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2716,6 +2716,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) -diff --git a/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in -new file mode 100644 -index 0000000..a0f628b ---- /dev/null -+++ b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-eventing-classicprovider-l1-1-0.dll -diff --git a/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec -new file mode 100644 -index 0000000..9b19435 ---- /dev/null -+++ b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec -@@ -0,0 +1,8 @@ -+@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags -+@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel -+@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle -+@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW -+@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent -+@ varargs TraceMessage(int64 long ptr long) advapi32.TraceMessage -+@ stdcall TraceMessageVa(int64 long ptr long ptr) advapi32.TraceMessageVa -+@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids -diff --git a/tools/make_specfiles b/tools/make_specfiles -index d945fbe..0e9d47a 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -151,6 +151,7 @@ my @dll_groups = - "api-ms-win-downlevel-advapi32-l2-1-0", - "api-ms-win-security-base-l1-1-0", - "api-ms-win-core-registry-l1-1-0", -+ "api-ms-win-eventing-classicprovider-l1-1-0", - "api-ms-win-eventing-provider-l1-1-0", - "api-ms-win-security-base-l1-2-0", - "api-ms-win-security-lsalookup-l1-1-0", --- -2.6.4 - diff --git a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch b/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch rename to patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch diff --git a/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch deleted file mode 100644 index 93aa4d59..00000000 --- a/patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ba9d632e784136f5a6bee1bbc3606dd09fed698e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 17 Jan 2016 16:13:29 +0100 -Subject: api-ms-win-core-winrt-registration-l1-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in | 1 + - .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 ++ - tools/make_specfiles | 1 + - 4 files changed, 5 insertions(+) - create mode 100644 dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec - -diff --git a/configure.ac b/configure.ac -index 978b3fd..893f176 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2690,6 +2690,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) -diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in -new file mode 100644 -index 0000000..3c0c04d ---- /dev/null -+++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-winrt-registration-l1-1-0.dll -diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec -new file mode 100644 -index 0000000..20c8d9c ---- /dev/null -+++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec -@@ -0,0 +1,2 @@ -+@ stub RoGetActivatableClassRegistration -+@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 476dc85..042cdb2 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -280,6 +280,7 @@ my @dll_groups = - "combase", - "api-ms-win-core-winrt-l1-1-0", - "api-ms-win-core-winrt-string-l1-1-0", -+ "api-ms-win-core-winrt-registration-l1-1-0", - ], - [ - "bthprops.cpl", --- -2.6.4 - diff --git a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch b/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch rename to patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch diff --git a/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-core-memory-l1-1-2-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-memory-l1-1-2-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0019-api-ms-win-core-memory-l1-1-2-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-memory-l1-1-2-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0020-api-ms-win-core-wow64-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-core-wow64-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0020-api-ms-win-core-wow64-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0014-api-ms-win-core-wow64-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0021-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0015-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0021-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0015-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0022-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0016-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0022-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0016-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0023-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0023-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0024-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0024-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0025-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0019-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch similarity index 94% rename from patches/api-ms-win-Stub_DLLs/0025-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0019-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch index 8172ed4e..04338b1a 100644 --- a/patches/api-ms-win-Stub_DLLs/0025-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0019-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 5924dd86f8e06484443e0bf2390a80a321ec4f0c Mon Sep 17 00:00:00 2001 +From 1ee5402d4001e228e936b40ab7e3043c4e31c8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:02:52 +0100 Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll. @@ -26,7 +26,7 @@ index 566b8f1..308f04e 100644 WINE_CONFIG_TEST(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in new file mode 100644 -index 0000000..588d200 +index 0000000..576b6f6 --- /dev/null +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in @@ -0,0 +1 @@ @@ -62,11 +62,11 @@ index 0000000..0a96983 +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme diff --git a/tools/make_specfiles b/tools/make_specfiles -index 692acd8..7afc0c1 100755 +index f9aea98..52d6583 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -299,6 +299,10 @@ my @dll_groups = - "api-ms-win-core-winrt-registration-l1-1-0", +@@ -300,6 +300,10 @@ my @dll_groups = + "api-ms-win-core-winrt-string-l1-1-0", ], [ + "uxtheme", @@ -77,5 +77,5 @@ index 692acd8..7afc0c1 100755 "irprops.cpl", ], -- -2.6.4 +2.7.1 diff --git a/patches/api-ms-win-Stub_DLLs/0026-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0020-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0026-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0020-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0027-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0021-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0027-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0021-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0028-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0022-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0028-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0022-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0029-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0023-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0029-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0023-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0030-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0024-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0030-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0024-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0031-shcore-Add-SetProcessDpiAwareness-stub.patch b/patches/api-ms-win-Stub_DLLs/0025-shcore-Add-SetProcessDpiAwareness-stub.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0031-shcore-Add-SetProcessDpiAwareness-stub.patch rename to patches/api-ms-win-Stub_DLLs/0025-shcore-Add-SetProcessDpiAwareness-stub.patch diff --git a/patches/api-ms-win-Stub_DLLs/0032-shcore-Implement-stub-for-GetDpiForMonitor.patch b/patches/api-ms-win-Stub_DLLs/0026-shcore-Implement-stub-for-GetDpiForMonitor.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0032-shcore-Implement-stub-for-GetDpiForMonitor.patch rename to patches/api-ms-win-Stub_DLLs/0026-shcore-Implement-stub-for-GetDpiForMonitor.patch diff --git a/patches/api-ms-win-Stub_DLLs/0033-kernelbase-Add-stub-for-QuirkIsEnabled3.patch b/patches/api-ms-win-Stub_DLLs/0027-kernelbase-Add-stub-for-QuirkIsEnabled3.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0033-kernelbase-Add-stub-for-QuirkIsEnabled3.patch rename to patches/api-ms-win-Stub_DLLs/0027-kernelbase-Add-stub-for-QuirkIsEnabled3.patch diff --git a/patches/api-ms-win-Stub_DLLs/0034-shcore-Add-stub-for-GetProcessDpiAwareness.patch b/patches/api-ms-win-Stub_DLLs/0028-shcore-Add-stub-for-GetProcessDpiAwareness.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0034-shcore-Add-stub-for-GetProcessDpiAwareness.patch rename to patches/api-ms-win-Stub_DLLs/0028-shcore-Add-stub-for-GetProcessDpiAwareness.patch diff --git a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch b/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch index 4707771f..4e775a5f 100644 --- a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch +++ b/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch @@ -1,4 +1,4 @@ -From 1833c60c709550a99efa024659eb3149204d13f5 Mon Sep 17 00:00:00 2001 +From 144cdcfa8f77e8bf2cdb01d6ced2faa240ea605e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 19 Aug 2014 22:47:51 +0200 Subject: dxgi: Improve stubs for MakeWindowAssociation and @@ -6,14 +6,14 @@ Subject: dxgi: Improve stubs for MakeWindowAssociation and --- dlls/dxgi/dxgi_private.h | 1 + - dlls/dxgi/factory.c | 16 ++++++++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) + dlls/dxgi/factory.c | 14 +++++++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h -index 8703158..85c5ec1 100644 +index 59b436b..fc61bb2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h -@@ -94,6 +94,7 @@ struct dxgi_factory +@@ -102,6 +102,7 @@ struct dxgi_factory IDXGIAdapter1 **adapters; BOOL extended; HWND device_window; @@ -22,7 +22,7 @@ index 8703158..85c5ec1 100644 HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c -index a66585e..1446557 100644 +index 5956e62..8151221 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -163,16 +163,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface, @@ -33,12 +33,11 @@ index a66585e..1446557 100644 + FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); -- return E_NOTIMPL; + if (!window && flags) + return DXGI_ERROR_INVALID_CALL; + + factory->assoc_window = window; -+ return S_OK; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory1 *iface, HWND *window) @@ -57,5 +56,5 @@ index a66585e..1446557 100644 static UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) -- -2.5.0 +2.7.1 diff --git a/patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch b/patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch deleted file mode 100644 index 6268d099..00000000 --- a/patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch +++ /dev/null @@ -1,92 +0,0 @@ -From f8acf44d20407c213dd1f48691b432c2e9f555df Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Fri, 13 Nov 2015 20:36:54 +0800 -Subject: kernel32: CompareStringW should abort on the first nonmatching - character to avoid invalid memory access. (v2) - -For bug 37556. - -Changes in v2 (by Sebastian Lackner): -* Use loop to handle strings ending with multiple \0 characters correctly. - -Signed-off-by: Dmitry Timoshkov -Signed-off-by: Sebastian Lackner ---- - libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- - 1 file changed, 30 insertions(+), 9 deletions(-) - -diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c -index 17b5537..7280501 100644 ---- a/libs/wine/sortkey.c -+++ b/libs/wine/sortkey.c -@@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 - len1--; - len2--; - } -+ while (len1 && !*str1) -+ { -+ str1++; -+ len1--; -+ } -+ while (len2 && !*str2) -+ { -+ str2++; -+ len2--; -+ } - return len1 - len2; - } - -@@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le - len1--; - len2--; - } -+ while (len1 && !*str1) -+ { -+ str1++; -+ len1--; -+ } -+ while (len2 && !*str2) -+ { -+ str2++; -+ len2--; -+ } - return len1 - len2; - } - -@@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, - len1--; - len2--; - } -+ while (len1 && !*str1) -+ { -+ str1++; -+ len1--; -+ } -+ while (len2 && !*str2) -+ { -+ str2++; -+ len2--; -+ } - return len1 - len2; - } - --static inline int real_length(const WCHAR *str, int len) --{ -- while (len && !str[len - 1]) len--; -- return len; --} -- - int wine_compare_string(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) - { - int ret; - -- len1 = real_length(str1, len1); -- len2 = real_length(str2, len2); -- - ret = compare_unicode_weights(flags, str1, len1, str2, len2); - if (!ret) - { --- -2.6.4 - diff --git a/patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch b/patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch deleted file mode 100644 index 4188aaab..00000000 --- a/patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9261fada866235424392ac94d78e2d3a3a02ecc7 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 14 Nov 2015 20:43:39 +0100 -Subject: kernel32/tests: Add some more tests for NORM_IGNORESYMBOLS. - ---- - dlls/kernel32/tests/locale.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c -index 7b0212e..a70dc13 100644 ---- a/dlls/kernel32/tests/locale.c -+++ b/dlls/kernel32/tests/locale.c -@@ -1634,7 +1634,13 @@ static const struct comparestringa_entry comparestringa_data[] = { - { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN }, - { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN }, - { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL }, -- { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN } -+ { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL }, - }; - - static void test_CompareStringA(void) --- -2.6.2 - diff --git a/patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch b/patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch deleted file mode 100644 index 5ea40830..00000000 --- a/patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c855cfddc7853fa8aed1ce4aac9a85c7ff7cb1f1 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Fri, 22 Jan 2016 15:13:36 +0100 -Subject: kenrel32/tests: Add further tests for comparing strings ending with - multiple \0 characters. - ---- - dlls/kernel32/tests/locale.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c -index d531272..4a9e540 100644 ---- a/dlls/kernel32/tests/locale.c -+++ b/dlls/kernel32/tests/locale.c -@@ -1643,6 +1643,14 @@ static const struct comparestringa_entry comparestringa_data[] = { - { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, - { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL }, - { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0\0", 4, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0\0", 4, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 1, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 2, CSTR_EQUAL }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0x", 4, CSTR_LESS_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0x", 4, CSTR_LESS_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 1, CSTR_GREATER_THAN }, -+ { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 2, CSTR_GREATER_THAN }, - }; - - static void test_CompareStringA(void) --- -2.6.4 - diff --git a/patches/kernel32-CompareString_Length/definition b/patches/kernel32-CompareString_Length/definition deleted file mode 100644 index 24e6fcee..00000000 --- a/patches/kernel32-CompareString_Length/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [37556] CompareString should abort on first non-matching character diff --git a/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch index 57521195..5693e923 100644 --- a/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch +++ b/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch @@ -1,4 +1,4 @@ -From 98455537b8e39281df59357bf1a2628350026c27 Mon Sep 17 00:00:00 2001 +From d27ca5000c0fc51c6df0ec6751372f98704508dd Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 16 Oct 2014 23:24:37 +0200 Subject: ntdll: Implement NtQuerySection. (try 2) @@ -14,7 +14,7 @@ Some small modifications by Sebastian Lackner 6 files changed, 148 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index a0d8909..a53e0bb 100644 +index 02166e8..3ee5a52 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -656,26 +656,6 @@ NTSTATUS WINAPI SYSCALL(NtPrivilegeCheck)( @@ -45,10 +45,10 @@ index a0d8909..a53e0bb 100644 */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 38422ae..73ae405 100644 +index d3cd489..44bffc5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -263,7 +263,7 @@ +@@ -267,7 +267,7 @@ @ stdcall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @@ -57,7 +57,7 @@ index 38422ae..73ae405 100644 @ stdcall NtQuerySecurityObject (long long long long long) @ stdcall NtQuerySemaphore (long long ptr long ptr) @ stdcall NtQuerySymbolicLinkObject(long ptr ptr) -@@ -1178,7 +1178,7 @@ +@@ -1188,7 +1188,7 @@ @ stdcall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @@ -67,10 +67,10 @@ index 38422ae..73ae405 100644 @ stdcall ZwQuerySemaphore(long long ptr long ptr) NtQuerySemaphore @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 54c4cf4..f29084f 100644 +index 16a5a1b..5a8d85c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2539,6 +2539,102 @@ NTSTATUS WINAPI SYSCALL(NtOpenSection)( HANDLE *handle, ACCESS_MASK access, cons +@@ -2525,6 +2525,102 @@ NTSTATUS WINAPI SYSCALL(NtOpenSection)( HANDLE *handle, ACCESS_MASK access, cons /*********************************************************************** @@ -174,7 +174,7 @@ index 54c4cf4..f29084f 100644 * ZwMapViewOfSection (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 1957a9a..276cdbf5 100644 +index 1319ada..eb4aad2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1351,7 +1351,7 @@ @@ -187,7 +187,7 @@ index 1957a9a..276cdbf5 100644 @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) ntdll.ZwQuerySymbolicLinkObject @ stdcall ZwQuerySystemInformation(long long long long) ntdll.ZwQuerySystemInformation diff --git a/server/mapping.c b/server/mapping.c -index 16e7c1c..ba26d1e 100644 +index fe30450..ec0ef98 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -64,6 +64,15 @@ struct mapping @@ -206,7 +206,7 @@ index 16e7c1c..ba26d1e 100644 struct ranges *committed; /* list of committed ranges in this mapping */ struct file *shared_file; /* temp file for shared PE mapping */ struct list shared_entry; /* entry in global shared PE mappings list */ -@@ -432,17 +441,34 @@ static unsigned int get_image_params( struct mapping *mapping, int unix_fd, int +@@ -434,17 +443,34 @@ static unsigned int get_image_params( struct mapping *mapping, int unix_fd, int return STATUS_INVALID_IMAGE_FORMAT; } @@ -241,8 +241,8 @@ index 16e7c1c..ba26d1e 100644 break; } -@@ -492,6 +518,15 @@ static struct object *create_mapping( struct directory *root, const struct unico - SACL_SECURITY_INFORMATION ); +@@ -490,6 +516,15 @@ static struct object *create_mapping( struct object *root, const struct unicode_ + mapping->header_size = 0; mapping->base = 0; + mapping->entry = 0; @@ -257,7 +257,7 @@ index 16e7c1c..ba26d1e 100644 mapping->fd = NULL; mapping->shared_file = NULL; mapping->committed = NULL; -@@ -729,6 +764,13 @@ DECL_HANDLER(get_mapping_info) +@@ -706,6 +741,13 @@ DECL_HANDLER(get_mapping_info) reply->protect = mapping->protect; reply->header_size = mapping->header_size; reply->base = mapping->base; @@ -272,10 +272,10 @@ index 16e7c1c..ba26d1e 100644 if ((fd = get_obj_fd( &mapping->obj ))) { diff --git a/server/protocol.def b/server/protocol.def -index 5b45078..0d9b090 100644 +index a5a45eb..fdc07a3 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -1674,6 +1674,13 @@ enum char_info_mode +@@ -1675,6 +1675,13 @@ enum char_info_mode int protect; /* protection flags */ int header_size; /* header size (for VPROT_IMAGE mapping) */ client_ptr_t base; /* default base addr (for VPROT_IMAGE mapping) */ @@ -290,5 +290,5 @@ index 5b45078..0d9b090 100644 obj_handle_t shared_file; /* shared mapping file handle */ @END -- -2.6.1 +2.7.1 diff --git a/patches/ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch b/patches/ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch index feb3607b..03a01e77 100644 --- a/patches/ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch +++ b/patches/ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch @@ -1,14 +1,14 @@ -From 8ffb502a5289e9bd56ae02d292f19c67b94e2b19 Mon Sep 17 00:00:00 2001 +From 26f2ec230b2f6e35c39968d79a533cdb21d3f424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 21 Jan 2016 00:28:15 +0100 Subject: include: Add more constants to SYSTEM_INFORMATION_CLASS. --- - include/winternl.h | 46 +++++++++++++++++++++++++++------------------- - 1 file changed, 27 insertions(+), 19 deletions(-) + include/winternl.h | 44 ++++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/include/winternl.h b/include/winternl.h -index 3494c00..e665a47 100644 +index 9b40fd4..1a799ab 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -822,26 +822,34 @@ typedef enum _SYSTEM_INFORMATION_CLASS { @@ -19,7 +19,11 @@ index 3494c00..e665a47 100644 - Unknown55, - Unknown56, - Unknown57, -- Unknown58, ++ SystemLoadGdiDriverInSystemSpace = 54, ++ SystemNumaProcessorMap = 55, ++ SystemPrefetcherInformation = 56, ++ SystemExtendedProcessInformation = 57, + SystemRecommendedSharedDataAlignment = 58, - Unknown59, - Unknown60, - Unknown61, @@ -34,11 +38,6 @@ index 3494c00..e665a47 100644 - Unknown70, - Unknown71, - Unknown72, -+ SystemLoadGdiDriverInSystemSpace = 54, -+ SystemNumaProcessorMap = 55, -+ SystemPrefetcherInformation = 56, -+ SystemExtendedProcessInformation = 57, -+ SystemRecommendedSharedDataAlignment = 58, + SystemComPlusPackage = 59, + SystemNumaAvailableMemory = 60, + SystemProcessorPowerInformation = 61, @@ -66,5 +65,5 @@ index 3494c00..e665a47 100644 SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- -2.6.4 +2.7.1 diff --git a/patches/ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch b/patches/ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch deleted file mode 100644 index 0df4b19e..00000000 --- a/patches/ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f5437d47185217d5c82ae09301ad92a6d22e55c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 21 Jan 2016 00:30:31 +0100 -Subject: ntdll: Implement SystemRecommendedSharedDataAlignment class in - NtQuerySystemInformation. - ---- - dlls/ntdll/nt.c | 11 +++++++++++ - dlls/ntdll/tests/info.c | 16 ++++++++++++++++ - 2 files changed, 27 insertions(+) - -diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index 9ee1923..e28b21f 100644 ---- a/dlls/ntdll/nt.c -+++ b/dlls/ntdll/nt.c -@@ -2155,6 +2155,17 @@ NTSTATUS WINAPI NtQuerySystemInformation( - RtlFreeHeap(GetProcessHeap(), 0, buf); - } - break; -+ case SystemRecommendedSharedDataAlignment: -+ { -+ len = sizeof(DWORD); -+ if (Length >= len) -+ { -+ if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; -+ else *((DWORD *)SystemInformation) = 64; -+ } -+ else ret = STATUS_INFO_LENGTH_MISMATCH; -+ } -+ break; - default: - FIXME("(0x%08x,%p,0x%08x,%p) stub\n", - SystemInformationClass,SystemInformation,Length,ResultLength); -diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c -index 252736e..e8ad0bf 100644 ---- a/dlls/ntdll/tests/info.c -+++ b/dlls/ntdll/tests/info.c -@@ -1929,6 +1929,19 @@ static void test_thread_start_address(void) - CloseHandle(thread); - } - -+static void test_query_data_alignment(void) -+{ -+ ULONG ReturnLength; -+ NTSTATUS status; -+ DWORD value; -+ -+ value = 0xdeadbeef; -+ status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); -+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -+ ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength); -+ ok(value == 64, "Expected 64, got %u\n", value); -+} -+ - START_TEST(info) - { - char **argv; -@@ -1995,6 +2008,9 @@ START_TEST(info) - test_query_logicalproc(); - test_query_logicalprocex(); - -+ trace("Starting test_query_data_alignment()\n"); -+ test_query_data_alignment(); -+ - /* NtPowerInformation */ - - /* 0xb ProcessorInformation */ --- -2.6.4 - diff --git a/patches/ntdll-SystemRecommendedSharedDataAlignment/definition b/patches/ntdll-SystemRecommendedSharedDataAlignment/definition deleted file mode 100644 index 7ca7ce3c..00000000 --- a/patches/ntdll-SystemRecommendedSharedDataAlignment/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 47ab09fa..eb45e5fd 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "1098a673e61908bacf9459ea6a1ef062f9332d6b" + echo "0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7" } # Show version information @@ -158,7 +158,6 @@ patch_enable_all () enable_iphlpapi_System_Ping="$1" enable_iphlpapi_TCP_Table="$1" enable_kernel32_COMSPEC="$1" - enable_kernel32_CompareString_Length="$1" enable_kernel32_CopyFileEx="$1" enable_kernel32_Cwd_Startup_Info="$1" enable_kernel32_FindFirstFile="$1" @@ -321,7 +320,6 @@ patch_enable_all () enable_uxtheme_CloseThemeData="$1" enable_uxtheme_GTK_Theming="$1" enable_version_VerQueryValue="$1" - enable_vmm_vxd_PageReserve="$1" enable_wbemdisp_ISWbemSecurity="$1" enable_widl_SLTG_Typelib_Support="$1" enable_wine_inf_Performance="$1" @@ -622,9 +620,6 @@ patch_enable () kernel32-COMSPEC) enable_kernel32_COMSPEC="$2" ;; - kernel32-CompareString_Length) - enable_kernel32_CompareString_Length="$2" - ;; kernel32-CopyFileEx) enable_kernel32_CopyFileEx="$2" ;; @@ -1111,9 +1106,6 @@ patch_enable () version-VerQueryValue) enable_version_VerQueryValue="$2" ;; - vmm.vxd-PageReserve) - enable_vmm_vxd_PageReserve="$2" - ;; wbemdisp-ISWbemSecurity) enable_wbemdisp_ISWbemSecurity="$2" ;; @@ -2602,88 +2594,68 @@ fi # | Modified files: # | * configure.ac, dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in, dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win- # | appmodel-runtime-l1-1-1.spec, dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in, dlls/api-ms-win-core-apiquery-l1-1-0 -# | /api-ms-win-core-apiquery-l1-1-0.spec, dlls/api-ms-win-core-com-l1-1-1/Makefile.in, dlls/api-ms-win-core-com-l1-1-1/api- -# | ms-win-core-com-l1-1-1.spec, dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in, dlls/api-ms-win-core-delayload-l1-1-1 -# | /api-ms-win-core-delayload-l1-1-1.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0 -# | /api-ms-win-core-heap-l2-1-0.spec, dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in, dlls/api-ms-win-core- -# | kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec, dlls/api-ms-win-core- -# | libraryloader-l1-2-0/Makefile.in, dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec, -# | dlls/api-ms-win-core-memory-l1-1-2/Makefile.in, dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec, -# | dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec, -# | dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core- -# | shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in, dlls/api-ms-win-core-threadpool-l1-2-0 -# | /api-ms-win-core-threadpool-l1-2-0.spec, dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in, dlls/api-ms-win- -# | core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec, dlls/api-ms-win-core- -# | wow64-l1-1-0/Makefile.in, dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec, dlls/api-ms-win-eventing- -# | classicprovider-l1-1-0/Makefile.in, dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing- -# | classicprovider-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser- -# | draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in, dlls -# | /api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec, dlls/api-ms-win-shcore- -# | obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/api-ms- -# | win-shcore-stream-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec, dlls -# | /api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, -# | dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win- -# | appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-kernel32-package- -# | current-l1-1-0/Makefile.in, dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package- -# | current-l1-1-0.spec, dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win- -# | ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser- -# | syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser- -# | sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser- -# | sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms- -# | win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win- -# | xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, -# | dlls/iertutil/main.c, dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, -# | dlls/shcore/Makefile.in, dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, include/Makefile.in, -# | include/shellscalingapi.h, tools/make_specfiles +# | /api-ms-win-core-apiquery-l1-1-0.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0 +# | /api-ms-win-core-heap-l2-1-0.spec, dlls/api-ms-win-core-memory-l1-1-2/Makefile.in, dlls/api-ms-win-core-memory-l1-1-2 +# | /api-ms-win-core-memory-l1-1-2.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0 +# | /api-ms-win-core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core- +# | shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-core- +# | threadpool-l1-2-0/Makefile.in, dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec, dlls/api- +# | ms-win-core-wow64-l1-1-0/Makefile.in, dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec, dlls/api-ms- +# | win-rtcore-ntuser-draw-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser- +# | draw-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 +# | /api-ms-win-rtcore-ntuser-window-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win- +# | shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in, dlls +# | /api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, +# | dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, dlls/ext-ms-win-appmodel- +# | usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, +# | dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in, dlls +# | /ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec, dlls/ext-ms-win-ntuser- +# | mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win- +# | rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser- +# | syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser- +# | sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls +# | /ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, +# | dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, +# | dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/kernelbase/Makefile.in, +# | dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, dlls/shcore/main.c, +# | dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, include/Makefile.in, include/shellscalingapi.h, tools/make_specfiles # | if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then - patch_apply api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch - patch_apply api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch - patch_apply api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch - patch_apply api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch - patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch - patch_apply api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch - patch_apply api-ms-win-Stub_DLLs/0019-api-ms-win-core-memory-l1-1-2-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0020-api-ms-win-core-wow64-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0021-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0022-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0023-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0024-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0025-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0026-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0027-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0028-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0029-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0030-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0031-shcore-Add-SetProcessDpiAwareness-stub.patch - patch_apply api-ms-win-Stub_DLLs/0032-shcore-Implement-stub-for-GetDpiForMonitor.patch - patch_apply api-ms-win-Stub_DLLs/0033-kernelbase-Add-stub-for-QuirkIsEnabled3.patch - patch_apply api-ms-win-Stub_DLLs/0034-shcore-Add-stub-for-GetProcessDpiAwareness.patch + patch_apply api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch + patch_apply api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch + patch_apply api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch + patch_apply api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch + patch_apply api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch + patch_apply api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch + patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-memory-l1-1-2-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-core-wow64-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0015-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0016-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0017-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0019-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0020-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0021-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0022-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0023-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0024-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0025-shcore-Add-SetProcessDpiAwareness-stub.patch + patch_apply api-ms-win-Stub_DLLs/0026-shcore-Implement-stub-for-GetDpiForMonitor.patch + patch_apply api-ms-win-Stub_DLLs/0027-kernelbase-Add-stub-for-QuirkIsEnabled3.patch + patch_apply api-ms-win-Stub_DLLs/0028-shcore-Add-stub-for-GetProcessDpiAwareness.patch ( - echo '+ { "Michael Müller", "api-ms-win-core-com-l1-1-1: Add dll.", 1 },'; echo '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-quirks-l1-1-0: Add dll.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-core-delayload-l1-1-1: Add dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-appmodel-runtime-l1-1-1: Add new dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-apiquery-l1-1-0: Add dll.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-core-libraryloader-l1-2-0: Add dll.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-core-kernel32-legacy-l1-1-1: Add dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-heap-l2-1-0: Add dll.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-eventing-classicprovider-l1-1-0: Add dll.", 1 },'; echo '+ { "Michael Müller", "iertutil: Add dll and add stub for ordinal 811.", 1 },'; - echo '+ { "Michael Müller", "api-ms-win-core-winrt-registration-l1-1-0: Add dll.", 1 },'; echo '+ { "Sebastian Lackner", "shcore: Add dll.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-shcore-obsolete-l1-1-0: Add dll.", 1 },'; echo '+ { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for XamlBehaviorEnabled.", 1 },'; @@ -3838,25 +3810,6 @@ if test "$enable_kernel32_COMSPEC" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-CompareString_Length -# | -# | This patchset fixes the following Wine bugs: -# | * [#37556] CompareString should abort on first non-matching character -# | -# | Modified files: -# | * dlls/kernel32/tests/locale.c, libs/wine/sortkey.c -# | -if test "$enable_kernel32_CompareString_Length" -eq 1; then - patch_apply kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch - patch_apply kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch - patch_apply kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch - ( - echo '+ { "Dmitry Timoshkov", "kernel32: CompareStringW should abort on the first nonmatching character to avoid invalid memory access.", 2 },'; - echo '+ { "Sebastian Lackner", "kernel32/tests: Add some more tests for NORM_IGNORESYMBOLS.", 1 },'; - echo '+ { "Sebastian Lackner", "kenrel32/tests: Add further tests for comparing strings ending with multiple \\\\0 characters.", 1 },'; - ) >> "$patchlist" -fi - # Patchset kernel32-SetFileInformationByHandle # | # | Modified files: @@ -4975,14 +4928,12 @@ fi # Patchset ntdll-SystemRecommendedSharedDataAlignment # | # | Modified files: -# | * dlls/ntdll/nt.c, dlls/ntdll/tests/info.c, include/winternl.h +# | * include/winternl.h # | if test "$enable_ntdll_SystemRecommendedSharedDataAlignment" -eq 1; then patch_apply ntdll-SystemRecommendedSharedDataAlignment/0001-include-Add-more-constants-to-SYSTEM_INFORMATION_CLA.patch - patch_apply ntdll-SystemRecommendedSharedDataAlignment/0002-ntdll-Implement-SystemRecommendedSharedDataAlignment.patch ( echo '+ { "Michael Müller", "include: Add more constants to SYSTEM_INFORMATION_CLASS.", 1 },'; - echo '+ { "Michael Müller", "ntdll: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation.", 1 },'; ) >> "$patchlist" fi @@ -5651,7 +5602,7 @@ fi # | * rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe # | # | Modified files: -# | * dlls/ntdll/tests/om.c, server/named_pipe.c, server/object.c +# | * dlls/ntdll/tests/om.c, server/named_pipe.c, server/object.c, server/object.h # | if test "$enable_server_Pipe_ObjectName" -eq 1; then patch_apply server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch @@ -6521,21 +6472,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then ) >> "$patchlist" fi -# Patchset vmm.vxd-PageReserve -# | -# | This patchset fixes the following Wine bugs: -# | * [#36013] Fix protection flags passed to VirtualAlloc call in PageReserve VxDCall -# | -# | Modified files: -# | * dlls/vmm.vxd/vmm.c -# | -if test "$enable_vmm_vxd_PageReserve" -eq 1; then - patch_apply vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch - ( - echo '+ { "Sebastian Lackner", "vmm.vxd: Fix protection flags passed to VirtualAlloc.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wbemdisp-ISWbemSecurity # | # | Modified files: diff --git a/patches/server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch b/patches/server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch index 11ce2aec..24e64940 100644 --- a/patches/server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch +++ b/patches/server-Pipe_ObjectName/0001-server-Store-a-reference-to-the-parent-object-for-pi.patch @@ -1,4 +1,4 @@ -From dea19bf17349a7c1c2398a44e15587dae8fbce44 Mon Sep 17 00:00:00 2001 +From fdc6d717dcc6853d7439fa35961448b0c669e998 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 17 Aug 2015 01:11:47 +0200 Subject: server: Store a reference to the parent object for pipe servers. (v2) @@ -6,14 +6,15 @@ Subject: server: Store a reference to the parent object for pipe servers. (v2) --- dlls/ntdll/tests/om.c | 3 --- server/named_pipe.c | 45 +++++++++++++++++++++++++++++++++++++-------- - server/object.c | 18 ++++++++++++------ - 3 files changed, 49 insertions(+), 17 deletions(-) + server/object.c | 22 ++++++++++++++-------- + server/object.h | 2 ++ + 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c -index 3d0487c..84507de 100644 +index c05f31d..4a3c790 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c -@@ -1401,14 +1401,11 @@ static void test_query_object(void) +@@ -1489,14 +1489,11 @@ static void test_query_object(void) status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); str = (UNICODE_STRING *)buffer; @@ -29,7 +30,7 @@ index 3d0487c..84507de 100644 "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); diff --git a/server/named_pipe.c b/server/named_pipe.c -index ffa9e32..c92a117 100644 +index 546984ddf..c69f24b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -148,6 +148,8 @@ static const struct object_ops named_pipe_ops = @@ -108,7 +109,7 @@ index ffa9e32..c92a117 100644 static int pipe_client_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { #ifdef __linux__ -@@ -768,9 +794,10 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, +@@ -729,9 +755,10 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, unsigned int pipe_flags ) { @@ -116,11 +117,11 @@ index ffa9e32..c92a117 100644 struct pipe_server *server; - server = alloc_object( &pipe_server_ops ); -+ server = create_object( &pipe->obj, &pipe_server_ops, &str ); ++ server = create_object( &pipe->obj, &pipe_server_ops, &str, NULL ); if (!server) return NULL; -@@ -792,11 +819,13 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned +@@ -753,11 +780,13 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } @@ -132,11 +133,11 @@ index ffa9e32..c92a117 100644 struct pipe_client *client; - client = alloc_object( &pipe_client_ops ); -+ client = create_object( &pipe->obj, &pipe_client_ops, &str ); ++ client = create_object( &pipe->obj, &pipe_client_ops, &str, NULL ); if (!client) return NULL; -@@ -896,7 +925,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc +@@ -857,7 +886,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } @@ -146,7 +147,7 @@ index ffa9e32..c92a117 100644 type = ((pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && is_messagemode_supported()) ? SOCK_SEQPACKET : SOCK_STREAM; diff --git a/server/object.c b/server/object.c -index d4217c0..ef99334 100644 +index f5d7d9f..0d06745 100644 --- a/server/object.c +++ b/server/object.c @@ -162,7 +162,7 @@ WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len ) @@ -174,7 +175,18 @@ index d4217c0..ef99334 100644 obj = name->parent; } return (WCHAR *)ret; -@@ -269,8 +272,11 @@ static void dump_name( struct object *obj ) +@@ -262,8 +265,8 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st + return parent; + } + +-static struct object *create_object( struct object *parent, const struct object_ops *ops, +- const struct unicode_str *name, const struct security_descriptor *sd ) ++void *create_object( struct object *parent, const struct object_ops *ops, ++ const struct unicode_str *name, const struct security_descriptor *sd ) + { + struct object *obj; + struct object_name *name_ptr; +@@ -358,8 +361,11 @@ static void dump_name( struct object *obj ) if (!name) return; if (name->parent) dump_name( name->parent ); @@ -188,6 +200,19 @@ index d4217c0..ef99334 100644 } /* dump the name of an object to stderr */ +diff --git a/server/object.h b/server/object.h +index f82fb67..fb39482 100644 +--- a/server/object.h ++++ b/server/object.h +@@ -135,6 +135,8 @@ extern WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len ); + extern void dump_object_name( struct object *obj ); + extern struct object *lookup_named_object( struct object *root, const struct unicode_str *name, + unsigned int attr, struct unicode_str *name_left ); ++extern void *create_object( struct object *parent, const struct object_ops *ops, ++ const struct unicode_str *name, const struct security_descriptor *sd ); + extern void *create_named_object( struct object *parent, const struct object_ops *ops, + const struct unicode_str *name, unsigned int attributes, + const struct security_descriptor *sd ); -- -2.7.0 +2.7.1 diff --git a/patches/server-Shared_Memory/0002-server-Implement-support-for-global-and-local-shared.patch b/patches/server-Shared_Memory/0002-server-Implement-support-for-global-and-local-shared.patch index 5cf03b49..0cdc61e6 100644 --- a/patches/server-Shared_Memory/0002-server-Implement-support-for-global-and-local-shared.patch +++ b/patches/server-Shared_Memory/0002-server-Implement-support-for-global-and-local-shared.patch @@ -1,4 +1,4 @@ -From 0d5c923e97bebd777846bfb736319646f248e01a Mon Sep 17 00:00:00 2001 +From 56de1a9701fb2e09ca956692f19aed26b71c34d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 19 Mar 2015 01:22:34 +0100 Subject: server: Implement support for global and local shared memory blocks @@ -158,7 +158,7 @@ index d573d1f..695389a 100644 /* macros for server requests */ diff --git a/include/winternl.h b/include/winternl.h -index 51320f2..5d0aa54 100644 +index 9b40fd4..2270a40 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -366,7 +366,7 @@ typedef struct _TEB @@ -171,10 +171,10 @@ index 51320f2..5d0aa54 100644 ULONG ImpersonationLocale; /* f98/1788 */ ULONG IsImpersonating; /* f9c/178c */ diff --git a/server/fd.c b/server/fd.c -index 559a737..603cef4 100644 +index e995380..362f6c8 100644 --- a/server/fd.c +++ b/server/fd.c -@@ -2481,6 +2481,33 @@ DECL_HANDLER(write) +@@ -2474,6 +2474,33 @@ DECL_HANDLER(write) } } @@ -209,11 +209,11 @@ index 559a737..603cef4 100644 DECL_HANDLER(ioctl) { diff --git a/server/file.h b/server/file.h -index b59de1c..8a9f6b9 100644 +index 2a72568..c8954f3 100644 --- a/server/file.h +++ b/server/file.h -@@ -146,6 +146,14 @@ extern void create_mailslot_device( struct directory *root, const struct unicode - extern struct device *create_unix_device( struct directory *root, const struct unicode_str *name, +@@ -146,6 +146,14 @@ extern void create_mailslot_device( struct object *root, const struct unicode_st + extern struct device *create_unix_device( struct object *root, const struct unicode_str *name, const char *unix_path ); +/* shared memory functions */ @@ -240,7 +240,7 @@ index 7aed338..f984bfc 100644 return 0; } diff --git a/server/mapping.c b/server/mapping.c -index f66f326..75fda15 100644 +index fe30450..40a1f21 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -29,8 +29,32 @@ @@ -276,7 +276,7 @@ index f66f326..75fda15 100644 #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -@@ -114,6 +138,10 @@ static struct list shared_list = LIST_INIT(shared_list); +@@ -116,6 +140,10 @@ static struct list shared_list = LIST_INIT(shared_list); static size_t page_mask; @@ -287,7 +287,7 @@ index f66f326..75fda15 100644 #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) -@@ -158,6 +186,52 @@ static int check_current_dir_for_exec(void) +@@ -160,6 +188,52 @@ static int check_current_dir_for_exec(void) return (ret != MAP_FAILED); } @@ -374,10 +374,10 @@ index a5a45eb..7c61b76 100644 @REQ(flush) int blocking; /* whether it's a blocking flush */ diff --git a/server/thread.c b/server/thread.c -index 251be1c..198c371 100644 +index 494db39..fbbd05a 100644 --- a/server/thread.c +++ b/server/thread.c -@@ -196,6 +196,8 @@ static inline void init_thread_structure( struct thread *thread ) +@@ -200,6 +200,8 @@ static inline void init_thread_structure( struct thread *thread ) thread->desktop_users = 0; thread->token = NULL; thread->exit_poll = NULL; @@ -386,7 +386,7 @@ index 251be1c..198c371 100644 thread->creation_time = current_time; thread->exit_time = 0; -@@ -297,6 +299,8 @@ static void cleanup_thread( struct thread *thread ) +@@ -301,6 +303,8 @@ static void cleanup_thread( struct thread *thread ) thread->inflight[i].client = thread->inflight[i].server = -1; } } @@ -395,7 +395,7 @@ index 251be1c..198c371 100644 thread->req_data = NULL; thread->reply_data = NULL; thread->request_fd = NULL; -@@ -305,6 +309,9 @@ static void cleanup_thread( struct thread *thread ) +@@ -309,6 +313,9 @@ static void cleanup_thread( struct thread *thread ) thread->context = NULL; thread->suspend_context = NULL; thread->desktop = 0; @@ -419,5 +419,5 @@ index ac9af24..59ef250 100644 struct thread_snapshot -- -2.7.0 +2.7.1 diff --git a/patches/vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch b/patches/vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch deleted file mode 100644 index e489ece4..00000000 --- a/patches/vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d0c4bb573627e7e8ea1295bd781ee58c25a8c769 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 9 Jan 2016 21:20:28 +0100 -Subject: vmm.vxd: Fix protection flags passed to VirtualAlloc. - ---- - dlls/vmm.vxd/vmm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c -index 7327f78..833a8d1 100644 ---- a/dlls/vmm.vxd/vmm.c -+++ b/dlls/vmm.vxd/vmm.c -@@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) - if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; - /* FIXME: Handle flags in some way */ - address = (LPVOID )(page * page_size); -- ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); -+ ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); - TRACE("PageReserve: returning: %p\n", ret ); - if ( ret == NULL ) - return -1; --- -2.6.4 - diff --git a/patches/vmm.vxd-PageReserve/definition b/patches/vmm.vxd-PageReserve/definition deleted file mode 100644 index 368e9679..00000000 --- a/patches/vmm.vxd-PageReserve/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [36013] Fix protection flags passed to VirtualAlloc call in PageReserve VxDCall