Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[akhaldi] 53570: [CMAKE/DLLS] * Set some imports as delay-loaded.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 4 00:52:28 2011 New Revision: 53570 URL: http://svn.reactos.org/svn/reactos?rev=53570&view=rev Log: [CMAKE/DLLS] * Set some imports as delay-loaded. Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/inetmib1/CMakeLists.txt trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -55,17 +55,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) add_library(advapi32 SHARED ${SOURCE}) - set_module_type(advapi32 win32dll UNICODE) - -target_link_libraries(advapi32 - wine - ${PSEH_LIB}) - -add_importlibs(advapi32 rpcrt4 msvcrt kernel32 ntdll) +target_link_libraries(advapi32 wine ${PSEH_LIB}) +add_delay_importlibs(advapi32 rpcrt4) +add_importlibs(advapi32 msvcrt kernel32 ntdll) add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h) + add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) add_importlib_target(advapi32.spec) Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -55,17 +55,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) add_library(comctl32 SHARED ${SOURCE}) - set_module_type(comctl32 win32dll UNICODE) - target_link_libraries(comctl32 uuid wine) +add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 - winmm - uxtheme msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -23,10 +23,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) add_library(comdlg32 SHARED ${SOURCE}) - set_module_type(comdlg32 win32dll) - target_link_libraries(comdlg32 uuid wine) +add_delay_importlibs(comdlg32 ole32) add_importlibs(comdlg32 shell32 @@ -36,7 +35,6 @@ user32 gdi32 advapi32 - ole32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -10,14 +10,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) add_library(cryptnet SHARED ${SOURCE}) - set_module_type(cryptnet win32dll) - target_link_libraries(cryptnet wine) +add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 - wininet msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -16,10 +16,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) add_library(cryptui SHARED ${SOURCE}) - set_module_type(cryptui win32dll) - target_link_libraries(cryptui uuid wine) +add_delay_importlibs(cryptui urlmon wintrust) add_importlibs(cryptui user32 @@ -27,8 +26,6 @@ crypt32 gdi32 advapi32 - urlmon - wintrust comctl32 comdlg32 msvcrt Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -45,14 +45,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) add_library(dbghelp SHARED ${SOURCE}) - set_module_type(dbghelp win32dll) -target_link_libraries(dbghelp - wine - ${PSEH_LIB} - oldnames) - -add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) +target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) +add_delay_importlibs(dbghelp version) +add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) add_importlib_target(dbghelp.spec) add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -33,9 +33,9 @@ endif() add_library(gdiplus SHARED ${SOURCE}) - set_module_type(gdiplus win32dll) target_link_libraries(gdiplus uuid wine) +add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt @@ -44,7 +44,6 @@ ole32 user32 gdi32 - windowscodecs kernel32 ntdll) Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -13,16 +13,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) add_library(hlink SHARED ${SOURCE}) - set_module_type(hlink win32dll) - target_link_libraries(hlink uuid wine) +add_delay_importlibs(hlink urlmon) add_importlibs(hlink shell32 ole32 advapi32 - urlmon msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -10,14 +10,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) add_library(inetmib1 SHARED ${SOURCE}) - set_module_type(inetmib1 win32dll) target_link_libraries(inetmib1 wine) +add_delay_importlibs(inetmib1 iphlpapi) add_importlibs(inetmib1 msvcrt snmpapi - iphlpapi kernel32 ntdll) Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -15,16 +15,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) add_library(mlang SHARED ${SOURCE}) - set_entrypoint(mlang 0) target_link_libraries(mlang uuid wine) +add_delay_importlibs(mlang oleaut32) add_importlibs(mlang ole32 user32 gdi32 advapi32 - oleaut32 kernel32 ntdll) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -78,14 +78,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) add_library(mshtml SHARED ${SOURCE}) - set_module_type(mshtml win32dll) - -target_link_libraries(mshtml - uuid - wine - strmiids - oldnames) +target_link_libraries(mshtml uuid wine strmiids oldnames) +add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon @@ -95,7 +90,6 @@ user32 gdi32 advapi32 - wininet msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -69,18 +69,18 @@ add_library(msi SHARED ${SOURCE}) -add_idl_Headers(msi_idlheader msiserver.idl) +add_idl_headers(msi_idlheader msiserver.idl) add_typelib(msi_tlb msiserver.idl) set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader msi_tlb) +add_delay_importlibs(msi odbccp32) add_importlibs(msi advapi32 cabinet comctl32 gdi32 - odbccp32 ole32 oleaut32 shell32 Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -54,7 +54,6 @@ endif() add_library(oleaut32 SHARED ${SOURCE}) - set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 @@ -63,7 +62,7 @@ uuid ${PSEH_LIB}) -add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) - +add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) +add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all) add_importlib_target(oleaut32.spec) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -43,16 +43,10 @@ spec2def(rpcrt4.dll rpcrt4.spec) add_library(rpcrt4 SHARED ${SOURCE}) +set_module_type(rpcrt4 win32dll) +target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) -set_module_type(rpcrt4 win32dll) - -target_link_libraries(rpcrt4 - wine - uuid - ${PSEH_LIB}) - -add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) -add_delay_importlibs(rpcrt4 wininet) - +add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) +add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) add_importlib_target(rpcrt4.spec) Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -38,13 +38,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c) add_library(setupapi SHARED ${SOURCE}) - set_module_type(setupapi win32dll UNICODE) - -target_link_libraries(setupapi - uuid - wine - ${PSEH_LIB}) +target_link_libraries(setupapi uuid wine ${PSEH_LIB}) +add_delay_importlibs(setupapi shell32) add_importlibs(setupapi msvcrt @@ -54,7 +50,6 @@ user32 rpcrt4 version - shell32 kernel32 ntdll) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -33,21 +33,17 @@ ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) add_library(shdocvw SHARED ${SOURCE}) - set_module_type(shdocvw win32dll) - target_link_libraries(shdocvw uuid wine) +add_delay_importlibs(shdocvw version ole32 oleaut32) add_importlibs(shdocvw comctl32 - ole32 - oleaut32 shlwapi shell32 user32 advapi32 gdi32 - version urlmon msvcrt kernel32 Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -73,13 +73,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) add_library(shell32 SHARED ${SOURCE}) - set_module_type(shell32 win32dll) - -target_link_libraries(shell32 - wine - uuid - recyclebin) +target_link_libraries(shell32 wine uuid recyclebin) +add_delay_importlibs(shell32 ole32 version) add_importlibs(shell32 advapi32 @@ -88,8 +84,6 @@ comctl32 comdlg32 shlwapi - ole32 - version devmgr winspool winmm @@ -98,6 +92,5 @@ ntdll) add_pch(shell32 precomp.h) - add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) add_importlib_target(shell32.spec) Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -27,31 +27,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) add_library(shlwapi SHARED ${SOURCE}) - set_module_type(shlwapi win32dll) - target_link_libraries(shlwapi wine uuid) - -add_importlibs(shlwapi - user32 - gdi32 - advapi32 - oleaut32 - ole32 - comctl32 - comdlg32 - mpr - mlang - urlmon - winmm - version - shell32 - msvcrt - kernel32 - userenv - wininet - ntdll) - +add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version) +add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) - add_importlib_target(shlwapi.spec) Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,4 +1,3 @@ - spec2def(user32.dll user32.spec) @@ -65,7 +64,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/user32.def) add_library(user32 SHARED ${SOURCE}) - set_module_type(user32 win32dll UNICODE) target_link_libraries(user32 @@ -74,7 +72,8 @@ win32ksys ${PSEH_LIB}) -add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) +add_delay_importlibs(user32 imm32) +add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_importlib_target(user32.spec) Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -20,12 +20,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) add_library(uxtheme SHARED ${SOURCE}) - set_module_type(uxtheme win32dll) - target_link_libraries(uxtheme wine) - -add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) - +add_delay_importlibs(uxtheme msimg32) +add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) add_importlib_target(uxtheme.spec) Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -18,6 +18,7 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) -add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) +add_delay_importlibs(winhttp crypt32) +add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll) add_importlib_target(winhttp.spec) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,7 +1,8 @@ add_definitions( - -D__WINESRC__ -D_WINE - -Dclose=_close) + -D__WINESRC__ + -D_WINE + -Dclose=_close) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -28,10 +29,8 @@ add_library(wininet SHARED ${SOURCE}) set_module_type(wininet win32dll) - target_link_libraries(wininet wine ${PSEH_LIB}) - -add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) - +add_delay_importlibs(wininet secur32 crypt32) +add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) add_importlib_target(wininet.spec) Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -16,16 +16,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) add_library(wintrust SHARED ${SOURCE}) - set_module_type(wintrust win32dll) - -target_link_libraries(wintrust - wine - ${PSEH_LIB}) - -add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) - +target_link_libraries(wintrust wine ${PSEH_LIB}) +add_delay_importlibs(wintrust cryptui imagehlp) +add_importlibs(wintrust crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_importlib_target(wintrust.spec) - add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Sun Sep 4 00:52:28 2011 @@ -1,4 +1,3 @@ - add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) @@ -23,13 +22,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) add_library(ws2_32 SHARED ${SOURCE}) - set_module_type(ws2_32 win32dll UNICODE) - target_link_libraries(ws2_32 wine) - -add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_delay_importlibs(ws2_32 user32) +add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h) - add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) add_importlib_target(ws2_32.spec)

