Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48589: [CMAKE] - Add cabinet, cards, cfgmgr32 and clusapi to build.
by akhaldi＠svn.reactos.org 22 Aug '10

22 Aug '10

Author: akhaldi Date: Sun Aug 22 01:17:53 2010 New Revision: 48589 URL: http://svn.reactos.org/svn/reactos?rev=48589&view=rev Log: [CMAKE] - Add cabinet, cards, cfgmgr32 and clusapi to build. Added: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cards/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt (with props) 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] Sun Aug 22 01:17:53 2010 @@ -8,6 +8,10 @@ add_subdirectory(avicap32) add_subdirectory(batt) add_subdirectory(beepmidi) +add_subdirectory(cabinet) +add_subdirectory(cards) +add_subdirectory(cfgmgr32) +add_subdirectory(clusapi) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Added: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,23 @@ + +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(cabinet ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.spec ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) + +file(GLOB_RECURSE SOURCE *.c) + +add_library(cabinet SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.rc) + +set_target_properties(cabinet PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(cabinet + ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def + wine + mingw_common) + +add_dependencies(cabinet cabinet_def psdk) Propchange: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 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>") + +add_definitions(-DUNICODE -D_UNICODE) + +# Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN +add_definitions(-DCARDSTYLE_DEFAULT) + +spec2def(cards ${CMAKE_CURRENT_SOURCE_DIR}/cards.spec ${CMAKE_CURRENT_BINARY_DIR}/cards.def) + +add_library(cards SHARED ${CMAKE_CURRENT_SOURCE_DIR}/cards.c ${CMAKE_CURRENT_SOURCE_DIR}/cards.rc) + +set_target_properties(cards PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(cards + ${CMAKE_CURRENT_BINARY_DIR}/cards.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(cards cards_def psdk) Propchange: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… ============================================================================== --- branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,12 @@ + +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>") + +spec2def(cfgmgr32 ${CMAKE_CURRENT_SOURCE_DIR}/cfgmgr32.spec ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) + +add_library(cfgmgr32 SHARED cfgmgr32.rc) + +set_target_properties(cfgmgr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) + +add_dependencies(cfgmgr32 cfgmgr32_def psdk) Propchange: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/clusapi… ============================================================================== --- branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 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(clusapi ${CMAKE_CURRENT_SOURCE_DIR}/clusapi.spec ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def) + +add_library(clusapi SHARED clusapi.c) + +set_target_properties(clusapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(clusapi + ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def + wine + mingw_common) + +add_dependencies(clusapi clusapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48588: [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo.
by akhaldi＠svn.reactos.org 22 Aug '10

22 Aug '10

