Rebase against e8b9bda53ac39c913ddc93de0308f0c8b69605fc.

2024-11-21 16:46:54 -08:00 · 2015-10-12 20:14:46 +02:00 · 2015-10-12 20:14:46 +02:00 · e3ea1eef0d
commit e3ea1eef0d
parent cc0556df4a
13 changed files with 30 additions and 3483 deletions
--- a/README.md
+++ b/README.md
@ -61,11 +61,11 @@ for more details.*
 * Add semi-stub for FileFsVolumeInformation information class ([Wine Bug #21466](https://bugs.winehq.org/show_bug.cgi?id=21466))
 * Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185))
 * Add stub dlls required for MSVC 2015 runtime library (Windows 10)
-* Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
+* ~~Add stub fltmgr.sys (filter manager driver)~~ ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
-* Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
+* ~~Add stub for gdiplus.GdipCreateEffect~~ ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
 * Add stub for ntoskrnl.ExReleaseResourceForThread
@ -120,7 +120,7 @@ for more details.*
 * Do not allow to deallocate thread stack for current thread
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
 * ~~Do not trust width/height passed to edit control in WM_SIZE message~~ ([Wine Bug #37542](https://bugs.winehq.org/show_bug.cgi?id=37542))
-* Do not use GdipAlloc and GdipFree in internal functions ([Wine Bug #32786](https://bugs.winehq.org/show_bug.cgi?id=32786))
+* ~~Do not use GdipAlloc and GdipFree in internal functions~~ ([Wine Bug #32786](https://bugs.winehq.org/show_bug.cgi?id=32786))
 * Do not use unixfs for devices without mountpoint
 * Do not wait for hook thread startup in IDirectInput8::Initialize ([Wine Bug #21403](https://bugs.winehq.org/show_bug.cgi?id=21403))
 * Enforce that surfaces are flushed after ReleaseDC
@ -178,7 +178,7 @@ for more details.*
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
 * Globally invalidate key state on changes in other threads ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
 * Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
-* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
+* ~~Ignore unsupported flags for CoInternetSetFeatureEnabled~~ ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
 * Implement AMStream GetMultiMediaStream functions ([Wine Bug #37090](https://bugs.winehq.org/show_bug.cgi?id=37090))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
--- a/patches/fltmgr-Stub_SYS/0001-fltmgr.sys-add-stub-dll-try-3.patch
+++ b/patches/fltmgr-Stub_SYS/0001-fltmgr.sys-add-stub-dll-try-3.patch
@ -1,275 +0,0 @@
-From bc572d7b569aa67eb0c951c18af421a6e62883fe Mon Sep 17 00:00:00 2001
-From: Austin English <austinenglish@gmail.com>
-Date: Wed, 25 Feb 2015 00:55:44 -0600
-Subject: fltmgr.sys: add stub dll (try 4)
-
---
- configure.ac                    |   1 +
- dlls/fltmgr.sys/Makefile.in     |   5 ++
- dlls/fltmgr.sys/fltmgr.sys.spec | 163 ++++++++++++++++++++++++++++++++++++++++
- dlls/fltmgr.sys/main.c          |  38 ++++++++++
- loader/wine.inf.in              |   2 +
- 5 files changed, 209 insertions(+)
- create mode 100644 dlls/fltmgr.sys/Makefile.in
- create mode 100644 dlls/fltmgr.sys/fltmgr.sys.spec
- create mode 100644 dlls/fltmgr.sys/main.c
-
-diff --git a/configure.ac b/configure.ac
-index c61a975..a7a262f 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -2965,6 +2965,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
- WINE_CONFIG_TEST(dlls/faultrep/tests)
- WINE_CONFIG_DLL(fltlib)
-+WINE_CONFIG_DLL(fltmgr.sys)
- WINE_CONFIG_DLL(fntcache)
- WINE_CONFIG_DLL(fontsub)
- WINE_CONFIG_DLL(fusion)
-diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-new file mode 100644
-index 0000000..3fefde7
--- /dev/null
-+++ b/dlls/fltmgr.sys/Makefile.in
-@@ -0,0 +1,5 @@
-+MODULE    = fltmgr.sys
-+EXTRADLLFLAGS = -Wb,--subsystem,native
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-new file mode 100644
-index 0000000..5310269
--- /dev/null
-+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
-@@ -0,0 +1,163 @@
-+@ stub FltAcquirePushLockExclusive
-+@ stub FltAcquirePushLockShared
-+@ stub FltAcquireResourceExclusive
-+@ stub FltAcquireResourceShared
-+@ stub FltAllocateCallbackData
-+@ stub FltAllocateContext
-+@ stub FltAllocateDeferredIoWorkItem
-+@ stub FltAllocateFileLock
-+@ stub FltAllocateGenericWorkItem
-+@ stub FltAllocatePoolAlignedWithTag
-+@ stub FltAttachVolume
-+@ stub FltAttachVolumeAtAltitude
-+@ stub FltBuildDefaultSecurityDescriptor
-+@ stub FltCancelFileOpen
-+@ stub FltCancelIo
-+@ stub FltCbdqDisable
-+@ stub FltCbdqEnable
-+@ stub FltCbdqInitialize
-+@ stub FltCbdqInsertIo
-+@ stub FltCbdqRemoveIo
-+@ stub FltCbdqRemoveNextIo
-+@ stub FltCheckAndGrowNameControl
-+@ stub FltCheckLockForReadAccess
-+@ stub FltCheckLockForWriteAccess
-+@ stub FltCheckOplock
-+@ stub FltClearCallbackDataDirty
-+@ stub FltClearCancelCompletion
-+@ stub FltClose
-+@ stub FltCloseClientPort
-+@ stub FltCloseCommunicationPort
-+@ stub FltCompareInstanceAltitudes
-+@ stub FltCompletePendedPostOperation
-+@ stub FltCompletePendedPreOperation
-+@ stub FltCreateCommunicationPort
-+@ stub FltCreateFile
-+@ stub FltCreateFileEx
-+@ stub FltCreateSystemVolumeInformationFolder
-+@ stub FltCurrentBatchOplock
-+@ stub FltDecodeParameters
-+@ stub FltDeleteContext
-+@ stub FltDeleteFileContext
-+@ stub FltDeleteInstanceContext
-+@ stub FltDeletePushLock
-+@ stub FltDeleteStreamContext
-+@ stub FltDeleteStreamHandleContext
-+@ stub FltDeleteVolumeContext
-+@ stub FltDetachVolume
-+@ stub FltDeviceIoControlFile
-+@ stub FltDoCompletionProcessingWhenSafe
-+@ stub FltEnumerateFilterInformation
-+@ stub FltEnumerateFilters
-+@ stub FltEnumerateInstanceInformationByFilter
-+@ stub FltEnumerateInstanceInformationByVolume
-+@ stub FltEnumerateInstances
-+@ stub FltEnumerateVolumeInformation
-+@ stub FltEnumerateVolumes
-+@ stub FltFlushBuffers
-+@ stub FltFreeCallbackData
-+@ stub FltFreeDeferredIoWorkItem
-+@ stub FltFreeFileLock
-+@ stub FltFreeGenericWorkItem
-+@ stub FltFreePoolAlignedWithTag
-+@ stub FltFreeSecurityDescriptor
-+@ stub FltFsControlFile
-+@ stub FltGetBottomInstance
-+@ stub FltGetContexts
-+@ stub FltGetDestinationFileNameInformation
-+@ stub FltGetDeviceObject
-+@ stub FltGetDiskDeviceObject
-+@ stub FltGetFileContext
-+@ stub FltGetFileNameInformation
-+@ stub FltGetFileNameInformationUnsafe
-+@ stub FltGetFilterFromInstance
-+@ stub FltGetFilterFromName
-+@ stub FltGetFilterInformation
-+@ stub FltGetInstanceContext
-+@ stub FltGetInstanceInformation
-+@ stub FltGetIrpName
-+@ stub FltGetLowerInstance
-+@ stub FltGetRequestorProcess
-+@ stub FltGetRequestorProcessId
-+@ stub FltGetRoutineAddress
-+@ stub FltGetStreamContext
-+@ stub FltGetStreamHandleContext
-+@ stub FltGetSwappedBufferMdlAddress
-+@ stub FltGetTopInstance
-+@ stub FltGetTunneledName
-+@ stub FltGetUpperInstance
-+@ stub FltGetVolumeContext
-+@ stub FltGetVolumeFromDeviceObject
-+@ stub FltGetVolumeFromFileObject
-+@ stub FltGetVolumeFromInstance
-+@ stub FltGetVolumeFromName
-+@ stub FltGetVolumeGuidName
-+@ stub FltGetVolumeInstanceFromName
-+@ stub FltGetVolumeName
-+@ stub FltGetVolumeProperties
-+@ stub FltInitializeFileLock
-+@ stub FltInitializeOplock
-+@ stub FltInitializePushLock
-+@ stub FltIs32bitProcess
-+@ stub FltIsCallbackDataDirty
-+@ stub FltIsDirectory
-+@ stub FltIsIoCanceled
-+@ stub FltIsOperationSynchronous
-+@ stub FltIsVolumeWritable
-+@ stub FltLoadFilter
-+@ stub FltLockUserBuffer
-+@ stub FltNotifyFilterChangeDirectory
-+@ stub FltObjectDereference
-+@ stub FltObjectReference
-+@ stub FltOpenVolume
-+@ stub FltOplockFsctrl
-+@ stub FltOplockIsFastIoPossible
-+@ stub FltParseFileName
-+@ stub FltParseFileNameInformation
-+@ stub FltPerformAsynchronousIo
-+@ stub FltPerformSynchronousIo
-+@ stub FltProcessFileLock
-+@ stub FltPurgeFileNameInformationCache
-+@ stub FltQueryEaFile
-+@ stub FltQueryInformationFile
-+@ stub FltQuerySecurityObject
-+@ stub FltQueryVolumeInformation
-+@ stub FltQueryVolumeInformationFile
-+@ stub FltQueueDeferredIoWorkItem
-+@ stub FltQueueGenericWorkItem
-+@ stub FltReadFile
-+@ stub FltReferenceContext
-+@ stub FltReferenceFileNameInformation
-+@ stub FltRegisterFilter
-+@ stub FltReissueSynchronousIo
-+@ stub FltReleaseContext
-+@ stub FltReleaseContexts
-+@ stub FltReleaseFileNameInformation
-+@ stub FltReleasePushLock
-+@ stub FltReleaseResource
-+@ stub FltRequestOperationStatusCallback
-+@ stub FltRetainSwappedBufferMdlAddress
-+@ stub FltReuseCallbackData
-+@ stub FltSendMessage
-+@ stub FltSetCallbackDataDirty
-+@ stub FltSetCancelCompletion
-+@ stub FltSetEaFile
-+@ stub FltSetFileContext
-+@ stub FltSetInformationFile
-+@ stub FltSetInstanceContext
-+@ stub FltSetSecurityObject
-+@ stub FltSetStreamContext
-+@ stub FltSetStreamHandleContext
-+@ stub FltSetVolumeContext
-+@ stub FltSetVolumeInformation
-+@ stub FltStartFiltering
-+@ stub FltSupportsFileContexts
-+@ stub FltSupportsStreamContexts
-+@ stub FltSupportsStreamHandleContexts
-+@ stub FltTagFile
-+@ stub FltUninitializeFileLock
-+@ stub FltUninitializeOplock
-+@ stub FltUnloadFilter
-+@ stub FltUnregisterFilter
-+@ stub FltUntagFile
-+@ stub FltWriteFile
-diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-new file mode 100644
-index 0000000..7341ef2
--- /dev/null
-+++ b/dlls/fltmgr.sys/main.c
-@@ -0,0 +1,38 @@
-+/*
-+ * fltmgr.sys
-+ *
-+ * Copyright 2015 Austin English
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include <stdarg.h>
-+
-+#include "ntstatus.h"
-+#define WIN32_NO_STATUS
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winternl.h"
-+#include "ddk/wdm.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(fltmgr);
-+
-+NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
-+{
-+    TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
-+
-+    return STATUS_SUCCESS;
-+}
-diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index fcd2e49..8c0cfe4 100644
--- a/loader/wine.inf.in
-+++ b/loader/wine.inf.in
-@@ -2495,6 +2495,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
- 10,syswow64,stdole2.tlb
- 11,,iexplore.exe
- 11,,winetest.exe,-
-+12,,fltmgr.sys,-
- 12,,mountmgr.sys,-
- 12,,ndis.sys,-
- ; skip .NET fake dlls in Wine Mono package
-@@ -2533,6 +2534,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
- 11,,iexplore.exe
- 11,,notepad.exe
- 11,,winetest.exe,-
-+12,,fltmgr.sys
- 12,,mountmgr.sys
- 12,,ndis.sys
- ; skip .NET fake dlls in Wine Mono package
-- 
-2.4.2
-
--- a/patches/fltmgr-Stub_SYS/definition
+++ b/patches/fltmgr-Stub_SYS/definition
@ -1 +0,0 @@
-Fixes: [23583] Add stub fltmgr.sys (filter manager driver)
--- a/patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-GdipCreateEffect-stub.patch
+++ b/patches/gdiplus-GdipCreateEffect/0001-gdiplus-Add-GdipCreateEffect-stub.patch
@ -1,206 +0,0 @@
-From 9269a73ee15a89b8d4a083c4d15108882c82b83b Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Thu, 23 Jul 2015 19:08:33 +1000
-Subject: gdiplus: Add GdipCreateEffect stub
-
-Based on patch by David Hedberg
-
-Fixes https://bugs.winehq.org/show_bug.cgi?id=32163
---
- dlls/gdiplus/gdiplus.spec  |  2 +-
- dlls/gdiplus/image.c       | 18 ++++++++++++++++++
- dlls/gdiplus/tests/image.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- include/Makefile.in        |  1 +
- include/gdiplus.h          |  2 ++
- include/gdipluseffects.h   | 45 +++++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 109 insertions(+), 1 deletion(-)
- create mode 100644 include/gdipluseffects.h
-
-diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
-index 9701ee0..edf4e45 100644
--- a/dlls/gdiplus/gdiplus.spec
-+++ b/dlls/gdiplus/gdiplus.spec
-@@ -610,7 +610,7 @@
- 610 stdcall GdipFindFirstImageItem(ptr ptr)
- 611 stub GdipFindNextImageItem
- 612 stdcall GdipGetImageItemData(ptr ptr)
-613 stub GdipCreateEffect
-+613 stdcall GdipCreateEffect(int128 ptr)
- 614 stdcall GdipDeleteEffect(ptr)
- 615 stub GdipGetEffectParameterSize
- 616 stub GdipGetEffectParameters
-diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
-index 23c465e..042835a 100644
--- a/dlls/gdiplus/image.c
-+++ b/dlls/gdiplus/image.c
-@@ -5008,6 +5008,24 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi
-     return retval;
- }
- 
-+/*****************************************************************************
-+ * GdipCreateEffect [GDIPLUS.@]
-+ */
-+GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect)
-+{
-+    FIXME("(%s, %p): stub\n", debugstr_guid(&guid), effect);
-+
-+    if(!effect)
-+        return InvalidParameter;
-+
-+    *effect = NULL;
-+
-+    return NotImplemented;
-+}
-+
-+/*****************************************************************************
-+ * GdipDeleteEffect [GDIPLUS.@]
-+ */
- GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect)
- {
-     FIXME("(%p): stub\n", effect);
-diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
-index 1335d97..51b99a3 100644
--- a/dlls/gdiplus/tests/image.c
-+++ b/dlls/gdiplus/tests/image.c
-@@ -4629,6 +4629,47 @@ static void test_supported_encoders(void)
-     GdipDisposeImage((GpImage *)bm);
- }
- 
-+static void test_createeffect(void)
-+{
-+    static const GUID noneffect = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } };
-+    GpStatus (WINAPI *pGdipCreateEffect)( const GUID guid, CGpEffect **effect);
-+    GpStatus (WINAPI *pGdipDeleteEffect)( CGpEffect *effect);
-+    GpStatus stat;
-+    CGpEffect *effect;
-+    HMODULE mod = GetModuleHandleA("gdiplus.dll");
-+    int i;
-+    const GUID effectlist[] =
-+               {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid,
-+                BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid,
-+                TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid};
-+
-+    pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect");
-+    pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect");
-+    if(!pGdipCreateEffect || !pGdipDeleteEffect)
-+    {
-+        /* GdipCreateEffect/GdipDeleteEffect was introduced in Windows Vista. */
-+        win_skip("GDIPlus version 1.1 not available\n");
-+        return;
-+    }
-+
-+    stat = pGdipCreateEffect(BlurEffectGuid, NULL);
-+    expect(InvalidParameter, stat);
-+
-+    stat = pGdipCreateEffect(noneffect, &effect);
-+    todo_wine expect(Win32Error, stat);
-+
-+    for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++)
-+    {
-+        stat = pGdipCreateEffect(effectlist[i], &effect);
-+        todo_wine expect(Ok, stat);
-+        if(stat == Ok)
-+        {
-+            stat = pGdipDeleteEffect(effect);
-+            expect(Ok, stat);
-+        }
-+    }
-+}
-+
- START_TEST(image)
- {
-     struct GdiplusStartupInput gdiplusStartupInput;
-@@ -4683,6 +4724,7 @@ START_TEST(image)
-     test_remaptable();
-     test_colorkey();
-     test_dispose();
-+    test_createeffect();
- 
-     GdiplusShutdown(gdiplusToken);
- }
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 1dc912b..c1312b8 100644
--- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -342,6 +342,7 @@ SRCDIR_INCLUDES = \
- 	gdiplus.h \
- 	gdipluscolor.h \
- 	gdipluscolormatrix.h \
-+	gdipluseffects.h \
- 	gdiplusenums.h \
- 	gdiplusflat.h \
- 	gdiplusgpstubs.h \
-diff --git a/include/gdiplus.h b/include/gdiplus.h
-index f063b3e..e85343b 100644
--- a/include/gdiplus.h
-+++ b/include/gdiplus.h
-@@ -37,6 +37,7 @@ namespace Gdiplus
- #include "gdipluscolor.h"
- #include "gdipluscolormatrix.h"
- #include "gdiplusgpstubs.h"
-+#include "gdipluseffects.h"
- 
-     namespace DllExports
-     {
-@@ -57,6 +58,7 @@ namespace Gdiplus
- #include "gdipluscolor.h"
- #include "gdipluscolormatrix.h"
- #include "gdiplusgpstubs.h"
-+#include "gdipluseffects.h"
- 
- #include "gdiplusflat.h"
- 
-diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h
-new file mode 100644
-index 0000000..d2d6a05
--- /dev/null
-+++ b/include/gdipluseffects.h
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (C) 2015 Alistair Leslie-Hughes
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#ifndef _GDIPLUSEFFECTS_H
-+#define _GDIPLUSEFFECTS_H
-+
-+DEFINE_GUID(BlurEffectGuid,                   0x633c80a4, 0x1843, 0x482b, 0x9e, 0xf2, 0xbe, 0x28, 0x34, 0xc5, 0xfd, 0xd4);
-+DEFINE_GUID(SharpenEffectGuid,                0x63cbf3ee, 0xc526, 0x402c, 0x8f, 0x71, 0x62, 0xc5, 0x40, 0xbf, 0x51, 0x42);
-+DEFINE_GUID(ColorMatrixEffectGuid,            0x718f2615, 0x7933, 0x40e3, 0xa5, 0x11, 0x5f, 0x68, 0xfe, 0x14, 0xdd, 0x74);
-+DEFINE_GUID(ColorLUTEffectGuid,               0xa7ce72a9, 0x0f7f, 0x40d7, 0xb3, 0xcc, 0xd0, 0xc0, 0x2d, 0x5c, 0x32, 0x12);
-+DEFINE_GUID(BrightnessContrastEffectGuid,     0xd3a1dbe1, 0x8ec4, 0x4c17, 0x9f, 0x4c, 0xea, 0x97, 0xad, 0x1c, 0x34, 0x3d);
-+DEFINE_GUID(HueSaturationLightnessEffectGuid, 0x8b2dd6c3, 0xeb07, 0x4d87, 0xa5, 0xf0, 0x71, 0x08, 0xe2, 0x6a, 0x9c, 0x5f);
-+DEFINE_GUID(LevelsEffectGuid,                 0x99c354ec, 0x2a31, 0x4f3a, 0x8c, 0x34, 0x17, 0xa8, 0x03, 0xb3, 0x3a, 0x25);
-+DEFINE_GUID(TintEffectGuid,                   0x1077af00, 0x2848, 0x4441, 0x94, 0x89, 0x44, 0xad, 0x4c, 0x2d, 0x7a, 0x2c);
-+DEFINE_GUID(ColorBalanceEffectGuid,           0x537e597d, 0x251e, 0x48da, 0x96, 0x64, 0x29, 0xca, 0x49, 0x6b, 0x70, 0xf8);
-+DEFINE_GUID(RedEyeCorrectionEffectGuid,       0x74d29d05, 0x69a4, 0x4266, 0x95, 0x49, 0x3c, 0xc5, 0x28, 0x36, 0xb6, 0x32);
-+DEFINE_GUID(ColorCurveEffectGuid,             0xdd6a0022, 0x58e4, 0x4a67, 0x9d, 0x9b, 0xd4, 0x8e, 0xb8, 0x81, 0xa5, 0x3d);
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect);
-+GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-- 
-2.5.1
-
--- a/patches/gdiplus-GdipCreateEffect/definition
+++ b/patches/gdiplus-GdipCreateEffect/definition
@ -1,2 +0,0 @@
-Fixes: [32163] Add stub for gdiplus.GdipCreateEffect
-Category: stable
--- a/patches/gdiplus-Memory_Allocation/0001-gdiplus-Do-not-use-GdipAlloc-and-GdipFree-in-interna.patch
+++ b/patches/gdiplus-Memory_Allocation/0001-gdiplus-Do-not-use-GdipAlloc-and-GdipFree-in-interna.patch
--- a/patches/gdiplus-Memory_Allocation/definition
+++ b/patches/gdiplus-Memory_Allocation/definition
@ -1 +0,0 @@
-Fixes: [32786] Do not use GdipAlloc and GdipFree in internal functions
--- a/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch
+++ b/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch
@ -1,4 +1,4 @@
-From b46067fb4e438d40d2145449132da6769399576a Mon Sep 17 00:00:00 2001
+From becf0b7c08c28e5afee2641b89e29ad8c0952ef8 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 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 <sebastian@fds-team.de>
 6 files changed, 147 insertions(+), 22 deletions(-)

 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index 3601c0f..76786ef 100644
+index 2acaa83..490d55f 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
@@ -646,25 +646,6 @@ NTSTATUS WINAPI NtPrivilegeCheck(
@ -44,7 +44,7 @@ index 3601c0f..76786ef 100644
  */
 
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 28165ef..7476fd6 100644
+index 38422ae..73ae405 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
@@ -263,7 +263,7 @@
@ -56,20 +56,20 @@ index 28165ef..7476fd6 100644
 @ stdcall NtQuerySecurityObject (long long long long long)
 @ stdcall NtQuerySemaphore (long long ptr long ptr)
 @ stdcall NtQuerySymbolicLinkObject(long ptr ptr)
-@@ -1144,7 +1144,7 @@
- @ stdcall ZwQueryPerformanceCounter (long long) NtQueryPerformanceCounter
+@@ -1178,7 +1178,7 @@
+ @ stdcall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter
 # @ stub ZwQueryPortInformationProcess
 # @ stub ZwQueryQuotaInformationFile
 -@ stdcall ZwQuerySection (long long long long long) NtQuerySection
 +@ stdcall ZwQuerySection(long long ptr long ptr) NtQuerySection
 @ stdcall ZwQuerySecurityObject (long long long long long) NtQuerySecurityObject
- @ stdcall ZwQuerySemaphore (long long long long long) NtQuerySemaphore
+ @ 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 0629816..f1e71ac 100644
+index 4d4bc3b..bfe53cb 100644
 --- a/dlls/ntdll/virtual.c
 +++ b/dlls/ntdll/virtual.c
-@@ -2574,6 +2574,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_
+@@ -2531,6 +2531,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_
 
 
 /***********************************************************************
@ -172,7 +172,7 @@ index 0629816..f1e71ac 100644
  *             ZwMapViewOfSection   (NTDLL.@)
  */
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index 11d1c62..39325ad 100644
+index 1957a9a..276cdbf5 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1351,7 +1351,7 @@
@ -270,10 +270,10 @@ index 16e7c1c..ba26d1e 100644
     if ((fd = get_obj_fd( &mapping->obj )))
     {
 diff --git a/server/protocol.def b/server/protocol.def
-index 9c4dab4..2513098 100644
+index c313006..4e07c10 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -1641,6 +1641,13 @@ enum char_info_mode
+@@ -1674,6 +1674,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) */
@ -288,5 +288,5 @@ index 9c4dab4..2513098 100644
     obj_handle_t shared_file;   /* shared mapping file handle */
 @END
 -- 
-2.4.0
+2.6.1

--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "d548639d977dee847350b408aec9522d68aef813"
+	echo "e8b9bda53ac39c913ddc93de0308f0c8b69605fc"
 }

 # Show version information
@ -134,14 +134,11 @@ patch_enable_all ()
 	enable_dxgi_GetDesc="$1"
 	enable_dxgi_MakeWindowAssociation="$1"
 	enable_dxva2_Video_Decoder="$1"
-	enable_fltmgr_Stub_SYS="$1"
 	enable_fonts_Missing_Fonts="$1"
 	enable_gdi32_Default_Palette="$1"
 	enable_gdi32_Lazy_Font_Initialization="$1"
 	enable_gdi32_MaxPixelFormats="$1"
 	enable_gdi32_MultiMonitor="$1"
-	enable_gdiplus_GdipCreateEffect="$1"
-	enable_gdiplus_Memory_Allocation="$1"
 	enable_ieframe_IViewObject_Draw="$1"
 	enable_imagehlp_BindImageEx="$1"
 	enable_imagehlp_Cleanup="$1"
@ -265,7 +262,6 @@ patch_enable_all ()
 	enable_shell32_UnixFS="$1"
 	enable_shlwapi_AssocGetPerceivedType="$1"
 	enable_shlwapi_UrlCombine="$1"
-	enable_urlmon_CoInternetSetFeatureEnabled="$1"
 	enable_user32_DeferWindowPos="$1"
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
@ -496,9 +492,6 @@ patch_enable ()
 		dxva2-Video_Decoder)
 			enable_dxva2_Video_Decoder="$2"
 			;;
-		fltmgr-Stub_SYS)
-			enable_fltmgr_Stub_SYS="$2"
-			;;
 		fonts-Missing_Fonts)
 			enable_fonts_Missing_Fonts="$2"
 			;;
@ -514,12 +507,6 @@ patch_enable ()
 		gdi32-MultiMonitor)
 			enable_gdi32_MultiMonitor="$2"
 			;;
-		gdiplus-GdipCreateEffect)
-			enable_gdiplus_GdipCreateEffect="$2"
-			;;
-		gdiplus-Memory_Allocation)
-			enable_gdiplus_Memory_Allocation="$2"
-			;;
 		ieframe-IViewObject-Draw)
 			enable_ieframe_IViewObject_Draw="$2"
 			;;
