Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48609: [CMAKE] - Update user32 now that we have a target named imm32.
by akhaldi＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: akhaldi Date: Mon Aug 23 15:23:35 2010 New Revision: 48609 URL: http://svn.reactos.org/svn/reactos?rev=48609&view=rev Log: [CMAKE] - Update user32 now that we have a target named imm32. Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Aug 23 15:23:35 2010 @@ -35,7 +35,7 @@ wine ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - imm32 + -limm32 win32ksys pseh ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a

1 0

[akhaldi] 48608: [CMAKE] - Add fmifs, fusion, getuname, hid, httpapi, iccvid, icmp, imaadp32.acm, imagehlp, imm32, initpki, iphlpapi, itircl, loadperf, lpk, lz32, mapi32, mciavi32, mcicda and mciqt...
by akhaldi＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: akhaldi Date: Mon Aug 23 14:40:47 2010 New Revision: 48608 URL: http://svn.reactos.org/svn/reactos?rev=48608&view=rev Log: [CMAKE] - Add fmifs, fusion, getuname, hid, httpapi, iccvid, icmp, imaadp32.acm, imagehlp, imm32, initpki, iphlpapi, itircl, loadperf, lpk, lz32, mapi32, mciavi32, mcicda and mciqtz32 to build. Added: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hid/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt (with props) Removed: branches/cmake-bringup/dll/win32/imm32/imm.spec Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -23,7 +23,27 @@ add_subdirectory(dnsapi) add_subdirectory(dwmapi) add_subdirectory(faultrep) +add_subdirectory(fmifs) +add_subdirectory(fusion) add_subdirectory(gdi32) +add_subdirectory(getuname) +add_subdirectory(hid) +add_subdirectory(httpapi) +add_subdirectory(iccvid) +add_subdirectory(icmp) +add_subdirectory(imaadp32.acm) +add_subdirectory(imagehlp) +add_subdirectory(imm32) +add_subdirectory(initpki) +add_subdirectory(iphlpapi) +add_subdirectory(itircl) add_subdirectory(kernel32) +add_subdirectory(loadperf) +add_subdirectory(lpk) +add_subdirectory(lz32) +add_subdirectory(mapi32) +add_subdirectory(mciavi32) +add_subdirectory(mcicda) +add_subdirectory(mciqtz32) add_subdirectory(msvcrt) add_subdirectory(user32) Added: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,27 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) + +list(APPEND SOURCE + chkdsk.c + compress.c + diskcopy.c + extend.c + format.c + init.c + media.c + query.c + fmifs.rc) + +add_library(fmifs SHARED ${SOURCE}) + +set_target_properties(fmifs PROPERTIES LINK_FLAGS "-Wl,-entry,_InitializeFmIfs@12") + +target_link_libraries(fmifs + ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(fmifs fmifs_def psdk) Propchange: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… ============================================================================== --- branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,29 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(fusion ${CMAKE_CURRENT_SOURCE_DIR}/fusion.spec ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) + +add_library(fusion SHARED + asmcache.c + asmenum.c + asmname.c + assembly.c + fusion.c + fusion_main.c) + +set_target_properties(fusion PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(fusion + ${CMAKE_CURRENT_BINARY_DIR}/fusion.def + wine + mingw_common + -lshlwapi + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + +add_dependencies(fusion fusion_def psdk) Propchange: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(getuname ${CMAKE_CURRENT_SOURCE_DIR}/getuname.spec ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) + +add_library(getuname SHARED getuname.c getuname.rc) + +set_target_properties(getuname PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(getuname + ${CMAKE_CURRENT_BINARY_DIR}/getuname.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(getuname getuname_def psdk) Propchange: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +list(APPEND SOURCE hid.c stubs.c hid.rc) + +spec2def(hid ${CMAKE_CURRENT_SOURCE_DIR}/hid.spec ${CMAKE_CURRENT_BINARY_DIR}/hid.def) + +add_library(hid SHARED + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch) + +set_target_properties(hid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(hid + ${CMAKE_CURRENT_BINARY_DIR}/hid.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(hid hid_def psdk) Propchange: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(httpapi ${CMAKE_CURRENT_SOURCE_DIR}/httpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) + +add_library(httpapi SHARED httpapi_main.c) + +set_target_properties(httpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(httpapi + ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def + wine + mingw_common) + +add_dependencies(httpapi httpapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(iccvid ${CMAKE_CURRENT_SOURCE_DIR}/iccvid.spec ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def) + +add_library(iccvid SHARED iccvid.c rsrc.rc) + +set_target_properties(iccvid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(iccvid + ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common) + +add_dependencies(iccvid iccvid_def psdk) Propchange: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(icmp ${CMAKE_CURRENT_SOURCE_DIR}/icmp.spec ${CMAKE_CURRENT_BINARY_DIR}/icmp.def) + +add_library(icmp SHARED icmp_main.c icmp.rc) + +set_target_properties(icmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(icmp + ${CMAKE_CURRENT_BINARY_DIR}/icmp.def + wine + -lws2_32 + mingw_common) + +add_dependencies(icmp icmp_def psdk) Propchange: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,29 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/imaadp32.acm.spec --filename imaadp32.acm + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def PROPERTIES GENERATED TRUE) +add_custom_target(imaadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def) + +add_library(imaadp32.acm SHARED imaadp32.c) + +set_target_properties(imaadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(imaadp32.acm + ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def + wine + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(imaadp32.acm imaadp32.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,32 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_IMAGEHLP_SOURCE_) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/imagehlp.spec ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def) + +list(APPEND SOURCE + access.c + imagehlp_main.c + integrity.c + modify.c + imagehlp.rc) + +add_library(imagehlp SHARED + ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_precomp.h.gch + ${SOURCE}) + +set_target_properties(imagehlp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(imagehlp + ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(imagehlp imagehlp_def psdk) Propchange: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(imm32 ${CMAKE_CURRENT_SOURCE_DIR}/imm32.spec ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) + +add_library(imm32 SHARED imm.c version.rc) + +set_target_properties(imm32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(imm32 + ${CMAKE_CURRENT_BINARY_DIR}/imm32.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common) + +add_dependencies(imm32 imm32_def psdk) Propchange: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/dll/win32/imm32/imm.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/i… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/imm.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/imm.spec (removed) @@ -1,54 +1,0 @@ -4 stub IMMGETDEFAULTIMEWND -7 stub IMMGETDESCRIPTIONA -8 stub IMMGETIMEFILENAMEA -9 stub IMMGETPROPERTY -11 stub IMMINSTALLIMEA -#15 stub ___EXPORTEDSTUB -17 stub IMMISIME -25 stub IMMGETHOTKEY -26 stub IMMSETHOTKEY -27 stub IMMSIMULATEHOTKEY -35 stub IMMCREATECONTEXT -36 stub IMMDESTROYCONTEXT -37 stub IMMGETCONTEXT -38 stub IMMRELEASECONTEXT -39 stub IMMASSOCIATECONTEXT -41 stub IMMASSOCIATECONTEXTEX -43 stub IMMGETCOMPOSITIONSTRINGA -44 stub IMMSETCOMPOSITIONSTRINGA -45 stub IMMGETCANDIDATELISTCOUNTA -46 stub IMMGETCANDIDATELISTA -47 stub IMMGETGUIDELINEA -51 stub IMMGETCONVERSIONSTATUS -52 stub IMMSETCONVERSIONSTATUS -53 stub IMMGETOPENSTATUS -54 stub IMMSETOPENSTATUS -55 stub IMMGETCOMPOSITIONFONTA -56 stub IMMSETCOMPOSITIONFONTA -61 stub IMMCONFIGUREIMEA -63 stub IMMESCAPEA -64 stub IMMGETCONVERSIONLISTA -65 stub IMMNOTIFYIME -71 stub IMMISUIMESSAGEA -72 stub IMMGENERATEMESSAGE -73 stub IMMGETVIRTUALKEY -87 stub IMMGETSTATUSWINDOWPOS -88 stub IMMSETSTATUSWINDOWPOS -89 stub IMMGETCOMPOSITIONWINDOW -90 stub IMMSETCOMPOSITIONWINDOW -91 stub IMMGETCANDIDATEWINDOW -92 stub IMMSETCANDIDATEWINDOW -95 stub IMMUNINSTALLIMEA -110 stub IMMLOCKIMC -111 stub IMMUNLOCKIMC -112 stub IMMGETIMCLOCKCOUNT -116 stub IMMCREATEIMCC -117 stub IMMDESTROYIMCC -118 stub IMMLOCKIMCC -119 stub IMMUNLOCKIMCC -120 stub IMMGETIMCCLOCKCOUNT -121 stub IMMRESIZEIMCC -122 stub IMMGETIMCCSIZE -#160 stub FT_IMMFTHKTHKCONNECTIONDATA -#161 stub IMM32THKCONNECTIONDATASL -180 stub IMMSYNCCONVERSION Added: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… ============================================================================== --- branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(initpki ${CMAKE_CURRENT_SOURCE_DIR}/initpki.spec ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) + +add_library(initpki SHARED main.c) + +set_target_properties(initpki PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(initpki + ${CMAKE_CURRENT_BINARY_DIR}/initpki.def + wine + mingw_common) + +add_dependencies(initpki initpki_def psdk) Propchange: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,36 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include) +include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) + +spec2def(iphlpapi ${CMAKE_CURRENT_SOURCE_DIR}/iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) + +add_library(iphlpapi SHARED + dhcp_reactos.c + ifenum_reactos.c + ipstats_reactos.c + iphlpapi_main.c + media.c + registry.c + resinfo_reactos.c + route_reactos.c + iphlpapi.rc) + +set_target_properties(iphlpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(iphlpapi + ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def + wine + tdilib + ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/libdhcpcsvc.a + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -lws2_32 + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(iphlpapi iphlpapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… ============================================================================== --- branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) + +add_library(itircl SHARED itircl_main.c) + +set_target_properties(itircl PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(itircl + ${CMAKE_CURRENT_BINARY_DIR}/itircl.def + wine + mingw_common) + +add_dependencies(itircl itircl_def psdk) Propchange: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(loadperf ${CMAKE_CURRENT_SOURCE_DIR}/loadperf.spec ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) + +add_library(loadperf SHARED loadperf_main.c) + +set_target_properties(loadperf PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(loadperf + ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def + wine + mingw_common) + +add_dependencies(loadperf loadperf_def psdk) Propchange: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DLANGPACK) +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(include) + +spec2def(lpk ${CMAKE_CURRENT_SOURCE_DIR}/lpk.spec ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) + +add_library(lpk SHARED dllmain.c stub.c lpk.rc) + +set_target_properties(lpk PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(lpk + ${CMAKE_CURRENT_BINARY_DIR}/lpk.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -lusp10 + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(lpk lpk_def psdk) Propchange: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(lz32 ${CMAKE_CURRENT_SOURCE_DIR}/lz32.spec ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) + +add_library(lz32 SHARED version.rc) + +set_target_properties(lz32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(lz32 + ${CMAKE_CURRENT_BINARY_DIR}/lz32.def + wine + mingw_common) + +add_dependencies(lz32 lz32_def psdk) Propchange: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,30 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mapi32 ${CMAKE_CURRENT_SOURCE_DIR}/mapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) + +add_library(mapi32 SHARED + imalloc.c + mapi32_main.c + prop.c + sendmail.c + util.c + version.rc) + +set_target_properties(mapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mapi32 + ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def + wine + -lshlwapi + -lshell32 + -luuid + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + +add_dependencies(mapi32 mapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,28 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciavi32 ${CMAKE_CURRENT_SOURCE_DIR}/mciavi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) + +add_library(mciavi32 SHARED + info.c + mciavi.c + mmoutput.c + wnd.c + mciavi_res.rc) + +set_target_properties(mciavi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mciavi32 + ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def + wine + -lmsvfw32 + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(mciavi32 mciavi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mcicda ${CMAKE_CURRENT_SOURCE_DIR}/mcicda.spec ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) + +add_library(mcicda SHARED mcicda.c) + +set_target_properties(mcicda PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(mcicda + ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def + wine + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + +add_dependencies(mcicda mcicda_def psdk) Propchange: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciqtz32 ${CMAKE_CURRENT_SOURCE_DIR}/mciqtz32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) + +add_library(mciqtz32 SHARED mciqtz.c version.rc) + +set_target_properties(mciqtz32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mciqtz32 + ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def + wine + -lwinmm + -loleaut32 + -lole32 + strmiids + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(mciqtz32 mciqtz32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48607: [CMAKE] - Temporarily add libdbghelp.a and libdhcpcsvc.a
by akhaldi＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: akhaldi Date: Mon Aug 23 14:34:34 2010 New Revision: 48607 URL: http://svn.reactos.org/svn/reactos?rev=48607&view=rev Log: [CMAKE] - Temporarily add libdbghelp.a and libdhcpcsvc.a Added: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a (with props) branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a (with props) Added: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 48606: [NTOSKRNL] - Rewrite MiFindEmptyAddressRangeDownTree. The old implementation's "most awesome loop" duplicated both the initialization and the interation steps. It was also overcom...
by tkreuzer＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: tkreuzer Date: Mon Aug 23 03:00:03 2010 New Revision: 48606 URL: http://svn.reactos.org/svn/reactos?rev=48606&view=rev Log: [NTOSKRNL] - Rewrite MiFindEmptyAddressRangeDownTree. The old implementation's "most awesome loop" duplicated both the initialization and the interation steps. It was also overcomplicated. The new implementation additionally returns the parent for the following table insertion, so this doesnt need to be done in an extra search. The return value is changed from NTSTATUS to TABLE_SEARCH_RESULT - Modify MiInsertNode to accept a parent and TABLE_SEARCH_RESULT instead of searching for a free location. - Modify MiCreatePebOrTeb to make use of the new features - Handle failed allocation of the PEB/TEB - Fixes a failed assertion that Olaf got - I tested this code quite some time and no problems were found Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -1050,21 +1050,24 @@ IN PMM_AVL_TABLE Table ); -NTSTATUS +TABLE_SEARCH_RESULT NTAPI MiFindEmptyAddressRangeDownTree( IN SIZE_T Length, IN ULONG_PTR BoundaryAddress, IN ULONG_PTR Alignment, IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent ); VOID NTAPI MiInsertNode( + IN PMM_AVL_TABLE Table, IN PMMADDRESS_NODE NewNode, - IN PMM_AVL_TABLE Table + PMMADDRESS_NODE Parent, + TABLE_SEARCH_RESULT Result ); VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -55,6 +55,8 @@ ULONG RandomCoeff; ULONG_PTR StartAddress, EndAddress; LARGE_INTEGER CurrentTime; + TABLE_SEARCH_RESULT Result = TableFoundNode; + PMMADDRESS_NODE Parent; /* Allocate a VAD */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); @@ -93,26 +95,29 @@ StartAddress -= RandomCoeff; EndAddress = StartAddress + ROUND_TO_PAGES(Size) - 1; - /* See if this VA range can be obtained */ - if (!MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, - EndAddress >> PAGE_SHIFT, - &Process->VadRoot)) - { - /* No conflict, use this address */ - *Base = StartAddress; - goto AfterFound; - } - } - - /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ - Status = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1, - PAGE_SIZE, - &Process->VadRoot, - Base); - ASSERT(NT_SUCCESS(Status)); - -AfterFound: + /* Try to find something below the random upper margin */ + Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), + EndAddress, + PAGE_SIZE, + &Process->VadRoot, + Base, + &Parent); + } + + /* Check for success. TableFoundNode means nothing free. */ + if (Result == TableFoundNode) + { + /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ + Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1, + PAGE_SIZE, + &Process->VadRoot, + Base, + &Parent); + /* Bail out, if still nothing free was found */ + if (Result == TableFoundNode) return STATUS_NO_MEMORY; + } + /* Validate that it came from the VAD ranges */ ASSERT(*Base >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); @@ -132,8 +137,8 @@ /* Insert the VAD */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); Process->VadRoot.NodeHint = Vad; - MiInsertNode((PVOID)Vad, &Process->VadRoot); - + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/mm/ARM3/vadnode.c * PURPOSE: ARM Memory Manager VAD Node Algorithms * PROGRAMMERS: ReactOS Portable Systems Group + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -92,19 +93,14 @@ VOID NTAPI -MiInsertNode(IN PMMADDRESS_NODE NewNode, - IN PMM_AVL_TABLE Table) -{ - PMMADDRESS_NODE NodeOrParent = NULL; - TABLE_SEARCH_RESULT Result; - - /* Find the node's parent, and where to insert this node */ - Result = RtlpFindAvlTableNodeOrParent(Table, - (PVOID)NewNode->StartingVpn, - &NodeOrParent); - +MiInsertNode( + IN PMM_AVL_TABLE Table, + IN PMMADDRESS_NODE NewNode, + PMMADDRESS_NODE Parent, + TABLE_SEARCH_RESULT Result) +{ /* Insert it into the tree */ - RtlpInsertAvlTreeNode(Table, NewNode, NodeOrParent, Result); + RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); } VOID @@ -155,17 +151,18 @@ return NULL; } -NTSTATUS -NTAPI -MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, - IN ULONG_PTR BoundaryAddress, - IN ULONG_PTR Alignment, - IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base) -{ - PMMADDRESS_NODE Node, PreviousNode; - ULONG_PTR CandidateAddress, EndAddress; - ULONG AlignEndVpn, CandidateVpn, BoundaryVpn, LowestVpn, StartVpn, EndVpn; +TABLE_SEARCH_RESULT +NTAPI +MiFindEmptyAddressRangeDownTree( + IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent) +{ + PMMADDRESS_NODE Node, LowestNode, Child; + ULONG LowVpn, HighVpn; PFN_NUMBER PageCount; /* Sanity checks */ @@ -174,107 +171,82 @@ /* Compute page length, make sure the boundary address is valid */ Length = PAGE_ROUND_UP(Length); + PageCount = Length >> PAGE_SHIFT; if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; - - /* Compute the highest address to start at */ - CandidateAddress = ROUND_UP(BoundaryAddress + 1 - Length, Alignment); /* Check if the table is empty */ - if (!Table->NumberGenericTableElements) + if (Table->NumberGenericTableElements == 0) { /* Tree is empty, the candidate address is already the best one */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Starting from the root, go down until the right-most child */ - Node = RtlRightChildAvl(&Table->BalancedRoot); - while (RtlRightChildAvl(Node)) Node = RtlRightChildAvl(Node); - - /* Get the aligned ending address of this VPN */ - EndAddress = ROUND_UP((Node->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), - Alignment); - - /* Can we fit the address without overflowing into the node? */ - if ((EndAddress < BoundaryAddress) && - ((BoundaryAddress - EndAddress) > Length)) + *Base = ROUND_DOWN(BoundaryAddress + 1 - Length, Alignment); + return TableEmptyTree; + } + + /* Calculate the initial upper margin */ + HighVpn = BoundaryAddress >> PAGE_SHIFT; + + /* Starting from the root, go down until the right-most child, + trying to stay below the boundary. */ + LowestNode = Node = RtlRightChildAvl(&Table->BalancedRoot); + while ( (Child = RtlRightChildAvl(Node)) && + Child->EndingVpn < HighVpn ) Node = Child; + + /* Now loop the Vad nodes */ + while (Node) + { + /* Keep track of the lowest node */ + LowestNode = Node; + + /* Calculate the lower margin */ + LowVpn = ROUND_UP(Node->EndingVpn + 1, Alignment >> PAGE_SHIFT); + + /* Check if the current bounds are suitable */ + if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) + { + /* There is enough space to add our node */ + LowVpn = HighVpn - PageCount; + *Base = LowVpn << PAGE_SHIFT; + + /* Can we use the current node as parent? */ + Child = RtlRightChildAvl(Node); + if (!Child) + { + /* Node has no right child, so use it as parent */ + *Parent = Node; + return TableInsertAsRight; + } + else + { + /* Node has a right child, find most left grand child */ + Node = Child; + while ((Child = RtlLeftChildAvl(Node))) Node = Child; + *Parent = Node; + return TableInsertAsLeft; + } + } + + /* Update the upper margin if neccessary */ + if (Node->StartingVpn < HighVpn) HighVpn = Node->StartingVpn; + + /* Go to the next lower node */ + Node = MiGetPreviousNode(Node); + } + + /* Check if there's enough space before the lowest Vad */ + LowVpn = ROUND_UP((ULONG_PTR)MI_LOWEST_VAD_ADDRESS, Alignment) >> PAGE_SHIFT; + if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) { /* There is enough space to add our address */ - *Base = ROUND_UP(BoundaryAddress - Length, Alignment); - return STATUS_SUCCESS; - } - - PageCount = Length >> PAGE_SHIFT; - CandidateVpn = CandidateAddress >> PAGE_SHIFT; - BoundaryVpn = BoundaryAddress >> PAGE_SHIFT; - LowestVpn = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS >> PAGE_SHIFT; - - PreviousNode = MiGetPreviousNode(Node); - - StartVpn = Node->StartingVpn; - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0; - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - - /* Loop until a gap is found */ - for (PageCount = Length >> PAGE_SHIFT, - CandidateVpn = CandidateAddress >> PAGE_SHIFT, - BoundaryVpn = BoundaryAddress >> PAGE_SHIFT, - LowestVpn = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS >> PAGE_SHIFT, - PreviousNode = MiGetPreviousNode(Node), - StartVpn = Node->StartingVpn, - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0, - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - PreviousNode; - Node = PreviousNode, - PreviousNode = MiGetPreviousNode(Node), - StartVpn = Node->StartingVpn, - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0, - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT)) - { - /* Can we fit the address without overflowing into the node? */ - if ((StartVpn < CandidateVpn) && ((StartVpn - AlignEndVpn) >= PageCount)) - { - /* Check if we can get our candidate address */ - if ((CandidateVpn > EndVpn) && (BoundaryVpn < StartVpn)) - { - /* Use it */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Otherwise, can we fit it by changing the start address? */ - if (StartVpn > AlignEndVpn) - { - /* It'll fit, compute the new base address for that to work */ - *Base = ROUND_UP((StartVpn << PAGE_SHIFT) - Length, Alignment); - return STATUS_SUCCESS; - } - } - - PreviousNode = MiGetPreviousNode(Node); - StartVpn = Node->StartingVpn; - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0; - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - } - - /* See if we could squeeze into the last descriptor */ - if ((StartVpn > LowestVpn) && ((StartVpn - LowestVpn) >= PageCount)) - { - /* Check if we can try our candidate address */ - if (BoundaryVpn < StartVpn) - { - /* Use it */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Otherwise, change the base address to what's needed to fit in */ - *Base = ROUND_UP((StartVpn << PAGE_SHIFT) - Length, Alignment); - return STATUS_SUCCESS; - } - + LowVpn = HighVpn - PageCount; + *Base = LowVpn << PAGE_SHIFT; + *Parent = LowestNode; + return TableInsertAsLeft; + } + /* No address space left at all */ - return STATUS_NO_MEMORY; + *Base = 0; + *Parent = NULL; + return TableFoundNode; } /* EOF */

