[Wine-devel] Eter's patch is applied to winehq repo 09/09/11

[builder на builder.office.etersoft.ru]

New Etersoft's patches since last build time:
commit ba6f99c239bfd7264f868702875dd9597b022be8
Author: Alexander Morozov <amorozov на etersoft.ru>

    query: Add stub for LoadIFilter.

---

commit ba6f99c239bfd7264f868702875dd9597b022be8
Author: Alexander Morozov <amorozov на etersoft.ru>
Date:   Fri Aug 19 15:16:33 2011 +0400

    query: Add stub for LoadIFilter.

diff --git a/dlls/query/query.spec b/dlls/query/query.spec
index 612ea2d..71b9874 100644
--- a/dlls/query/query.spec
+++ b/dlls/query/query.spec
@@ -33,7 +33,7 @@
 @ stub InitializeFILTERPerformanceData
 @ stub _LoadBHIFilter на 16
 @ stub LoadBinaryFilter
-@ stub LoadIFilter
+@ stdcall LoadIFilter(wstr ptr ptr)
 @ stub LoadTextFilter
 @ stub LocateCatalogs
 @ stdcall LocateCatalogsA(str long ptr ptr ptr ptr)
diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c
index 2d4e4ae..3414aec 100644
--- a/dlls/query/query_main.c
+++ b/dlls/query/query_main.c
@@ -98,3 +98,10 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm,
           iBm, pwszMachine, pcMachine, pwszCat, pcCat);
     return CI_E_NOT_RUNNING;
 }
+
+HRESULT WINAPI LoadIFilter(WCHAR const *pwcsPath, IUnknown *pUnkOuter, void **ppIUnk)
+{
+    FIXME("%s %p %p\n", debugstr_w(pwcsPath), pUnkOuter, ppIUnk);
+    *ppIUnk = NULL;
+    return E_NOTIMPL;
+}
diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c
index eec9e00..4a8cec4 100644
--- a/dlls/shell32/recyclebin.c
+++ b/dlls/shell32/recyclebin.c
@@ -31,8 +31,8 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "winuser.h"
-#include "ntquery.h"
 #include "shlwapi.h"
+#include "ntquery.h"
 #include "shlobj.h"
 #include "shresdef.h"
 #include "shellfolder.h"
diff --git a/include/ntquery.h b/include/ntquery.h
index fc78c32..928dafc 100644
--- a/include/ntquery.h
+++ b/include/ntquery.h
@@ -74,6 +74,7 @@ STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *);
 STDAPI LocateCatalogsA(CHAR const *, ULONG, CHAR *, ULONG *, CHAR *, ULONG *);
 STDAPI LocateCatalogsW(WCHAR const *, ULONG, WCHAR *, ULONG *, WCHAR *, ULONG *);
 #define LocateCatalogs WINELIB_NAME_AW(LocateCatalogs)
+STDAPI LoadIFilter(WCHAR const *, IUnknown *, void **);
 
 #ifdef __cplusplus
 }