Author: akhaldi Date: Thu Sep 26 14:12:21 2013 New Revision: 60366
URL: http://svn.reactos.org/svn/reactos?rev=60366&view=rev Log: [QUERY] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/query/CMakeLists.txt 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] Thu Sep 26 14:12:21 2013 @@ -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 @@ ${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)
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] Thu Sep 26 14:12:21 2013 @@ -48,8 +48,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: break; } return TRUE;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:12:21 2013 @@ -158,7 +158,7 @@ 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