@ -889,9 +876,6 @@ patch_enable ()
 		shlwapi-UrlCombine)
 			enable_shlwapi_UrlCombine="$2"
 			;;
-		urlmon-CoInternetSetFeatureEnabled)
-			enable_urlmon_CoInternetSetFeatureEnabled="$2"
-			;;
 		user32-DeferWindowPos)
 			enable_user32_DeferWindowPos="$2"
 			;;
@ -1488,9 +1472,6 @@ if test "$enable_category_stable" -eq 1; then
 	if test "$enable_gdi32_MaxPixelFormats" -gt 1; then
 		abort "Patchset gdi32-MaxPixelFormats disabled, but category-stable depends on that."
 	fi
-	if test "$enable_gdiplus_GdipCreateEffect" -gt 1; then
-		abort "Patchset gdiplus-GdipCreateEffect disabled, but category-stable depends on that."
-	fi
 	if test "$enable_kernel32_CompareStringEx" -gt 1; then
 		abort "Patchset kernel32-CompareStringEx disabled, but category-stable depends on that."
 	fi
@ -1581,9 +1562,6 @@ if test "$enable_category_stable" -eq 1; then
 	if test "$enable_shell32_SHFileOperation_Win9x" -gt 1; then
 		abort "Patchset shell32-SHFileOperation_Win9x disabled, but category-stable depends on that."
 	fi