13 years, 3 months

[jgardou] 53569: [LWIP] - fix warning in ros glue code

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 4 00:31:13 2011 New Revision: 53569 URL: http://svn.reactos.org/svn/reactos?rev=53569&view=rev Log: [LWIP] - fix warning in ros glue code Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Sep 4 00:31:13 2011 @@ -196,7 +196,6 @@ InternalRecvEventHandler(void *arg, PTCP_PCB pcb, struct pbuf *p, const err_t err) { PCONNECTION_ENDPOINT Connection = arg; - u32_t len; /* Make sure the socket didn't get closed */ if (!arg)

13 years, 3 months

[jgardou] 53568: [ROSSYM_NEW] - fix some warnings - fix function prototype. This might fix usermode stack logs

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 23:56:04 2011 New Revision: 53568 URL: http://svn.reactos.org/svn/reactos?rev=53568&view=rev Log: [ROSSYM_NEW] - fix some warnings - fix function prototype. This might fix usermode stack logs Modified: trunk/reactos/lib/rossym_new/dwarfinfo.c trunk/reactos/lib/rossym_new/initum.c Modified: trunk/reactos/lib/rossym_new/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfinfo.c… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] Sat Sep 3 23:56:04 2011 @@ -830,7 +830,8 @@ case OpNop: break; case OpDeref: { - ulong val, addr = stackpop(&stack); + ulong val; + void* addr = (void*)stackpop(&stack); if (!RosSymCallbacks.MemGetProc (d->pe->fd, &val, @@ -840,7 +841,8 @@ stackpush(&stack, val); } break; case OpDerefSize: { - ulong val, addr = stackpop(&stack), size = dwarfget1(buf); + ulong val, size = dwarfget1(buf); + void* addr = (void*)stackpop(&stack); if (!RosSymCallbacks.MemGetProc (d->pe->fd, &val, @@ -850,12 +852,13 @@ stackpush(&stack, val); } break; case OpFbreg: { - ulong val, addr = cfa, offset = dwarfget128s(buf); + ulong val, offset = dwarfget128s(buf);; + void* addr = (void*)cfa; werrstr("FBREG cfa %x offset %x", cfa, offset); if (!RosSymCallbacks.MemGetProc (d->pe->fd, &val, - addr+offset, + (PVOID)((ULONG_PTR)addr+offset), d->addrsize)) goto fatal; stackpush(&stack, val); @@ -873,13 +876,13 @@ } else if (opcode >= OpBreg0 && opcode < OpRegx) { ulong val, reg = opcode - OpBreg0, - addr = registers->Registers[reg], offset = dwarfget128s(buf); + void* addr = (void*)(ULONG_PTR)registers->Registers[reg]; werrstr("BREG[%d] reg %x offset %x", reg, addr, offset); if (!RosSymCallbacks.MemGetProc - (d->pe->fd, + ((PVOID)d->pe->fd, &val, - addr + offset, + (PVOID)((ULONG_PTR)addr + offset), d->addrsize)) goto fatal; stackpush(&stack, val); @@ -964,7 +967,7 @@ void dwarfdumpsym(Dwarf *d, DwarfSym *s) { - int i, j; + int j; werrstr("tag %x\n", s->attrs.tag); for (j = 0; plist[j].name; j++) { char *have = ((char*)&s->attrs) + plist[j].haveoff; @@ -996,7 +999,7 @@ paramblocks[ip].type = param.attrs.type; paramblocks[ip].loctype = param.attrs.have.location; paramblocks[ip].len = param.attrs.location.b.len; - paramblocks[ip].fde = param.attrs.location.b.data; + paramblocks[ip].fde = (ulong)param.attrs.location.b.data; werrstr("param[%d] block %s -> type %x loctype %x fde %x len %x", ip, paramblocks[ip].name, Modified: trunk/reactos/lib/rossym_new/initum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/initum.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/initum.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/initum.c [iso-8859-1] Sat Sep 3 23:56:04 2011 @@ -22,7 +22,7 @@ } static BOOLEAN -RosSymGetMemUM(ULONG_PTR *Target, PVOID SourceMem, ULONG Size) +RosSymGetMemUM(PVOID FileContext, ULONG_PTR *Target, PVOID SourceMem, ULONG Size) { return FALSE; }

