Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-11 13:27:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QUERY]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60366
This commit is contained in:
Amine Khaldi 2013-09-26 14:12:21 +00:00
parent 49cf702458
commit 1071ce28ed
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/query/CMakeLists.txt
View file

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

2
reactos/dll/win32/query/query_main.c
View file

@ -49,8 +49,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDLL); DisableThreadLibraryCalls(hInstDLL);
break; break;
case DLL_PROCESS_DETACH:
break;
} }
return TRUE; return TRUE;
} }

2
reactos/media/doc/README.WINE
View file

@ -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/pstorec # Synced to Wine-1.7.1
reactos/dll/win32/qmgr # 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/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/rasapi32 # Synced to Wine-1.5.4
reactos/dll/win32/resutils # Synced to Wine-1.5.19 reactos/dll/win32/resutils # Synced to Wine-1.5.19
reactos/dll/win32/riched20 # Synced to Wine-1.5.19 reactos/dll/win32/riched20 # Synced to Wine-1.5.19