-	if test "$enable_urlmon_CoInternetSetFeatureEnabled" -gt 1; then
-		abort "Patchset urlmon-CoInternetSetFeatureEnabled disabled, but category-stable depends on that."
-	fi
 	if test "$enable_user32_DrawTextExW" -gt 1; then
 		abort "Patchset user32-DrawTextExW disabled, but category-stable depends on that."
 	fi
@ -1668,7 +1646,6 @@ if test "$enable_category_stable" -eq 1; then
 	enable_dxgi_GetDesc=1
 	enable_fonts_Missing_Fonts=1
 	enable_gdi32_MaxPixelFormats=1
-	enable_gdiplus_GdipCreateEffect=1
 	enable_kernel32_CompareStringEx=1
 	enable_kernel32_Named_Pipe=1
 	enable_libs_Debug_Channel=1
@ -1699,7 +1676,6 @@ if test "$enable_category_stable" -eq 1; then
 	enable_setupapi_SetupDiSetDeviceInstallParamsW=1
 	enable_shell32_RunDLL_CallEntry16=1
 	enable_shell32_SHFileOperation_Win9x=1
-	enable_urlmon_CoInternetSetFeatureEnabled=1
 	enable_user32_DrawTextExW=1
 	enable_user32_WndProc=1
 	enable_wine_inf_Performance=1
