Author: akhaldi Date: Sun Jan 29 22:39:18 2012 New Revision: 55298
URL: http://svn.reactos.org/svn/reactos?rev=55298&view=rev Log: [QUERY] * Sync to Wine 1.3.37.
Modified: trunk/reactos/dll/win32/query/CMakeLists.txt trunk/reactos/dll/win32/query/query.rbuild trunk/reactos/dll/win32/query/query.spec trunk/reactos/dll/win32/query/query_main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/CMakeLists.... ============================================================================== --- trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -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)
Modified: trunk/reactos/dll/win32/query/query.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.rbuil... ============================================================================== --- trunk/reactos/dll/win32/query/query.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query.rbuild [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -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>
Modified: trunk/reactos/dll/win32/query/query.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.spec?... ============================================================================== --- trunk/reactos/dll/win32/query/query.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query.spec [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -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)
Modified: trunk/reactos/dll/win32/query/query_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query_main.... ============================================================================== --- trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -98,3 +98,10 @@ 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; +}
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=5... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 22:39:18 2012 @@ -135,7 +135,7 @@ 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