13 years, 3 months

[jgardou] 53567: [CMAKE] - add flags to ASM as well instead of hacking the compile rule - remove -fPIC flag from ASM compile flags, (it's a cmake bug) - enable languages before including compiler s...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 23:05:09 2011 New Revision: 53567 URL: http://svn.reactos.org/svn/reactos?rev=53567&view=rev Log: [CMAKE] - add flags to ASM as well instead of hacking the compile rule - remove -fPIC flag from ASM compile flags, (it's a cmake bug) - enable languages before including compiler specific files. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/compilerflags.cmake trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=53567&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Sep 3 23:05:09 2011 @@ -137,6 +137,12 @@ elseif(ARCH MATCHES arm) add_definitions(-DUSE_COMPILER_EXCEPTIONS) endif() + + # Activate support for assembly source files + enable_language(ASM) + + # Activate language support for resource files + enable_language(RC) # Compiler specific definitions and macros if(MSVC) @@ -150,12 +156,6 @@ # IDL macros for widl/midl include(cmake/idl-support.cmake) - - # Activate support for assembly source files - enable_language(ASM) - - # Activate language support for resource files - enable_language(RC) if(MSVC AND USE_WDK_HEADERS) include_directories( Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sat Sep 3 23:05:09 2011 @@ -43,6 +43,7 @@ # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flags}" PARENT_SCOPE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flags}" PARENT_SCOPE) + set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${_flags}" PARENT_SCOPE) endfunction() function(add_target_compile_flags _module _flags) Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53567&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Sep 3 23:05:09 2011 @@ -4,6 +4,9 @@ # Debugging (Note: DWARF-4 on 4.5.1 when we ship) add_compile_flags("-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types") + +# For some reason, cmake sets -fPIC, and we don't want it +string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) # Tuning if(ARCH MATCHES i386) @@ -13,7 +16,7 @@ endif() # Warnings -add_compile_flags("-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch") +add_compile_flags("-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value") if(ARCH MATCHES amd64) add_compile_flags("-Wno-format") @@ -86,7 +89,7 @@ set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") -set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${CMAKE_C_FLAGS} <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>") @@ -295,12 +298,7 @@ IMPLICIT_DEPENDS ${__lang} ${_header_filename} DEPENDS ${_header_filename} ${ARGN}) get_target_property(_src_files ${_target_name} SOURCES) - foreach(_item in ${_src_files}) - get_source_file_property(__src_lang ${_item} LANGUAGE) - if(__src_lang STREQUAL __lang) - set_source_files_properties(${_item} PROPERTIES COMPILE_FLAGS "-fpch-preprocess" OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename}) - endif() - endforeach() + add_target_compile_flags(${_target_name} "-fpch-preprocess -Winvalid-pch -Wno-error=invalid-pch") #set dependency checking : depends on precompiled header only which already depends on deeper header set_target_properties(${_target_name} PROPERTIES IMPLICIT_DEPENDS_INCLUDE_TRANSFORM "\"${_basename}\"=;<${_basename}>=") endmacro()