Author: akhaldi Date: Sun Aug 22 00:52:26 2010 New Revision: 48588 URL: http://svn.reactos.org/svn/reactos?rev=48588&view=rev Log: [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo. Added: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/batt/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/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] Sun Aug 22 00:52:26 2010 @@ -5,6 +5,9 @@ add_subdirectory(advapi32) add_subdirectory(advpack) add_subdirectory(authz) +add_subdirectory(avicap32) +add_subdirectory(batt) +add_subdirectory(beepmidi) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) file(GLOB_RECURSE SOURCE *.c) Added: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 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(-DUNICODE -D_UNICODE) + +spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) + +add_library(avicap32 SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.c + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.rc) + +set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(avicap32 + ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + wine + mingw_common + -lversion) + +add_dependencies(avicap32 avicap32_def psdk) Propchange: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 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>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def) + +add_library(batt SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/batt.c + ${CMAKE_CURRENT_SOURCE_DIR}/batt.rc) + +set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(batt + ${CMAKE_CURRENT_BINARY_DIR}/batt.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(batt batt_def psdk) Propchange: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 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>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) + +add_library(beepmidi SHARED beepmidi.c) + +set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(beepmidi + ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(beepmidi beepmidi_def psdk) Propchange: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48587: [CMAKE] - Add activeds, advpack and authz to build.
by akhaldi＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: akhaldi Date: Sat Aug 21 23:52:17 2010 New Revision: 48587 URL: http://svn.reactos.org/svn/reactos?rev=48587&view=rev Log: [CMAKE] - Add activeds, advpack and authz to build. Added: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/authz/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/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] Sat Aug 21 23:52:17 2010 @@ -1,7 +1,10 @@ add_subdirectory(acledit) add_subdirectory(aclui) +add_subdirectory(activeds) add_subdirectory(advapi32) +add_subdirectory(advpack) +add_subdirectory(authz) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -2,7 +2,6 @@ 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) -add_definitions(-DSUPPORT_UXTHEME) file(GLOB_RECURSE SOURCE *.c) Added: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 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_BINARY_DIR}/include/reactos/wine) + +spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) + +add_library(activeds SHARED activeds_main.c) + +set_target_properties(activeds PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(activeds + ${CMAKE_CURRENT_BINARY_DIR}/activeds.def + wine + mingw_common) + +add_dependencies(activeds activeds_def psdk) Propchange: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 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_BINARY_DIR}/include/reactos/wine) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(advpack ${CMAKE_CURRENT_SOURCE_DIR}/advpack.spec ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) + +add_library(advpack SHARED ${SOURCE}) + +set_target_properties(advpack PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(advpack + ${CMAKE_CURRENT_BINARY_DIR}/advpack.def + wine + mingw_common + -lole32 + -lsetupapi + -lversion + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + +add_dependencies(advpack advpack_def psdk) Propchange: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/authz/C… ============================================================================== --- branches/cmake-bringup/dll/win32/authz/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 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>") + +add_definitions(-DUNICODE -D_UNICODE) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(authz ${CMAKE_CURRENT_SOURCE_DIR}/authz.spec ${CMAKE_CURRENT_BINARY_DIR}/authz.def) + +add_library(authz SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/authz.rc + ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch) + +set_target_properties(authz PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(authz + ${CMAKE_CURRENT_BINARY_DIR}/authz.def + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(authz authz_def psdk) Propchange: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48586: [CMAKE] - Add acledit to build.
by akhaldi＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: akhaldi Date: Sat Aug 21 23:35:57 2010 New Revision: 48586 URL: http://svn.reactos.org/svn/reactos?rev=48586&view=rev Log: [CMAKE] - Add acledit to build. Added: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt (with props) 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] Sat Aug 21 23:35:57 2010 @@ -1,4 +1,5 @@ +add_subdirectory(acledit) add_subdirectory(aclui) add_subdirectory(advapi32) add_subdirectory(gdi32) Added: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:35:57 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>") + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DSUPPORT_UXTHEME) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(acledit ${CMAKE_CURRENT_SOURCE_DIR}/acledit.spec ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) + +add_library(acledit SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/acledit.rc) + +set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(acledit + ${CMAKE_CURRENT_BINARY_DIR}/acledit.def + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(acledit acledit_def psdk) Propchange: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48585: [CMAKE] - Add aclui to build.
by akhaldi＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: akhaldi Date: Sat Aug 21 23:25:35 2010 New Revision: 48585 URL: http://svn.reactos.org/svn/reactos?rev=48585&view=rev Log: [CMAKE] - Add aclui to build. Added: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt (with props) 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] Sat Aug 21 23:25:35 2010 @@ -1,4 +1,5 @@ +add_subdirectory(aclui) add_subdirectory(advapi32) add_subdirectory(gdi32) add_subdirectory(kernel32) Added: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:25:35 2010 @@ -1,0 +1,31 @@ + +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) +add_definitions(-DSUPPORT_UXTHEME) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(aclui ${CMAKE_CURRENT_SOURCE_DIR}/aclui.spec ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) + +add_library(aclui SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/aclui.rc + ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch) + +set_target_properties(aclui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(aclui + ${CMAKE_CURRENT_BINARY_DIR}/aclui.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a + -lcomctl32 + -lole32 + -loleaut32 + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -luxtheme + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(aclui aclui_def psdk) Propchange: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48584: [CMAKE] - Add a macro to handle generating definition files from spec files (for Wine dlls)
by akhaldi＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: akhaldi Date: Sat Aug 21 23:23:46 2010 New Revision: 48584 URL: http://svn.reactos.org/svn/reactos?rev=48584&view=rev Log: [CMAKE] - Add a macro to handle generating definition files from spec files (for Wine dlls) Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Aug 21 23:23:46 2010 @@ -40,3 +40,14 @@ DEPENDS ${_header_filename}) ENDMACRO(add_pch _target_name _header_filename _src_list) + +MACRO(spec2def _target_name _spec_file _def_file) + + add_custom_command( + OUTPUT ${_def_file} + COMMAND native-winebuild -o ${_def_file} --def -E ${_spec_file} --filename ${_target_name}.dll + DEPENDS native-winebuild) + set_source_files_properties(${_def_file} PROPERTIES GENERATED TRUE) + add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file}) + +ENDMACRO(spec2def _target_name _spec_file _def_file)