1 0

[tkreuzer] 48605: [WIN32K] Seperate DC_vSetLayout from NtGdiSetLayout and save the old value before setting the new one.
by tkreuzer＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: tkreuzer Date: Mon Aug 23 01:41:56 2010 New Revision: 48605 URL: http://svn.reactos.org/svn/reactos?rev=48605&view=rev Log: [WIN32K] Seperate DC_vSetLayout from NtGdiSetLayout and save the old value before setting the new one. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Mon Aug 23 01:41:56 2010 @@ -886,6 +886,46 @@ return; } +VOID +NTAPI +DC_vSetLayout( + IN PDC pdc, + IN LONG wox, + IN DWORD dwLayout) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + + pdcattr->dwLayout = dwLayout; + + if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) return; + + if (dwLayout & LAYOUT_RTL) + { + pdcattr->iMapMode = MM_ANISOTROPIC; + } + + pdcattr->szlWindowExt.cy = -pdcattr->szlWindowExt.cy; + pdcattr->ptlWindowOrg.x = -pdcattr->ptlWindowOrg.x; + + if (wox == -1) + IntMirrorWindowOrg(pdc); + else + pdcattr->ptlWindowOrg.x = wox - pdcattr->ptlWindowOrg.x; + + if (!(pdcattr->flTextAlign & TA_CENTER)) pdcattr->flTextAlign |= TA_RIGHT; + + if (pdc->dclevel.flPath & DCPATH_CLOCKWISE) + pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; + else + pdc->dclevel.flPath |= DCPATH_CLOCKWISE; + + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); + +// DC_UpdateXforms(pdc); +} + // NtGdiSetLayout // // The default is left to right. This function changes it to right to left, which @@ -901,53 +941,22 @@ IN LONG wox, IN DWORD dwLayout) { - PDC dc; + PDC pdc; PDC_ATTR pdcattr; DWORD oLayout; - dc = DC_LockDc(hdc); - if (!dc) + pdc = DC_LockDc(hdc); + if (!pdc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } - pdcattr = dc->pdcattr; - - pdcattr->dwLayout = dwLayout; + pdcattr = pdc->pdcattr; + oLayout = pdcattr->dwLayout; - - if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) - { - DC_UnlockDc(dc); - return oLayout; - } - - if (dwLayout & LAYOUT_RTL) - { - pdcattr->iMapMode = MM_ANISOTROPIC; - } - - pdcattr->szlWindowExt.cy = -pdcattr->szlWindowExt.cy; - pdcattr->ptlWindowOrg.x = -pdcattr->ptlWindowOrg.x; - - if (wox == -1) - IntMirrorWindowOrg(dc); - else - pdcattr->ptlWindowOrg.x = wox - pdcattr->ptlWindowOrg.x; - - if (!(pdcattr->flTextAlign & TA_CENTER)) pdcattr->flTextAlign |= TA_RIGHT; - - if (dc->dclevel.flPath & DCPATH_CLOCKWISE) - dc->dclevel.flPath &= ~DCPATH_CLOCKWISE; - else - dc->dclevel.flPath |= DCPATH_CLOCKWISE; - - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | - INVALIDATE_ATTRIBUTES | - DEVICE_TO_WORLD_INVALID); - -// DC_UpdateXforms(dc); - DC_UnlockDc(dc); + DC_vSetLayout(pdc, wox, dwLayout); + + DC_UnlockDc(pdc); return oLayout; }