13 years, 3 months

[fireball] 53566: [NTOS] - Remove unnecessary duplicated if condition. - Fix a typo.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Sep 3 22:21:56 2011 New Revision: 53566 URL: http://svn.reactos.org/svn/reactos?rev=53566&view=rev Log: [NTOS] - Remove unnecessary duplicated if condition. - Fix a typo. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_expr.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c [iso-8859-1] Sat Sep 3 22:21:56 2011 @@ -1038,10 +1038,9 @@ ValueStackPointer--; ull = ValueStack[ValueStackPointer]; - if (ull == 0 && (Op->Data.BinaryOperator == RpnBinaryOperatorDiv || - Op->Data.BinaryOperator == RpnBinaryOperatorDiv)) - { - CONST_STRCPY(ErrMsg, "Devision by zero"); + if (ull == 0 && Op->Data.BinaryOperator == RpnBinaryOperatorDiv) + { + CONST_STRCPY(ErrMsg, "Division by zero"); if (ErrOffset) *ErrOffset = Op->CharacterOffset;

13 years, 3 months

[tfaber] 53565: [KMTestSuite] - Sync with rostests r53563

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 3 20:16:33 2011 New Revision: 53565 URL: http://svn.reactos.org/svn/reactos?rev=53565&view=rev Log: [KMTestSuite] - Sync with rostests r53563 Modified: branches/GSoC_2011/KMTestSuite/ (props changed) branches/GSoC_2011/KMTestSuite/apitests/ntdll/NtFreeVirtualMemory.c branches/GSoC_2011/KMTestSuite/apitests/user32/WndProc.c branches/GSoC_2011/KMTestSuite/rosautotest/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/advapi32/service.c branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/rpcrt4.rbuild branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/server.c branches/GSoC_2011/KMTestSuite/winetests/shell32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/shell32/shlfileop.c branches/GSoC_2011/KMTestSuite/winetests/shlwapi/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/user32/broadcast.c branches/GSoC_2011/KMTestSuite/winetests/user32/class.c branches/GSoC_2011/KMTestSuite/winetests/user32/clipboard.c branches/GSoC_2011/KMTestSuite/winetests/user32/combo.c branches/GSoC_2011/KMTestSuite/winetests/user32/cursoricon.c branches/GSoC_2011/KMTestSuite/winetests/user32/dce.c branches/GSoC_2011/KMTestSuite/winetests/user32/dde.c branches/GSoC_2011/KMTestSuite/winetests/user32/dialog.c branches/GSoC_2011/KMTestSuite/winetests/user32/edit.c branches/GSoC_2011/KMTestSuite/winetests/user32/generated.c branches/GSoC_2011/KMTestSuite/winetests/user32/input.c branches/GSoC_2011/KMTestSuite/winetests/user32/listbox.c branches/GSoC_2011/KMTestSuite/winetests/user32/menu.c branches/GSoC_2011/KMTestSuite/winetests/user32/monitor.c branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c branches/GSoC_2011/KMTestSuite/winetests/user32/resource.c branches/GSoC_2011/KMTestSuite/winetests/user32/scroll.c branches/GSoC_2011/KMTestSuite/winetests/user32/static.c branches/GSoC_2011/KMTestSuite/winetests/user32/sysparams.c branches/GSoC_2011/KMTestSuite/winetests/user32/text.c branches/GSoC_2011/KMTestSuite/winetests/user32/win.c branches/GSoC_2011/KMTestSuite/winetests/user32/wsprintf.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2011/KMTestSuite/apitests/ntdll/NtFreeVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/WndProc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… Modified: branches/GSoC_2011/KMTestSuite/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/rosautote… Modified: branches/GSoC_2011/KMTestSuite/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/broadcast.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/generated.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/resource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/text.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/wsprintf.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests…

13 years, 3 months