@ -3041,21 +3017,6 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset fltmgr-Stub_SYS
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#23583] Add stub fltmgr.sys (filter manager driver)
-# |
-# | Modified files:
-# |   *	configure.ac, dlls/fltmgr.sys/Makefile.in, dlls/fltmgr.sys/fltmgr.sys.spec, dlls/fltmgr.sys/main.c, loader/wine.inf.in
-# |
-if test "$enable_fltmgr_Stub_SYS" -eq 1; then
-	patch_apply fltmgr-Stub_SYS/0001-fltmgr.sys-add-stub-dll-try-3.patch
-	(
-		echo '+    { "Austin English", "fltmgr.sys: add stub dll.", 4 },';
-	) >> "$patchlist"
-fi
-
 # Patchset fonts-Missing_Fonts
 # |
 # | This patchset fixes the following Wine bugs:
@ -3147,40 +3108,6 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset gdiplus-GdipCreateEffect
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#32163] Add stub for gdiplus.GdipCreateEffect
-# |
-# | Modified files:
-# |   *	dlls/gdiplus/gdiplus.spec, dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, include/Makefile.in, include/gdiplus.h,
-# | 	include/gdipluseffects.h
-# |
-if test "$enable_gdiplus_GdipCreateEffect" -eq 1; then
-	patch_apply gdiplus-GdipCreateEffect/0001-gdiplus-Add-GdipCreateEffect-stub.patch
-	(
-		echo '+    { "Alistair Leslie-Hughes", "gdiplus: Add GdipCreateEffect stub.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset gdiplus-Memory_Allocation
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#32786] Do not use GdipAlloc and GdipFree in internal functions
-# |
-# | Modified files:
-# |   *	dlls/gdiplus/brush.c, dlls/gdiplus/customlinecap.c, dlls/gdiplus/font.c, dlls/gdiplus/gdiplus.c,
-# | 	dlls/gdiplus/gdiplus_private.h, dlls/gdiplus/graphics.c, dlls/gdiplus/graphicspath.c, dlls/gdiplus/image.c,
-# | 	dlls/gdiplus/imageattributes.c, dlls/gdiplus/matrix.c, dlls/gdiplus/metafile.c, dlls/gdiplus/pathiterator.c,
-# | 	dlls/gdiplus/pen.c, dlls/gdiplus/region.c, dlls/gdiplus/stringformat.c
-# |
-if test "$enable_gdiplus_Memory_Allocation" -eq 1; then
-	patch_apply gdiplus-Memory_Allocation/0001-gdiplus-Do-not-use-GdipAlloc-and-GdipFree-in-interna.patch
-	(
-		echo '+    { "Sebastian Lackner", "gdiplus: Do not use GdipAlloc and GdipFree in internal functions.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ieframe-IViewObject-Draw
 # |
 # | This patchset fixes the following Wine bugs:
@ -5203,21 +5130,6 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset urlmon-CoInternetSetFeatureEnabled
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#35197] Ignore unsupported flags for CoInternetSetFeatureEnabled
-# |
-# | Modified files:
-# |   *	dlls/urlmon/internet.c
-# |
-if test "$enable_urlmon_CoInternetSetFeatureEnabled" -eq 1; then
-	patch_apply urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch
-	(
-		echo '+    { "Bruno Jesus", "urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset user32-DeferWindowPos
 # |
 # | This patchset fixes the following Wine bugs:
--- a/patches/urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch
+++ b/patches/urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch
@ -1,28 +0,0 @@
-From 15cc0b19149e0a1c811313ee1a97b82032cf41da Mon Sep 17 00:00:00 2001
-From: Bruno Jesus <00cpxxx@gmail.com>
-Date: Fri, 12 Dec 2014 05:16:14 +0100
-Subject: urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled
-
---
- dlls/urlmon/internet.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c
-index e5d41b6..d7deccc 100644
--- a/dlls/urlmon/internet.c
-+++ b/dlls/urlmon/internet.c
-@@ -536,10 +536,8 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO
-     if(feature >= FEATURE_ENTRY_COUNT)
-         return E_FAIL;
- 
-    if(flags & ~supported_flags) {
-+    if(flags & ~supported_flags)
-         FIXME("Unsupported flags: %08x\n", flags & ~supported_flags);
-        return E_NOTIMPL;
-    }
- 
-     if(flags & SET_FEATURE_ON_PROCESS)
-         set_feature_on_process(feature, enable);
-- 
-2.1.3
-
--- a/patches/urlmon-CoInternetSetFeatureEnabled/definition
+++ b/patches/urlmon-CoInternetSetFeatureEnabled/definition
@ -1,2 +0,0 @@
-Fixes: [35197] Ignore unsupported flags for CoInternetSetFeatureEnabled
-Category: stable
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@ -1687,7 +1687,7 @@ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -1164,7 +1164,11 @@
+@@ -1195,7 +1195,11 @@
          * result on Wine.
          * {D3DFMT_YUY2,     "D3DFMT_YUY2",     BLOCKS,                              0},
          * {D3DFMT_UYVY,     "D3DFMT_UYVY",     BLOCKS,                              0}, */
@ -1699,7 +1699,7 @@ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
         /* Vendor-specific formats like ATI2N are a non-issue here since they're not
          * supported as offscreen plain surfaces and do not support D3DUSAGE_RENDERTARGET
          * when created as texture. */
-@@ -17304,7 +17308,11 @@
+@@ -17363,7 +17367,11 @@
     fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE);
     add_dirty_rect_test_draw(device);
     color = getPixelColor(device, 320, 240);
--- a/patches/ws2_32-WSAPoll/0002-ws2_32-tests-Add-WSAPoll-tests.patch
+++ b/patches/ws2_32-WSAPoll/0002-ws2_32-tests-Add-WSAPoll-tests.patch
@ -1,4 +1,4 @@
-From c550660596dfe05e3b275dec643e5b4ebd2bdb7e Mon Sep 17 00:00:00 2001
+From 47bf6e8f213c1a1d023d160a829e390705db95e0 Mon Sep 17 00:00:00 2001
 From: Bruno Jesus <00cpxxx@gmail.com>
 Date: Fri, 22 May 2015 22:43:00 -0300
 Subject: ws2_32/tests: Add WSAPoll() tests
@ -8,26 +8,26 @@ Subject: ws2_32/tests: Add WSAPoll() tests
 1 file changed, 222 insertions(+)

 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index 6d328e6..3d584f2 100644
+index 7fbd67d..7901bda 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -71,6 +71,7 @@ static int   (WINAPI *pInetPton)(INT,LPSTR,LPVOID);
- static int   (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE);
- static int   (WINAPI *pWSALookupServiceEnd)(HANDLE);
+@@ -74,6 +74,7 @@ static int   (WINAPI *pWSALookupServiceEnd)(HANDLE);
 static int   (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW);
+ static int   (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA);
+ static int   (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW);
 +static int   (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT);
 
 /**************** Structs and typedefs ***************/
 
-@@ -1163,6 +1164,7 @@ static void Init (void)
-     pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW");
-     pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd");
+@@ -1169,6 +1170,7 @@ static void Init (void)
     pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW");
+     pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA");
+     pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW");
 +    pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll");
 
     ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" );
     tls = TlsAlloc();
-@@ -6275,6 +6277,225 @@ end:
+@@ -6330,6 +6332,225 @@ end:
         WSACloseEvent(ov.hEvent);
 }
 
@ -253,7 +253,7 @@ index 6d328e6..3d584f2 100644
 static void test_GetAddrInfoW(void)
 {
     static const WCHAR port[] = {'8','0',0};
-@@ -8682,6 +8903,7 @@ START_TEST( sock )
+@@ -9048,6 +9269,7 @@ START_TEST( sock )
     test_WSASendMsg();
     test_WSASendTo();
     test_WSARecv();
@ -262,5 +262,5 @@ index 6d328e6..3d584f2 100644
     test_events(0);
     test_events(1);
 -- 
-2.4.1
+2.6.1
				`@ -1 +0,0 @@`
				`Fixes: [23583] Add stub fltmgr.sys (filter manager driver)`
				`@ -1 +0,0 @@`
				`Fixes: [32786] Do not use GdipAlloc and GdipFree in internal functions`