1 0

[cgutman] 48583: [NTOSKRNL] - Fix a typo that broke handling of DevicePropertyEnumeratorName inside IoGetDeviceProperty
by cgutman＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: cgutman Date: Sat Aug 21 22:08:00 2010 New Revision: 48583 URL: http://svn.reactos.org/svn/reactos?rev=48583&view=rev Log: [NTOSKRNL] - Fix a typo that broke handling of DevicePropertyEnumeratorName inside IoGetDeviceProperty Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 21 22:08:00 2010 @@ -3327,8 +3327,8 @@ ASSERT(EnumeratorNameEnd); /* This is the format of the returned data */ - PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * 2, - &DeviceNode->ChildBusNumber); + PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * sizeof(WCHAR), + DeviceInstanceName); case DevicePropertyAddress:

1 0

[tkreuzer] 48582: [WIN32K] Use the object type index, not the shifted full object type to decide what to do with an object in NtGdiDeleteObjectApp. Fixes leaking derived types such as pens.
by tkreuzer＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: tkreuzer Date: Sat Aug 21 22:00:50 2010 New Revision: 48582 URL: http://svn.reactos.org/svn/reactos?rev=48582&view=rev Log: [WIN32K] Use the object type index, not the shifted full object type to decide what to do with an object in NtGdiDeleteObjectApp. Fixes leaking derived types such as pens. 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] Sat Aug 21 22:00:50 2010 @@ -773,7 +773,7 @@ if (IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; - ObjType = GDI_HANDLE_GET_TYPE(DCHandle) >> GDI_ENTRY_UPPER_SHIFT; + ObjType = GDI_OBJECT_GET_TYPE_INDEX((ULONG_PTR)DCHandle); if (GreGetObjectOwner( DCHandle, ObjType)) {

1 0

[cgutman] 48581: [NTOSKRNL] - Don't overwrite the ACPI hardware key on every boot
by cgutman＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: cgutman Date: Sat Aug 21 21:39:53 2010 New Revision: 48581 URL: http://svn.reactos.org/svn/reactos?rev=48581&view=rev Log: [NTOSKRNL] - Don't overwrite the ACPI hardware key on every boot Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 21 21:39:53 2010 @@ -2621,6 +2621,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; + ULONG Disposition; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); @@ -2642,27 +2643,32 @@ if (IopIsAcpiComputer()) { InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); - Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, &Disposition); ZwClose(hRoot); if (!NT_SUCCESS(Status)) return Status; - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); - Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + if (Disposition == REG_CREATED_NEW_KEY) + { + InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); + Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); + ZwClose(hHalAcpiDevice); + if (!NT_SUCCESS(Status)) + return Status; + Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); + if (NT_SUCCESS(Status)) + Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); + Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + if (NT_SUCCESS(Status)) + ZwClose(hLogConf); + } + ZwClose(hHalAcpiId); + return Status; + } ZwClose(hHalAcpiDevice); - if (!NT_SUCCESS(Status)) - return Status; - Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); - if (NT_SUCCESS(Status)) - Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); - if (NT_SUCCESS(Status)) - { - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); - Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (NT_SUCCESS(Status)) - ZwClose(hLogConf); - } - ZwClose(hHalAcpiId); - return Status; + return STATUS_SUCCESS; } else {

1 0

[cgutman] 48580: [NTOSKRNL] - Append the DLL name and NULL terminate the string more nicely
by cgutman＠svn.reactos.org 21 Aug '10

21 Aug '10

Author: cgutman Date: Sat Aug 21 21:25:07 2010 New Revision: 48580 URL: http://svn.reactos.org/svn/reactos?rev=48580&view=rev Log: [NTOSKRNL] - Append the DLL name and NULL terminate the string more nicely Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Aug 21 21:25:07 2010 @@ -1135,9 +1135,9 @@ ImageFileDirectory->Length); /* Now add the import name and null-terminate it */ - RtlAppendStringToString((PSTRING)&DllName, - (PSTRING)&NameString); - DllName.Buffer[(DllName.MaximumLength - 1) / sizeof(WCHAR)] = UNICODE_NULL; + RtlAppendUnicodeStringToString(&DllName, + &NameString); + DllName.Buffer[DllName.Length / sizeof(WCHAR)] = UNICODE_NULL; /* Load the image */ Status = MmLoadSystemImage(&DllName,

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