1 0

[tkreuzer] 48604: [WIN32K] Move the allocation of the vis region of the DC to a later position, so that all mandatory fields are initialized before we try to delete the DC in failure case. Fixes ye...
by tkreuzer＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: tkreuzer Date: Mon Aug 23 01:39:28 2010 New Revision: 48604 URL: http://svn.reactos.org/svn/reactos?rev=48604&view=rev Log: [WIN32K] Move the allocation of the vis region of the DC to a later position, so that all mandatory fields are initialized before we try to delete the DC in failure case. Fixes yet another possible crash. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Aug 23 01:39:28 2010 @@ -48,18 +48,6 @@ } hDC = NewDC->BaseObject.hHmgr; - - /* Allocate a Vis region */ - NewDC->prgnVis = IntSysCreateRectpRgn(0, 0, 1, 1); - if (!NewDC->prgnVis) - { - DPRINT1("IntSysCreateRectpRgn failed\n"); - if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) - { - ASSERT(FALSE); - } - return NULL; - } NewDC->pdcattr = &NewDC->dcattr; DC_AllocateDcAttr(hDC); @@ -145,6 +133,18 @@ hsurf = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? NewDC->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); + + /* Allocate a Vis region */ + NewDC->prgnVis = IntSysCreateRectpRgn(0, 0, 1, 1); + if (!NewDC->prgnVis) + { + DPRINT1("IntSysCreateRectpRgn failed\n"); + if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) + { + ASSERT(FALSE); + } + return NULL; + } return NewDC; }