[ekohl] 53564: [SERVICES/ADVAPI32] Pass the service start argument vector to the started service main function. ANSI services are not supported yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 3 19:47:56 2011 New Revision: 53564 URL: http://svn.reactos.org/svn/reactos?rev=53564&view=rev Log: [SERVICES/ADVAPI32] Pass the service start argument vector to the started service main function. ANSI services are not supported yet. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Sep 3 19:47:56 2011 @@ -1002,6 +1002,8 @@ DWORD dwReadCount = 0; DWORD dwError = ERROR_SUCCESS; DWORD i; + PWSTR *pOffPtr; + PWSTR pArgPtr; DPRINT("ScmSendStartCommand() called\n"); @@ -1043,16 +1045,25 @@ /* Copy argument list */ if (argc > 0 && argv != NULL) { -// Ptr += wcslen(Service->lpServiceName) + 1; -// Ptr = ALIGN_UP_POINTER(Ptr, LPWSTR); - -// ControlPacket->dwArgumentsOffset = (DWORD)((INT_PTR)Ptr - (INT_PTR)ControlPacket); - - -#if 0 - memcpy(Ptr, Arguments, ArgsLength); - Ptr += ArgsLength; -#endif + Ptr += wcslen(Service->lpServiceName) + 1; + pOffPtr = (PWSTR*)ALIGN_UP_POINTER(Ptr, PWSTR); + pArgPtr = (PWSTR)((ULONG_PTR)pOffPtr + argc * sizeof(PWSTR)); + + ControlPacket->dwArgumentsCount = argc; + ControlPacket->dwArgumentsOffset = (DWORD)((ULONG_PTR)pOffPtr - (ULONG_PTR)ControlPacket); + + DPRINT("dwArgumentsCount: %lu\n", ControlPacket->dwArgumentsCount); + DPRINT("dwArgumentsOffset: %lu\n", ControlPacket->dwArgumentsOffset); + + for (i = 0; i < argc; i++) + { + wcscpy(pArgPtr, argv[i]); + *pOffPtr = (PWSTR)((ULONG_PTR)pArgPtr - (ULONG_PTR)pOffPtr); + DPRINT("offset: %p\n", *pOffPtr); + + pArgPtr += wcslen(argv[i]) + 1; + pOffPtr++; + } } /* Send the start command */ Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sat Sep 3 19:47:56 2011 @@ -18,20 +18,35 @@ /* TYPES *********************************************************************/ +typedef struct _SERVICE_THREAD_PARAMSA +{ + LPSERVICE_MAIN_FUNCTIONA lpServiceMain; + DWORD dwArgCount; + LPSTR *lpArgVector; +} SERVICE_THREAD_PARAMSA, *PSERVICE_THREAD_PARAMSA; + + +typedef struct _SERVICE_THREAD_PARAMSW +{ + LPSERVICE_MAIN_FUNCTIONW lpServiceMain; + DWORD dwArgCount; + LPWSTR *lpArgVector; +} SERVICE_THREAD_PARAMSW, *PSERVICE_THREAD_PARAMSW; + + typedef struct _ACTIVE_SERVICE { SERVICE_STATUS_HANDLE hServiceStatus; UNICODE_STRING ServiceName; union { - LPSERVICE_MAIN_FUNCTIONA lpFuncA; - LPSERVICE_MAIN_FUNCTIONW lpFuncW; - } Main; + SERVICE_THREAD_PARAMSA A; + SERVICE_THREAD_PARAMSW W; + } ThreadParams; LPHANDLER_FUNCTION HandlerFunction; LPHANDLER_FUNCTION_EX HandlerFunctionEx; LPVOID HandlerContext; BOOL bUnicode; - LPWSTR Arguments; } ACTIVE_SERVICE, *PACTIVE_SERVICE; @@ -148,59 +163,169 @@ static DWORD WINAPI ScServiceMainStub(LPVOID Context) { - PACTIVE_SERVICE lpService; - DWORD dwArgCount = 0; - DWORD dwLength = 0; - DWORD dwLen; - LPWSTR lpPtr; - - lpService = (PACTIVE_SERVICE)Context; + PACTIVE_SERVICE lpService = (PACTIVE_SERVICE)Context; TRACE("ScServiceMainStub() called\n"); - /* Count arguments */ - lpPtr = lpService->Arguments; - while (*lpPtr) - { - TRACE("arg: %S\n", lpPtr); - dwLen = wcslen(lpPtr) + 1; - dwArgCount++; - dwLength += dwLen; - lpPtr += dwLen; - } - TRACE("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); - - /* Build the argument vector and call the main service routine */ + /* Call the main service routine and free the arguments vector */ if (lpService->bUnicode) { - LPWSTR *lpArgVector; - LPWSTR Ptr; - - lpArgVector = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (dwArgCount + 1) * sizeof(LPWSTR)); - if (lpArgVector == NULL) - return ERROR_OUTOFMEMORY; - - dwArgCount = 0; - Ptr = lpService->Arguments; - while (*Ptr) - { - lpArgVector[dwArgCount] = Ptr; - - dwArgCount++; - Ptr += (wcslen(Ptr) + 1); - } - lpArgVector[dwArgCount] = NULL; - - (lpService->Main.lpFuncW)(dwArgCount, lpArgVector); - - HeapFree(GetProcessHeap(), - 0, - lpArgVector); + (lpService->ThreadParams.W.lpServiceMain)(lpService->ThreadParams.W.dwArgCount, + lpService->ThreadParams.W.lpArgVector); + + if (lpService->ThreadParams.A.lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpService->ThreadParams.W.lpArgVector); + + lpService->ThreadParams.W.lpArgVector = NULL; + lpService->ThreadParams.W.dwArgCount = 0; + } } else { + (lpService->ThreadParams.A.lpServiceMain)(lpService->ThreadParams.A.dwArgCount, + lpService->ThreadParams.A.lpArgVector); + + if (lpService->ThreadParams.A.lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpService->ThreadParams.A.lpArgVector); + + lpService->ThreadParams.A.lpArgVector = NULL; + lpService->ThreadParams.A.dwArgCount = 0; + } + } + + return ERROR_SUCCESS; +} + + +static DWORD +ScConnectControlPipe(HANDLE *hPipe) +{ + DWORD dwBytesWritten; + DWORD dwState; + DWORD dwServiceCurrent = 0; + NTSTATUS Status; + WCHAR NtControlPipeName[MAX_PATH + 1]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + DWORD dwProcessId; + + /* Get the service number and create the named pipe */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L""; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &dwServiceCurrent; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceCurrent", + QueryTable, + NULL, + NULL); + + if (!NT_SUCCESS(Status)) + { + ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", dwServiceCurrent); + + if (!WaitNamedPipeW(NtControlPipeName, 15000)) + { + ERR("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + *hPipe = CreateFileW(NtControlPipeName, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (*hPipe == INVALID_HANDLE_VALUE) + { + ERR("CreateFileW() failed for pipe %S (Error %lu)\n", NtControlPipeName, GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + dwState = PIPE_READMODE_MESSAGE; + if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) + { + CloseHandle(*hPipe); + *hPipe = INVALID_HANDLE_VALUE; + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + /* Pass the ProcessId to the SCM */ + dwProcessId = GetCurrentProcessId(); + WriteFile(*hPipe, + &dwProcessId, + sizeof(DWORD), + &dwBytesWritten, + NULL); + + TRACE("Sent Process ID %lu\n", dwProcessId); + + return ERROR_SUCCESS; +} + + +static DWORD +ScStartService(PACTIVE_SERVICE lpService, + PSCM_CONTROL_PACKET ControlPacket) +{ + HANDLE ThreadHandle; + DWORD ThreadId; + LPWSTR *lpArgW; + DWORD i; + + TRACE("ScStartService() called\n"); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + + /* Set the service status handle */ + lpService->hServiceStatus = ControlPacket->hServiceStatus; + + if (lpService->bUnicode == TRUE) + { + lpService->ThreadParams.W.dwArgCount = ControlPacket->dwArgumentsCount; + lpService->ThreadParams.W.lpArgVector = NULL; + + if (ControlPacket->dwArgumentsOffset > 0) + { + lpService->ThreadParams.W.lpArgVector = + HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + if (lpService->ThreadParams.W.lpArgVector == NULL) + return ERROR_OUTOFMEMORY; + + memcpy(lpService->ThreadParams.W.lpArgVector, + ((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset), + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + + lpArgW = lpService->ThreadParams.W.lpArgVector; + for (i = 0; i < lpService->ThreadParams.W.dwArgCount; i++) + { + *lpArgW = (LPWSTR)((ULONG_PTR)lpArgW + (ULONG_PTR)*lpArgW); + lpArgW++; + } + } + } + else + { + /* FIXME */ + lpService->ThreadParams.A.dwArgCount = 0; + lpService->ThreadParams.A.lpArgVector = NULL; + +#if 0 LPSTR *lpArgVector; LPSTR Ptr; LPSTR AnsiString; @@ -256,7 +381,7 @@ } lpArgVector[dwArgCount] = NULL; - (lpService->Main.lpFuncA)(dwArgCount, lpArgVector); + (lpService->ThreadParams.A.lpServiceMain)(dwArgCount, lpArgVector); HeapFree(GetProcessHeap(), 0, @@ -264,140 +389,10 @@ HeapFree(GetProcessHeap(), 0, AnsiString); - } - - return ERROR_SUCCESS; -} - - -static DWORD -ScConnectControlPipe(HANDLE *hPipe) -{ - DWORD dwBytesWritten; - DWORD dwState; - DWORD dwServiceCurrent = 0; - NTSTATUS Status; - WCHAR NtControlPipeName[MAX_PATH + 1]; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - DWORD dwProcessId; - - /* Get the service number and create the named pipe */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L""; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &dwServiceCurrent; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"ServiceCurrent", - QueryTable, - NULL, - NULL); - - if (!NT_SUCCESS(Status)) - { - ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - return RtlNtStatusToDosError(Status); - } - - swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", dwServiceCurrent); - - if (!WaitNamedPipeW(NtControlPipeName, 15000)) - { - ERR("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - *hPipe = CreateFileW(NtControlPipeName, - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (*hPipe == INVALID_HANDLE_VALUE) - { - ERR("CreateFileW() failed for pipe %S (Error %lu)\n", NtControlPipeName, GetLastError()); - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - dwState = PIPE_READMODE_MESSAGE; - if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) - { - CloseHandle(*hPipe); - *hPipe = INVALID_HANDLE_VALUE; - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - /* Pass the ProcessId to the SCM */ - dwProcessId = GetCurrentProcessId(); - WriteFile(*hPipe, - &dwProcessId, - sizeof(DWORD), - &dwBytesWritten, - NULL); - - TRACE("Sent Process ID %lu\n", dwProcessId); - - return ERROR_SUCCESS; -} - - -static DWORD -ScStartService(PACTIVE_SERVICE lpService, - PSCM_CONTROL_PACKET ControlPacket) -{ - HANDLE ThreadHandle; - DWORD ThreadId; - PWSTR pServiceName; - PWSTR Ptr; - DWORD dwArgumentsSize; - - TRACE("ScStartService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); - - /* Set the service status handle */ - lpService->hServiceStatus = ControlPacket->hServiceStatus; - - pServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); - - /* Get the service name size */ - dwArgumentsSize = (wcslen(pServiceName) + 1) * sizeof(WCHAR); - - /* Get the size of the service start arguments */ - if (ControlPacket->dwArgumentsCount > 0 && - ControlPacket->dwArgumentsOffset != 0) - { - /* FIXME */ -#if 0 - dwArgumentSize += (wcslen(...) + 1) * sizeof(WCHAR); #endif } - lpService->Arguments = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwArgumentsSize + sizeof(WCHAR)); - if (lpService->Arguments == NULL) - return ERROR_OUTOFMEMORY; - - Ptr = lpService->Arguments; - - /* Add the service name as first argument */ - wcscpy(Ptr, pServiceName); - Ptr += (wcslen(pServiceName) + 1); - - /* Add service start arguments */ - if (ControlPacket->dwArgumentsCount > 0 && - ControlPacket->dwArgumentsOffset != 0) - { - /* FIXME */ - } - - *Ptr = 0; - - /* invoke the services entry point and implement the command loop */ + /* Invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL, 0, ScServiceMainStub, @@ -405,7 +400,33 @@ CREATE_SUSPENDED, &ThreadId); if (ThreadHandle == NULL) + { + /* Free the arguments vector */ + if (lpService->bUnicode) + { + if (lpService->ThreadParams.W.lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpService->ThreadParams.W.lpArgVector); + lpService->ThreadParams.W.lpArgVector = NULL; + lpService->ThreadParams.W.dwArgCount = 0; + } + } + else + { + if (lpService->ThreadParams.A.lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpService->ThreadParams.A.lpArgVector); + lpService->ThreadParams.A.lpArgVector = NULL; + lpService->ThreadParams.A.dwArgCount = 0; + } + } + return ERROR_SERVICE_NO_THREAD; + } ResumeThread(ThreadHandle); CloseHandle(ThreadHandle); @@ -430,13 +451,6 @@ { /* FIXME: send correct params */ (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); - } - - if (ControlPacket->dwControl == SERVICE_CONTROL_STOP) - { - HeapFree(GetProcessHeap(), - 0, - lpService->Arguments); } TRACE("ScControlService() done\n"); @@ -820,7 +834,7 @@ { RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].ThreadParams.A.lpServiceMain = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = FALSE; } @@ -915,7 +929,7 @@ { RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].ThreadParams.W.lpServiceMain = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = TRUE; }

