[QUERY]

* Sync to Wine 1.3.37.

svn path=/trunk/; revision=55298

diff --git a/reactos/dll/win32/query/CMakeLists.txt b/reactos/dll/win32/query/CMakeLists.txt
index 3574784..ba2169d 100644 (file)
--- a/reactos/dll/win32/query/CMakeLists.txt
+++ b/reactos/dll/win32/query/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_definitions(-D__WINESRC__)
+add_definitions(
+    -D__WINESRC__
+    -DCOM_NO_WINDOWS_H)
 
 spec2def(query.dll query.spec)
 

diff --git a/reactos/dll/win32/query/query.rbuild b/reactos/dll/win32/query/query.rbuild
index a1f718a..8360231 100644 (file)
--- a/reactos/dll/win32/query/query.rbuild
+++ b/reactos/dll/win32/query/query.rbuild
@@ -4,6 +4,7 @@
        <include base="query">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
+       <define name="COM_NO_WINDOWS_H" />
        <file>query_main.c</file>
        <library>wine</library>
        <library>uuid</library>

diff --git a/reactos/dll/win32/query/query.spec b/reactos/dll/win32/query/query.spec
index 612ea2d..71b9874 100644 (file)
--- a/reactos/dll/win32/query/query.spec
+++ b/reactos/dll/win32/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/reactos/dll/win32/query/query_main.c b/reactos/dll/win32/query/query_main.c
index 2d4e4ae..3414aec 100644 (file)
--- a/reactos/dll/win32/query/query_main.c
+++ b/reactos/dll/win32/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/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 7df7115..9e45fdd 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -135,7 +135,7 @@ reactos/dll/win32/pidgen          # Autosync
 reactos/dll/win32/powrprof        # Forked at Wine-1.0rc5
 reactos/dll/win32/printui         # Synced to Wine-1.3.37
 reactos/dll/win32/pstorec         # Synced to Wine-1.3.37
-reactos/dll/win32/query           # Autosync
+reactos/dll/win32/query           # Synced to Wine-1.3.37
 reactos/dll/win32/rasapi32        # Autosync
 reactos/dll/win32/resutils        # Autosync
 reactos/dll/win32/riched20        # Autosync