1 0

[tkreuzer] 48603: [NDK] Add LdrProcessRelocationBlockLongLong. Fixes build, sorry.
by tkreuzer＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: tkreuzer Date: Mon Aug 23 01:18:09 2010 New Revision: 48603 URL: http://svn.reactos.org/svn/reactos?rev=48603&view=rev Log: [NDK] Add LdrProcessRelocationBlockLongLong. Fixes build, sorry. Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Mon Aug 23 01:18:09 2010 @@ -109,4 +109,13 @@ IN ULONG FileLength ); +PIMAGE_BASE_RELOCATION +NTAPI +LdrProcessRelocationBlockLongLong( + IN ULONG_PTR Address, + IN ULONG Count, + IN PUSHORT TypeOffset, + IN LONGLONG Delta +); + #endif

1 0

[cgutman] 48602: [TCPIP] - Read the IP information from the interface key inside the Tcpip service key (confirmed on XP) - Fix a logic error in my code (no idea how I missed it) - Restores static I...
by cgutman＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: cgutman Date: Mon Aug 23 01:17:41 2010 New Revision: 48602 URL: http://svn.reactos.org/svn/reactos?rev=48602&view=rev Log: [TCPIP] - Read the IP information from the interface key inside the Tcpip service key (confirmed on XP) - Fix a logic error in my code (no idea how I missed it) - Restores static IP functionality (still waiting on janderwald to fix netcfgx's DNS value writing) Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Mon Aug 23 01:17:41 2010 @@ -569,9 +569,7 @@ * SystemSpecific1: Pointer to a registry path with protocol-specific configuration information * SystemSpecific2: Unused & must not be touched */ -{ - /* XXX confirm that this is still true, or re-word the following comment */ - /* we get to ignore BindContext because we will never pend an operation with NDIS */ +{ TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName)); *Status = LANRegisterAdapter(DeviceName, SystemSpecific1); } @@ -952,10 +950,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ParameterHandle; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInfo; + WCHAR Buffer[150]; UNICODE_STRING IPAddress = RTL_CONSTANT_STRING(L"IPAddress"); UNICODE_STRING Netmask = RTL_CONSTANT_STRING(L"SubnetMask"); UNICODE_STRING Gateway = RTL_CONSTANT_STRING(L"DefaultGateway"); UNICODE_STRING EnableDhcp = RTL_CONSTANT_STRING(L"EnableDHCP"); + UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"); + UNICODE_STRING TcpipRegistryPath; UNICODE_STRING RegistryDataU; ANSI_STRING RegistryDataA; @@ -1009,9 +1010,19 @@ TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); + + TcpipRegistryPath.MaximumLength = sizeof(WCHAR) * 150; + TcpipRegistryPath.Length = 0; + TcpipRegistryPath.Buffer = Buffer; + + RtlAppendUnicodeStringToString(&TcpipRegistryPath, + &Prefix); + + RtlAppendUnicodeStringToString(&TcpipRegistryPath, + &IF->Name); InitializeObjectAttributes(&ObjectAttributes, - RegistryPath, + &TcpipRegistryPath, OBJ_CASE_INSENSITIVE, 0, NULL); @@ -1019,6 +1030,7 @@ AddrInitIPv4(&DefaultMask, 0); Status = ZwOpenKey(&ParameterHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) { IF->Unicast = DefaultMask; @@ -1040,7 +1052,7 @@ KeyValueInfo, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG), &Unused); - if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) != 0) + if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) == 0) { RegistryDataU.MaximumLength = 16 + sizeof(WCHAR); RegistryDataU.Buffer = (PWCHAR)KeyValueInfo->Data;

