From 842783003af4c2781fb6f89fb3b9e53b88669cd0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 21 Mar 2018 13:14:09 +0100 Subject: [PATCH] [QUERY] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/query/query_main.c | 23 ++++++++++------------- media/doc/README.WINE | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dll/win32/query/query_main.c b/dll/win32/query/query_main.c index f85efc8ed0d..c6dde22a887 100644 --- a/dll/win32/query/query_main.c +++ b/dll/win32/query/query_main.c @@ -18,25 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - #define COBJMACROS -#include +#include "config.h" #include -#include -#include -//#include "winuser.h" -//#include "winreg.h" -#include -#include -#include -//#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" +#include "ntquery.h" +#include "cierror.h" +#include "initguid.h" -#include +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(query); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 037d6539487..c36e4856f17 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -155,7 +155,7 @@ reactos/dll/win32/propsys # Synced to WineStaging-3.3 reactos/dll/win32/pstorec # Synced to WineStaging-3.3 reactos/dll/win32/qmgr # Synced to WineStaging-3.3 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 -reactos/dll/win32/query # Synced to WineStaging-2.9 +reactos/dll/win32/query # Synced to WineStaging-3.3 reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9 reactos/dll/win32/resutils # Synced to WineStaging-2.9 reactos/dll/win32/riched20 # Synced to Wine-3.0 -- 2.17.1