13 years, 3 months

[tfaber] 53563: [NTDLL_APITEST] - Fix warnings and failure messages

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 3 19:44:07 2011 New Revision: 53563 URL: http://svn.reactos.org/svn/reactos?rev=53563&view=rev Log: [NTDLL_APITEST] - Fix warnings and failure messages Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtFreeVirt… ============================================================================== --- trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] Sat Sep 3 19:44:07 2011 @@ -15,15 +15,15 @@ &Length, MEM_RESERVE, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); Status = NtFreeVirtualMemory(NtCurrentProcess(), &Buffer, &Length, MEM_DECOMMIT); - ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory failed : 0x%08x\n", Status); + ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory failed : 0x%08lx\n", Status); /* Now try to free more than we got */ Length++; @@ -31,13 +31,13 @@ &Buffer, &Length, MEM_DECOMMIT); - ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); Status = NtFreeVirtualMemory(NtCurrentProcess(), &Buffer, &Length, MEM_RELEASE); - ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); /* Free out of bounds from the wrong origin */ Length = PAGE_SIZE; @@ -47,7 +47,7 @@ &Buffer2, &Length, MEM_DECOMMIT); - ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); Buffer2 = (PVOID)((ULONG_PTR)Buffer+1); Length = PAGE_SIZE; @@ -55,7 +55,7 @@ &Buffer2, &Length, MEM_RELEASE); - ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_UNABLE_TO_FREE_VM, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); /* Same but in bounds */ Length = PAGE_SIZE - 1; @@ -65,7 +65,7 @@ &Buffer2, &Length, MEM_DECOMMIT); - ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); ok(Buffer2 == Buffer, "NtFreeVirtualMemory set wrong buffer.\n"); ok(Length == PAGE_SIZE, "NtFreeVirtualMemory did not round Length to PAGE_SIZE.\n"); @@ -75,7 +75,7 @@ &Buffer2, &Length, MEM_RELEASE); - ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory returned status : 0x%08x\n", Status); + ok(Status == STATUS_SUCCESS, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); ok(Buffer2 == Buffer, "NtFreeVirtualMemory set wrong buffer.\n"); ok(Length == PAGE_SIZE, "NtFreeVirtualMemory did not round Length to PAGE_SIZE.\n"); @@ -87,8 +87,8 @@ &Length, MEM_RESERVE, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); Buffer2 = Buffer; @@ -97,8 +97,8 @@ &Buffer2, &Length, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); Buffer2 = (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE); @@ -107,8 +107,8 @@ &Buffer2, &Length, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08x\n", Status); - ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE), "The buffer is not aligned to PAGE_SIZE.\n"); /* Same, but try to free the second page before the first one */ @@ -119,8 +119,8 @@ &Length, MEM_RESERVE, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); Buffer2 = (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE); @@ -129,8 +129,8 @@ &Buffer2, &Length, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == (PVOID)((ULONG_PTR)Buffer+PAGE_SIZE), "The buffer is not aligned to PAGE_SIZE.\n"); Buffer2 = Buffer; @@ -139,8 +139,8 @@ &Buffer2, &Length, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08x\n", Status); - ok(Length == PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); /* Now allocate two pages and try to free them in the middle */ @@ -151,8 +151,8 @@ &Length, MEM_RESERVE, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(((ULONG_PTR)Buffer % PAGE_SIZE) == 0, "The buffer is not aligned to PAGE_SIZE.\n"); Buffer2 = (PVOID)((ULONG_PTR)Buffer+1); @@ -161,8 +161,8 @@ &Buffer2, &Length, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed : 0x%08x\n", Status); - ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x08x\n", Length); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed : 0x%08lx\n", Status); + ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); }