1 0

[tkreuzer] 48601: [NTDLL] - Call LdrProcessRelocationBlockLongLong from LdrProcessRelocationBlock instead of duplicating the code
by tkreuzer＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: tkreuzer Date: Mon Aug 23 01:16:42 2010 New Revision: 48601 URL: http://svn.reactos.org/svn/reactos?rev=48601&view=rev Log: [NTDLL] - Call LdrProcessRelocationBlockLongLong from LdrProcessRelocationBlock instead of duplicating the code Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Mon Aug 23 01:16:42 2010 @@ -88,10 +88,10 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount > 0 && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) - { + if (Module->LoadCount > 0 && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) + { Module->LoadCount--; - } + } if (!Locked) { RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); @@ -107,10 +107,10 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount != LDRP_PROCESS_CREATION_TIME) - { + if (Module->LoadCount != LDRP_PROCESS_CREATION_TIME) + { Module->LoadCount++; - } + } if (!Locked) { RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); @@ -3464,54 +3464,15 @@ } -PIMAGE_BASE_RELOCATION NTAPI -LdrProcessRelocationBlock(IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONG_PTR Delta) -{ - SHORT Offset; - USHORT Type; - USHORT i; - PUSHORT ShortPtr; - PULONG LongPtr; - - for (i = 0; i < Count; i++) - { - Offset = *TypeOffset & 0xFFF; - Type = *TypeOffset >> 12; - - switch (Type) - { - case IMAGE_REL_BASED_ABSOLUTE: - break; - - case IMAGE_REL_BASED_HIGH: - ShortPtr = (PUSHORT)((ULONG_PTR)Address + Offset); - *ShortPtr += HIWORD(Delta); - break; - - case IMAGE_REL_BASED_LOW: - ShortPtr = (PUSHORT)((ULONG_PTR)Address + Offset); - *ShortPtr += LOWORD(Delta); - break; - - case IMAGE_REL_BASED_HIGHLOW: - LongPtr = (PULONG)((ULONG_PTR)Address + Offset); - *LongPtr += Delta; - break; - - case IMAGE_REL_BASED_HIGHADJ: - case IMAGE_REL_BASED_MIPS_JMPADDR: - default: - DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); - return NULL; - } - - TypeOffset++; - } - - return (PIMAGE_BASE_RELOCATION)TypeOffset; +PIMAGE_BASE_RELOCATION +NTAPI +LdrProcessRelocationBlock( + IN ULONG_PTR Address, + IN ULONG Count, + IN PUSHORT TypeOffset, + IN LONG_PTR Delta) +{ + return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta); } NTSTATUS

1 0

[akhaldi] 48600: [FAULTREP] - Fix a typo.
by akhaldi＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: akhaldi Date: Mon Aug 23 00:02:06 2010 New Revision: 48600 URL: http://svn.reactos.org/svn/reactos?rev=48600&view=rev Log: [FAULTREP] - Fix a typo. Modified: trunk/reactos/dll/win32/faultrep/faultrep.rbuild Modified: trunk/reactos/dll/win32/faultrep/faultrep.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/faultre… ============================================================================== --- trunk/reactos/dll/win32/faultrep/faultrep.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/faultrep.rbuild [iso-8859-1] Mon Aug 23 00:02:06 2010 @@ -1,6 +1,6 @@ <module name="faultrep" type="win32dll" baseaddress="${BASEADDRESS_FAULTREP}" installbase="system32" installname="faultrep.dll"> <importlibrary definition="faultrep.spec" /> - <include base="fusion">.</include> + <include base="faultrep">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <library>wine</library>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs