[QUERY]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60366

diff --git a/reactos/dll/win32/query/CMakeLists.txt b/reactos/dll/win32/query/CMakeLists.txt
index ba2169d..b71dd33 100644 (file)
--- a/reactos/dll/win32/query/CMakeLists.txt
+++ b/reactos/dll/win32/query/CMakeLists.txt
@@ -1,9 +1,9 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(
     -D__WINESRC__
     -DCOM_NO_WINDOWS_H)
 
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(query.dll query.spec)
 
 list(APPEND SOURCE
@@ -12,13 +12,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/query.def)
 
 add_library(query SHARED ${SOURCE})
-
 set_module_type(query win32dll)
-
-target_link_libraries(query
-    wine
-    uuid)
-
+target_link_libraries(query wine)
 add_importlibs(query msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET query DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/query/query_main.c b/reactos/dll/win32/query/query_main.c
index ed96164..f85efc8 100644 (file)
--- a/reactos/dll/win32/query/query_main.c
+++ b/reactos/dll/win32/query/query_main.c
@@ -49,8 +49,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hInstDLL);
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index d0b3fe1..684819a 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -158,7 +158,7 @@ reactos/dll/win32/propsys         # Synced to Wine-1.5.26
 reactos/dll/win32/pstorec         # Synced to Wine-1.7.1
 reactos/dll/win32/qmgr            # Synced to Wine-1.7.1
 reactos/dll/win32/qmgrprxy        # Synced to Wine-1.5.26
-reactos/dll/win32/query           # Synced to Wine-1.5.19
+reactos/dll/win32/query           # Synced to Wine-1.7.1
 reactos/dll/win32/rasapi32        # Synced to Wine-1.5.4
 reactos/dll/win32/resutils        # Synced to Wine-1.5.19
 reactos/dll/win32/riched20        # Synced to Wine-1.5.19