13 years, 3 months

[tfaber] 53562: [KMTESTS] - Add ObReference to build. Was missing for some reason - Use the new CMake macros in preparation for PCH - Use kmtest_.exe as a file name for testcd to please rosautotest...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 3 19:42:02 2011 New Revision: 53562 URL: http://svn.reactos.org/svn/reactos?rev=53562&view=rev Log: [KMTESTS] - Add ObReference to build. Was missing for some reason - Use the new CMake macros in preparation for PCH - Use kmtest_.exe as a file name for testcd to please rosautotest. Perhaps there's a better solution later Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sat Sep 3 19:42:02 2011 @@ -6,6 +6,11 @@ # add_subdirectory(example) add_subdirectory(ntos_io) + +list(APPEND COMMON_SOURCE + rtl/RtlAvlTree.c + rtl/RtlMemory.c + rtl/RtlSplayTree.c) # # kmtest_drv.sys driver @@ -37,10 +42,9 @@ ntos_ke/KeIrql.c ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c + ntos_ob/ObReference.c ntos_ob/ObType.c - rtl/RtlAvlTree.c - rtl/RtlMemory.c - rtl/RtlSplayTree.c + ${COMMON_SOURCE} kmtest_drv/kmtest_drv.rc) @@ -49,15 +53,16 @@ set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) -set_property(TARGET kmtest_drv PROPERTY COMPILE_DEFINITIONS KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) +add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) +#add_pch(kmtest_drv include/kmt_test.h) add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all) add_library(kmtest_printf kmtest_drv/printf_stubs.c ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c) -set_property(TARGET kmtest_printf PROPERTY COMPILE_DEFINITIONS _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) -set_property(TARGET kmtest_printf PROPERTY INCLUDE_DIRECTORIES ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) +add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) +add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) # # kmtest.exe loader application @@ -72,9 +77,7 @@ example/Example_user.c ntos_io/IoDeviceObject_user.c - rtl/RtlAvlTree.c - rtl/RtlMemory.c - rtl/RtlSplayTree.c + ${COMMON_SOURCE} kmtest/kmtest.rc) @@ -82,9 +85,11 @@ set_module_type(kmtest win32cui) target_link_libraries(kmtest ${PSEH_LIB}) add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll) -set_property(TARGET kmtest PROPERTY COMPILE_DEFINITIONS KMT_USER_MODE) +add_target_compile_definitions(kmtest KMT_USER_MODE) +#add_pch(kmtest include/kmt_test.h) -add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) +add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR bootcd livecd) +add_cd_file(TARGET kmtest DESTINATION reactos/bin NAME_ON_CD kmtest_.exe FOR regtest) # # Group targets Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Sat Sep 3 19:42:02 2011 @@ -44,6 +44,7 @@ <file>KeSpinLock.c</file> </directory> <directory name="ntos_ob"> + <file>ObReference.c</file> <file>ObType.c</file> </directory> <directory name="rtl"> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Sep 3 19:42:02 2011 @@ -30,6 +30,7 @@ KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeProcessor; KMT_TESTFUNC Test_KernelType; +KMT_TESTFUNC Test_ObReference; KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; KMT_TESTFUNC Test_ObTypeNoClean; @@ -62,6 +63,7 @@ { "KeIrql", Test_KeIrql }, { "KeProcessor", Test_KeProcessor }, { "-KernelType", Test_KernelType }, + { "ObReference", Test_ObReference }, { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, { "-ObTypeNoClean", Test_ObTypeNoClean },

13 years, 3 months

[jgardou] 53561: [CMAKE] - go RTFM, you moron

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 19:25:54 2011 New Revision: 53561 URL: http://svn.reactos.org/svn/reactos?rev=53561&view=rev Log: [CMAKE] - go RTFM, you moron Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Sep 3 19:25:54 2011 @@ -265,7 +265,7 @@ #set unicode definitions if(__module_UNICODE) - add_target_compile_definitions(${MODULE} -DUNICODE -D_UNICODE) + add_target_compile_definitions(${MODULE} UNICODE _UNICODE) endif() # set entry point

13 years, 3 months

← Newer
1
...
32
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011