Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[akhaldi] 48965: [CMAKE] - Improve the IDL macro, along with some dependencies.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 17:09:48 2010 New Revision: 48965 URL: http://svn.reactos.org/svn/reactos?rev=48965&view=rev Log: [CMAKE] - Improve the IDL macro, along with some dependencies. Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Sat Oct 2 17:09:48 2010 @@ -12,6 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def wine) -add_importlibs(xmllite msvcrt kernel32 ntdll) +add_importlibs(xmllite kernel32 ntdll) add_dependencies(xmllite xmllite_def psdk buildno_header) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Sat Oct 2 17:09:48 2010 @@ -8,44 +8,45 @@ get_directory_property(includes INCLUDE_DIRECTORIES) foreach(arg ${defines}) - set(result_defs ${result_defs} -D${arg}) + set(result_defs ${result_defs} -D${arg}) endforeach(arg ${defines}) foreach(arg ${includes}) - set(result_incs -I${arg} ${result_incs}) + set(result_incs -I${arg} ${result_incs}) endforeach(arg ${includes}) -MACRO (MACRO_IDL_FILES) +macro (MACRO_IDL_FILES) - FOREACH(_in_FILE ${ARGN}) + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + add_dependencies(${FILE}_server psdk) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + add_dependencies(${FILE}_client psdk) + endforeach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl - ) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - PROPERTIES GENERATED TRUE - ) - add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl - ) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - PROPERTIES GENERATED TRUE - ) - add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) +endmacro (MACRO_IDL_FILES) - ENDFOREACH(_in_FILE ${ARGN}) +list(APPEND SOURCE + eventlogrpc.idl + lsa.idl + pnp.idl + svcctl.idl + wlansvc.idl) -ENDMACRO (MACRO_IDL_FILES) - -file(GLOB_RECURSE SOURCE "*.idl") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ms-dtyp.idl) MACRO_IDL_FILES(${SOURCE})

14 years, 2 months

[akhaldi] 48964: [CMAKE] - Improve the unicode situation. - Apply a consistent formatting. - Improve the unicode modules we have so far. - Get rid of some rbuildism. - Overall improvements.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 16:09:32 2010 New Revision: 48964 URL: http://svn.reactos.org/svn/reactos?rev=48964&view=rev Log: [CMAKE] - Improve the unicode situation. - Apply a consistent formatting. - Improve the unicode modules we have so far. - Get rid of some rbuildism. - Overall improvements. Added: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libcrypt32.a (with props) Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/base/applications/charmap/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt branches/cmake-bringup/base/applications/control/CMakeLists.txt branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt branches/cmake-bringup/base/applications/hh/CMakeLists.txt branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt branches/cmake-bringup/dll/win32/authz/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,7 @@ -list(APPEND SOURCE - cacls.c - cacls.rc) +set_unicode() + +list(APPEND SOURCE cacls.c cacls.rc) add_executable(cacls ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch @@ -9,8 +9,5 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -set_unicode(cacls yes) - set_module_type(cacls win32cui) - -add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) +add_importlibs(cacls advapi32 user32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) add_executable(calc @@ -12,7 +13,4 @@ resource.rc) set_module_type(calc win32gui) -set_unicode(calc yes) add_importlibs(calc advapi32 user32 gdi32 msvcrt) - -add_dependencies(calc psdk) Modified: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,3 +1,5 @@ + +set_unicode() list(APPEND SOURCE about.c @@ -12,8 +14,5 @@ add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -set_unicode(charmap yes) - set_module_type(charmap win32gui) - -add_importlibs(charmap user32 gdi32 comctl32 msvcrt) +add_importlibs(charmap user32 gdi32 comctl32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,5 @@ + add_executable(dbgprint dbgprint.c) set_module_type(dbgprint win32cui) - -set_unicode(dbgprint no) - -add_importlibs(dbgprint msvcrt) +add_importlibs(dbgprint msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,7 @@ -add_executable(doskey - doskey.c - doskey.rc) + +set_unicode() + +add_executable(doskey doskey.c doskey.rc) set_module_type(doskey win32cui) - -set_unicode(doskey yes) - -add_importlibs(doskey user32 msvcrt) +add_importlibs(doskey user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(find - find.c - find.rc) + +add_executable(find find.c find.rc) set_module_type(find win32cui) - -set_unicode(find no) - -add_importlibs(find user32 msvcrt) +add_importlibs(find user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(hostname - hostname.c - hostname.rc) + +add_executable(hostname hostname.c hostname.rc) set_module_type(hostname win32cui) - -set_unicode(hostname no) - -add_importlibs(hostname msvcrt) +add_importlibs(hostname msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,7 @@ + +set_unicode() + add_executable(lodctr lodctr_main.c) set_module_type(lodctr win32cui) - -set_unicode(lodctr yes) - -add_importlibs(lodctr loadperf msvcrt) +add_importlibs(lodctr loadperf msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(more - more.c - more.rc) + +add_executable(more more.c more.rc) set_module_type(more win32cui) - -set_unicode(more no) - -add_importlibs(more ntdll user32 msvcrt) +add_importlibs(more user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,12 +1,10 @@ + +set_unicode() + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_executable(reg - reg.c - rsrc.rc) +add_executable(reg reg.c rsrc.rc) set_module_type(reg win32cui) - -set_unicode(reg yes) - -add_importlibs(reg advapi32 user32 msvcrt) +add_importlibs(reg advapi32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,11 +1,9 @@ -add_executable(xcopy - xcopy.c - rsrc.rc) + +set_unicode() + +add_executable(xcopy xcopy.c rsrc.rc) + +target_link_libraries(xcopy wine) set_module_type(xcopy win32cui) - -set_unicode(xcopy yes) - -add_importlibs(xcopy shell32 user32 msvcrt ntdll) - -target_link_libraries(xcopy wine) +add_importlibs(xcopy shell32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,7 @@ -add_executable(control - control.c - control.rc) +set_unicode() -set_unicode(control yes) +add_executable(control control.c control.rc) set_module_type(control win32gui) - -add_importlibs(control advapi32 shell32 kernel32 msvcrt) +add_importlibs(control advapi32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,9 @@ + +set_unicode() add_executable(extrac32 extrac32.c) -set_unicode(extrac32 yes) +target_link_libraries(extrac32 wine) set_module_type(extrac32 win32gui) - -target_link_libraries(extrac32 wine) - -add_importlibs(extrac32 ntdll shell32 setupapi shlwapi user32 msvcrt) +add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -4,8 +4,5 @@ fontview.c fontview.rc) -set_unicode(fontview no) - set_module_type(fontview win32gui) - -add_importlibs(fontview gdi32 shell32 user32 msvcrt) +add_importlibs(fontview gdi32 shell32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,3 +1,5 @@ + +set_unicode() include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) @@ -7,10 +9,7 @@ solitaire.cpp rsrc.rc) -set_unicode(sol yes) +target_link_libraries(sol cardlib) set_module_type(sol win32gui) - -target_link_libraries(sol cardlib) - -add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt) +add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt) Modified: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,14 +1,14 @@ +set_unicode() + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +set_rc_compiler() add_executable(winemine main.c dialog.c rsrc.rc) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -set_unicode(winemine yes) - set_module_type(winemine win32gui) -set_rc_compiler() - -add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,5 @@ -add_executable(hh - main.c - hh.rc) - -set_unicode(hh no) +add_executable(hh main.c hh.rc) set_module_type(hh win32gui) - -add_importlibs(hh gdi32 user32 msvcrt) +add_importlibs(hh gdi32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,5 @@ -add_executable(iexplore - main.c - iexplore.rc) - -set_unicode(iexplore no) +add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) - -add_importlibs(iexplore shdocvw msvcrt) +add_importlibs(iexplore shdocvw msvcrt) Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,13 +1,12 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_unicode() add_definitions(-DANONYMOUSUNIONS) add_definitions(-D_DEBUG_MEM) -list(APPEND SOURCE - cmd.rc - main.c) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +list(APPEND SOURCE main.c cmd.rc) list(APPEND SOURCE alias.c @@ -71,7 +70,9 @@ window.c) add_executable(cmd ${CMAKE_CURRENT_BINARY_DIR}/cmd_precomp.h.gch ${SOURCE}) + +target_link_libraries(cmd wine) + +add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -set_unicode(cmd yes) -target_link_libraries(cmd oldnames wine) add_importlibs(cmd advapi32 user32 msvcrt) Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,6 +1,8 @@ + add_subdirectory(notifyhook) -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DWIN32) add_definitions(-D__WINDRES__) @@ -46,16 +48,12 @@ add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE}) +target_link_libraries(explorer + wine + uuid) + set_module_type(explorer win32gui) -target_link_libraries(explorer - mingw_wmain - mingw_common - coldname - oldnames - wine - uuid) - add_importlibs(explorer advapi32 gdi32 Modified: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksuse… ============================================================================== --- branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -7,5 +7,5 @@ target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) -add_importlibs(ksuser ntdll advapi32) +add_importlibs(ksuser advapi32 kernel32 ntdll) add_dependencies(ksuser ksuser_def psdk bugcodes) 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 Oct 2 16:09:32 2010 @@ -1,20 +1,18 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) - -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + acledit.c + stubs.c + acledit.rc) 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) +add_library(acledit SHARED ${SOURCE}) -set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(acledit win32dll) -target_link_libraries(acledit - ${CMAKE_CURRENT_BINARY_DIR}/acledit.def - -lntdll) +target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) +add_importlibs(acledit ntdll) -add_dependencies(acledit acledit_def psdk buildno_header) +add_dependencies(acledit acledit_def) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,6 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DSUPPORT_UXTHEME) file(GLOB_RECURSE SOURCE *.c) @@ -28,4 +27,4 @@ -lntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(aclui aclui_def psdk) +add_dependencies(aclui aclui_def psdk buildno_header) 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] Sat Oct 2 16:09:32 2010 @@ -16,4 +16,4 @@ wine mingw_common) -add_dependencies(activeds activeds_def psdk) +add_dependencies(activeds activeds_def psdk buildno_header) 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] Sat Oct 2 16:09:32 2010 @@ -22,4 +22,4 @@ -lversion -ladvapi32) -add_dependencies(advpack advpack_def psdk) +add_dependencies(advpack advpack_def psdk buildno_header) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -21,4 +21,4 @@ -lntdll) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(authz authz_def psdk) +add_dependencies(authz authz_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,16 +1,18 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DNDEBUG=1) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound + ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer + ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv - DEPENDS native-winebuild) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv + DEPENDS native-winebuild) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE) add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def) @@ -30,5 +32,5 @@ libsamplerate mmixer) -add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser) +add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) add_dependencies(wdmaud.drv wdmaud.drv_def psdk) Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,13 +1,15 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) @@ -38,5 +40,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def wine) -add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32) +add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) add_dependencies(windowscodecs windowscodecs_def psdk) Added: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3… ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,0 +1,26 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__ -DWIN32) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/winemp3.acm.spec --filename winemp3.acm + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def PROPERTIES GENERATED TRUE) +add_custom_target(winemp3.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def) + +add_library(winemp3.acm SHARED mpegl3.c) + +set_target_properties(winemp3.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(winemp3.acm + ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def + mingw_common + wine + mpg123) + +add_importlibs(winemp3.acm msvcrt winmm user32) +add_dependencies(winemp3.acm winemp3.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -20,5 +20,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def wine) -add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll) +add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll) add_dependencies(winhttp winhttp_def psdk) Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,8 +1,10 @@ add_definitions(-D__WINESRC__ -D_WINE) +add_definitions(-Dclose=_close) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) spec2def(wininet ${CMAKE_CURRENT_SOURCE_DIR}/wininet.spec ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) @@ -30,5 +32,5 @@ zlib pseh) -add_importlibs(wininet msvcrt mpr shlwapi shell32 user32 advapi32 ntdll secur32 crypt32 ws2_32) +add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) add_dependencies(wininet wininet_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -25,7 +25,7 @@ wine pseh) -add_importlibs(winmm msvcrt ntdll advapi32 user32) +add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(winmm winmm_def psdk) add_subdirectory(midimap) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -16,5 +16,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/winspool.def wine) -add_importlibs(winspool ntdll advapi32 shlwapi) +add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_dependencies(winspool winspool_def psdk) Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -21,6 +21,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/winsta.def wine) -add_importlibs(winsta ntdll) +add_importlibs(winsta kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) add_dependencies(winsta winsta_def psdk) Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -19,5 +19,5 @@ wine pseh) -add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll) -add_dependencies(wintrust wintrust_def psdk) +add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) +add_dependencies(wintrust wintrust_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -13,5 +13,5 @@ wine pseh) -add_importlibs(wlanapi kernel32 rpcrt4 ntdll) +add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi wlanapi_def psdk) Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -33,5 +33,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def wine) -add_importlibs(wldap32 ntdll user32) +add_importlibs(wldap32 user32 kernel32 ntdll) add_dependencies(wldap32 wldap32_def psdk) Modified: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -30,6 +30,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def wine) -add_importlibs(ws2_32 ntdll user32 advapi32 dnsapi ws2help) +add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_dependencies(ws2_32 ws2_32_def psdk) Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -51,5 +51,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def wine) -add_importlibs(ws2_32_new ntdll user32 advapi32 dnsapi ws2help) +add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) add_dependencies(ws2_32_new ws2_32_new_def psdk) Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -13,5 +13,5 @@ set_module_type(ws2help win32dll) target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) -add_importlibs(ws2help advapi32 ntdll ws2_32) +add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) add_dependencies(ws2help ws2help_def psdk) Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,5 +1,5 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) @@ -8,5 +8,5 @@ set_module_type(wshirda win32dll) target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) -add_importlibs(wshirda ntdll ws2_32) +add_importlibs(wshirda ws2_32 kernel32 ntdll) add_dependencies(wshirda wshirda_def psdk) Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) @@ -12,5 +13,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def tdilib) -add_importlibs(wshtcpip kernel32 ntdll ws2_32) +add_importlibs(wshtcpip kernel32 ws2_32 kernel32 ntdll) add_dependencies(wshtcpip wshtcpip_def psdk) Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,10 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() add_library(wsock32 SHARED stubs.c wsock32.rc) set_module_type(wsock32 win32dll) target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) -add_importlibs(wsock32 ntdll ws2_32) +add_importlibs(wsock32 ws2_32 kernel32 ntdll) add_dependencies(wsock32 psdk) Modified: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wtsapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -12,5 +12,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def wine) -add_importlibs(wtsapi32 advapi32 ntdll) +add_importlibs(wtsapi32 advapi32 kernel32 ntdll) add_dependencies(wtsapi32 wtsapi32_def psdk) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -23,5 +23,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def wine) -add_importlibs(wuapi uuid ole32 advapi32 ntdll) -add_dependencies(wuapi wuapi_def psdk) +add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) +add_dependencies(wuapi wuapi_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput1_1 SHARED xinput1_1_main.c version.rc) +add_importlibs(xinput1_1 kernel32) + set_module_type(xinput1_1 win32dll) target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) -add_dependencies(xinput1_1 xinput1_1_def psdk) +add_dependencies(xinput1_1 xinput1_1_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput1_2 SHARED xinput1_2_main.c version.rc) +add_importlibs(xinput1_2 kernel32) + set_module_type(xinput1_2 win32dll) target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) -add_dependencies(xinput1_2 xinput1_2_def psdk) +add_dependencies(xinput1_2 xinput1_2_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -12,4 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def wine) -add_dependencies(xinput1_3 xinput1_3_def psdk) +add_importlibs(xinput1_3 msvcrt kernel32 ntdll) + +add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc) +add_importlibs(xinput9_1_0 kernel32) + set_module_type(xinput9_1_0 win32dll) target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) -add_dependencies(xinput9_1_0 xinput9_1_0_def psdk) +add_dependencies(xinput9_1_0 xinput9_1_0_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -12,4 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def wine) -add_dependencies(xmllite xmllite_def psdk) +add_importlibs(xmllite msvcrt kernel32 ntdll) + +add_dependencies(xmllite xmllite_def psdk buildno_header) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -53,44 +53,49 @@ endmacro() macro(add_importlibs MODULE) - FOREACH(LIB ${ARGN}) + foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.a) - ENDFOREACH() + endforeach() endmacro() macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} builno_header psdk) + add_dependencies(${MODULE} psdk buildno_header) - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if(${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) - endif() - if(${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) - endif() - if(${TYPE} MATCHES win32dll) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) - set_entrypoint(${MODULE} DllMain@12) - endif() + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + set_entrypoint(${MODULE} NtProcessStartup@4) + endif() + if(${TYPE} MATCHES win32gui) + set_subsystem(${MODULE} windows) + set_entrypoint(${MODULE} WinMainCRTStartup) + if(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_main) + else() + target_link_libraries(${MODULE} mingw_wmain) + endif(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_common) + endif() + if(${TYPE} MATCHES win32cui) + set_subsystem(${MODULE} console) + set_entrypoint(${MODULE} mainCRTStartup) + if(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_main) + else() + target_link_libraries(${MODULE} mingw_wmain) + endif(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_common) + endif() + if(${TYPE} MATCHES win32dll) + set_entrypoint(${MODULE} DllMain@12) + endif() endmacro() endif() -macro(set_unicode MODULE STATE) - if(${STATE} MATCHES yes) - add_definitions(-DUNICODE -D_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) - else() - target_link_libraries(${MODULE} mingw_main) - endif() - - target_link_libraries(${MODULE} mingw_common) +macro(set_unicode) + add_definitions(-DUNICODE -D_UNICODE) + set(IS_UNICODE 1) endmacro() # Workaround lack of mingw RC support in cmake @@ -106,20 +111,18 @@ set(result_incs "-I${arg} ${result_incs}") endforeach(arg ${includes}) - SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #typelib support macro(ADD_TYPELIB TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS native-widl - ) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command(OUTPUT ${OBJECT} + COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} + DEPENDS native-widl) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() Added: branches/cmake-bringup/importlibs/libcrypt32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcrypt32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,6 +1,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") - add_definitions(-D__i386__) + add_definitions(-D__i386__) endif() add_definitions(-Dinline=__inline) @@ -33,34 +33,32 @@ endmacro() macro(add_importlibs MODULE) - FOREACH(LIB ${ARGN}) - target_link_libraries(${MODULE} ${LIB}.LIB) - ENDFOREACH() + foreach(LIB ${ARGN}) + target_link_libraries(${MODULE} ${LIB}.LIB) + endforeach() endmacro() macro(set_module_type MODULE TYPE) - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - add_importlibs(${MODULE} ntdll) - endif() - if (${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - endif () - if (${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - endif () + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + add_importlibs(${MODULE} ntdll) + endif() + if (${TYPE} MATCHES win32gui) + set_subsystem(${MODULE} windows) + endif () + if (${TYPE} MATCHES win32cui) + set_subsystem(${MODULE} console) + endif () endmacro() -macro(set_unicode MODULE STATE) - if(${STATE} MATCHES yes) - add_definitions(-DUNICODE -D_UNICODE) - endif() +macro(set_unicode) + add_definitions(-DUNICODE -D_UNICODE) endmacro() endif() set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") macro(set_rc_compiler) # dummy, this workaround is only needed in mingw due to lack of RC support in cmake @@ -68,14 +66,12 @@ #typelib support macro(ADD_TYPELIB TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - ) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command(OUTPUT ${OBJECT} + COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro()

14 years, 2 months

[spetreolle] 48963: [CMAKE] Add missing libcryptui.a for wintrust.dll.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Oct 2 14:02:32 2010 New Revision: 48963 URL: http://svn.reactos.org/svn/reactos?rev=48963&view=rev Log: [CMAKE] Add missing libcryptui.a for wintrust.dll. Added: branches/cmake-bringup/importlibs/libcryptui.a (with props) Added: branches/cmake-bringup/importlibs/libcryptui.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcryptui.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 2 months

[akhaldi] 48962: [CMAKE] - Add wdmaud.drv, windowscodecs, winfax, wing32, winhttp, winmm, winspool, winsta and winsta to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 11:18:13 2010 New Revision: 48962 URL: http://svn.reactos.org/svn/reactos?rev=48962&view=rev Log: [CMAKE] - Add wdmaud.drv, windowscodecs, winfax, wing32, winhttp, winmm, winspool, winsta and winsta to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wintrust/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 Oct 2 11:18:13 2010 @@ -197,18 +197,18 @@ add_subdirectory(uxtheme) #add_subdirectory(vdmdbg) #add_subdirectory(version) -#add_subdirectory(wdmaud.drv) -#add_subdirectory(windowscodecs) +add_subdirectory(wdmaud.drv) +add_subdirectory(windowscodecs) #add_subdirectory(winemp3.acm) -#add_subdirectory(winfax) -#add_subdirectory(wing32) -#add_subdirectory(winhttp) -#add_subdirectory(wininet) -#add_subdirectory(winmm) +add_subdirectory(winfax) +add_subdirectory(wing32) +add_subdirectory(winhttp) +add_subdirectory(wininet) +add_subdirectory(winmm) #add_subdirectory(winscard) -#add_subdirectory(winspool) -#add_subdirectory(winsta) -#add_subdirectory(wintrust) +add_subdirectory(winspool) +add_subdirectory(winsta) +add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) #add_subdirectory(wmi) Added: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,34 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DNDEBUG=1) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE) +add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def) + +add_library(wdmaud.drv SHARED + wdmaud.c + mixer.c + mmixer.c + legacy.c + wdmaud.rc) + +set_module_type(wdmaud.drv win32dll) +set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") + +target_link_libraries(wdmaud.drv + ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + mmebuddy + libsamplerate + mmixer) + +add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser) +add_dependencies(wdmaud.drv wdmaud.drv_def psdk) Propchange: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,42 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) + +spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) + +add_library(windowscodecs SHARED + bmpdecode.c + bmpencode.c + clsfactory.c + converter.c + fliprotate.c + gifformat.c + icoformat.c + imgfactory.c + info.c + jpegformat.c + main.c + palette.c + pngformat.c + propertybag.c + regsvr.c + stream.c + tiffformat.c + ungif.c + version.rc) + +set_module_type(windowscodecs win32dll) + +target_link_libraries(windowscodecs + ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def + wine) + +add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32) +add_dependencies(windowscodecs windowscodecs_def psdk) Propchange: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,11 @@ + +spec2def(winfax ${CMAKE_CURRENT_SOURCE_DIR}/winfax.spec ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_library(winfax SHARED winfax.c winfax.rc) + +set_target_properties(winfax PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(winfax ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_importlibs(winfax kernel32 ntdll) +add_dependencies(winfax winfax_def psdk) Propchange: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,13 @@ + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(wing32 ${CMAKE_CURRENT_SOURCE_DIR}/wing32.spec ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_library(wing32 SHARED wing32.c) + +set_target_properties(wing32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(wing32 ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_importlibs(wing32 user32 gdi32) +add_dependencies(wing32 wing32_def psdk) Propchange: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winhttp ${CMAKE_CURRENT_SOURCE_DIR}/winhttp.spec ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) + +add_library(winhttp SHARED + cookie.c + handle.c + main.c + net.c + request.c + session.c + url.c) + +set_module_type(winhttp win32dll) + +target_link_libraries(winhttp + ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def + wine) + +add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll) +add_dependencies(winhttp winhttp_def psdk) Propchange: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,31 @@ + +add_definitions(-D_WINE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winmm ${CMAKE_CURRENT_SOURCE_DIR}/winmm.spec ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) + +set_rc_compiler() + +add_library(winmm SHARED + driver.c + joystick.c + lolvldrv.c + mci.c + mmio.c + playsound.c + registry.c + time.c + winmm.c + winmm_res.rc) + +set_module_type(winmm win32dll) + +target_link_libraries(winmm + ${CMAKE_CURRENT_BINARY_DIR}/winmm.def + wine + pseh) + +add_importlibs(winmm msvcrt ntdll advapi32 user32) +add_dependencies(winmm winmm_def psdk) + +add_subdirectory(midimap) Propchange: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/m… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,15 @@ + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(midimap ${CMAKE_CURRENT_SOURCE_DIR}/midimap.spec ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) + +add_library(midimap SHARED midimap.c midimap.rc) + +set_target_properties(midimap PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(midimap + ${CMAKE_CURRENT_BINARY_DIR}/midimap.def + wine) + +add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm) +add_dependencies(midimap midimap_def psdk) Propchange: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,20 @@ + +add_definitions(-DUNICODE -D_UNICODE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) + +add_library(winspool SHARED + info.c + stubs.c + winspool.rc) + +set_module_type(winspool win32dll) +set_target_properties(winspool PROPERTIES SUFFIX ".drv") + +target_link_libraries(winspool + ${CMAKE_CURRENT_BINARY_DIR}/winspool.def + wine) + +add_importlibs(winspool ntdll advapi32 shlwapi) +add_dependencies(winspool winspool_def psdk) Propchange: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,26 @@ + +spec2def(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.spec ${CMAKE_CURRENT_BINARY_DIR}/winsta.def) + +list(APPEND SOURCE + logon.c + main.c + misc.c + query.c + security.c + server.c + ws.c + winsta.rc) + +add_library(winsta SHARED + ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch + ${SOURCE}) + +set_module_type(winsta win32dll) + +target_link_libraries(winsta + ${CMAKE_CURRENT_BINARY_DIR}/winsta.def + wine) + +add_importlibs(winsta ntdll) +add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) +add_dependencies(winsta winsta_def psdk) Propchange: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(wintrust ${CMAKE_CURRENT_SOURCE_DIR}/wintrust.spec ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) + +add_library(wintrust SHARED + crypt.c + register.c + wintrust_main.c + asn.c + softpub.c + version.rc) + +set_module_type(wintrust win32dll) + +target_link_libraries(wintrust + ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def + wine + pseh) + +add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll) +add_dependencies(wintrust wintrust_def psdk) Propchange: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[akhaldi] 48961: [CMAKE] - Add wininet to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 10:15:25 2010 New Revision: 48961 URL: http://svn.reactos.org/svn/reactos?rev=48961&view=rev Log: [CMAKE] - Add wininet to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt (with props) Added: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sat Oct 2 10:15:25 2010 @@ -1,0 +1,34 @@ + +add_definitions(-D__WINESRC__ -D_WINE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) + +spec2def(wininet ${CMAKE_CURRENT_SOURCE_DIR}/wininet.spec ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) + +set_rc_compiler() + +add_library(wininet SHARED + cookie.c + dialogs.c + ftp.c + gopher.c + http.c + internet.c + netconnection.c + urlcache.c + utility.c + wininet_main.c + rsrc.rc + version.rc) + +set_module_type(wininet win32dll) + +target_link_libraries(wininet + ${CMAKE_CURRENT_BINARY_DIR}/wininet.def + wine + zlib + pseh) + +add_importlibs(wininet msvcrt mpr shlwapi shell32 user32 advapi32 ntdll secur32 crypt32 ws2_32) +add_dependencies(wininet wininet_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[akhaldi] 48960: [CMAKE] - Fix wininet translations so that wininet can compile. I'll provide a patch upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 10:14:50 2010 New Revision: 48960 URL: http://svn.reactos.org/svn/reactos?rev=48960&view=rev Log: [CMAKE] - Fix wininet translations so that wininet can compile. I'll provide a patch upstream. Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc branches/cmake-bringup/dll/win32/wininet/wininet_De.rc branches/cmake-bringup/dll/win32/wininet/wininet_En.rc branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc branches/cmake-bringup/dll/win32/wininet/wininet_It.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc branches/cmake-bringup/dll/win32/wininet/wininet_No.rc branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Îáëàñò", -1, 40, 46, 50, 10 LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Çàïîìíè ïàðîëàòà (íåáåçîïàñíî)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "Plné jméno", -1, 40, 46, 50, 10 LTEXT "Uivatel", -1, 40, 66, 50, 10 LTEXT "Heslo", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Uloit toto heslo (nebezpeèné) ?", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Brugernavn", -1, 40, 66, 50, 10 LTEXT "Kodeord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gem dette kodeord (usikkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_De.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Bereich", -1, 40, 46, 50, 10 LTEXT "Ben&utzer", -1, 40, 66, 50, 10 LTEXT "Kenn&wort", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Bereich", -1, 40, 46, 50, 10 LTEXT "Benutzer", -1, 40, 66, 50, 10 LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_En.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "User", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, @@ -50,8 +50,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "User", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Dominio", -1, 40, 46, 50, 10 LTEXT "Usuario", -1, 40, 66, 50, 10 LTEXT "Contraseña", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta contraseña (inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Alue", -1, 40, 46, 50, 10 LTEXT "Käyttäjä", -1, 40, 66, 50, 10 LTEXT "Salasana", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Tallenna tämä salasana (epäturvallinen)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -39,8 +39,8 @@ LTEXT "Domaine", -1, 10, 50, 50, 10 LTEXT "Utilisateur", -1, 10, 71, 50, 10 LTEXT "Mot de passe", -1, 10, 90, 50, 10 - LTEXT "" IDC_PROXY, 58, 28, 150, 14, 0 - LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + LTEXT "", IDC_PROXY, 58, 28, 150, 14, 0 + LTEXT "", IDC_REALM, 58, 48, 150, 14, 0 EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, @@ -59,8 +59,8 @@ LTEXT "Domaine", -1, 10, 50, 50, 10 LTEXT "Utilisateur", -1, 10, 71, 50, 10 LTEXT "Mot de passe", -1, 10, 90, 50, 10 - LTEXT "" IDC_SERVER, 58, 28, 150, 14, 0 - LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + LTEXT "", IDC_SERVER, 58, 28, 150, 14, 0 + LTEXT "", IDC_REALM, 58, 48, 150, 14, 0 EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Csoport", -1, 40, 46, 50, 10 LTEXT "Felhasználó", -1, 40, 66, 50, 10 LTEXT "Jelszó", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_It.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Memorizza la password ( RISCHIOSO )", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Memorizza la password (RISCHIOSO)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "å°å", -1, 40, 46, 50, 10 LTEXT "ã¦ã¼ã¶å", -1, 40, 66, 50, 10 LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10 LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "¾ÏÈ£ ÀÔ·Â(&S)(ÁÖÀÇÇÏ½Ã¿À)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Sritis", -1, 40, 46, 50, 10 LTEXT "Naudotojas", -1, 40, 66, 50, 10 LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Sritis", -1, 40, 46, 50, 10 LTEXT "Naudotojas", -1, 40, 66, 50, 10 LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_No.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "OmrÃ¥de", -1, 40, 46, 50, 10 LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "OmrÃ¥de", -1, 40, 46, 50, 10 LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre pa&ssordet (sikkerhetsrisiko)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -31,8 +31,8 @@ LTEXT "Obszar", -1, 40, 46, 50, 10 LTEXT "U¿ytkonik", -1, 40, 66, 50, 10 LTEXT "Has³o", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Zapamiêtaj to has³o (nie bezpieczne)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -34,8 +34,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Salvar esta senha (inseguro)", IDC_SAVEPASSWORD, @@ -56,8 +56,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utilizador", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gravar esta senha (inseguro)", IDC_SAVEPASSWORD, @@ -76,8 +76,8 @@ LTEXT "Reino", -1, 40, 46, 50, 10 LTEXT "Utilizador", -1, 40, 66, 50, 10 LTEXT "Palavra-passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta palavra-passe (inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Domeniu", -1, 40, 46, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Domeniu", -1, 40, 46, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾)", IDC_SAVEPASSWORD, @@ -55,8 +55,8 @@ LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "PodroÄje", -1, 20, 46, 50, 10 LTEXT "UporabniÅ¡ko ime", -1, 20, 66, 55, 10 LTEXT "Geslo", -1, 20, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "PodroÄje", -1, 20, 46, 50, 10 LTEXT "UporabniÅ¡ko ime", -1, 20, 66, 55, 10 LTEXT "Geslo", -1, 20, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Domän", -1, 40, 46, 50, 10 LTEXT "Användarnamn", -1, 40, 66, 50, 10 LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Kullanýcý", -1, 40, 66, 50, 10 LTEXT "Parola", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Bu parolayý &sakla (güvensiz)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Îáëàñòü", -1, 40, 46, 50, 10 LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "ç¨æ·", -1, 40, 66, 50, 10 LTEXT "å¯ç ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, @@ -62,8 +62,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "ç¨æ¶", -1, 40, 66, 50, 10 LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD,

14 years, 2 months

[sir_richard] 48959: [NTOS]: Move all the Nt*Section API interfaces into ARM3 and rewrite most of the code to perform the same parameter validation and input checks as Windows does. Support all pro...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Oct 2 02:14:39 2010 New Revision: 48959 URL: http://svn.reactos.org/svn/reactos?rev=48959&view=rev Log: [NTOS]: Move all the Nt*Section API interfaces into ARM3 and rewrite most of the code to perform the same parameter validation and input checks as Windows does. Support all protection masks. Use correct section object access mask. Use appropriate SEH where needed. Pass 0-initialized local instead of NULL when needed. Don't assume certain parameters are OPTIONAL when they are not. Don't return SEH failures at the end of the system call, the kernel usually returns the result of the system call proper. Call DbgkMapViewOfSection in scenarios where it would not have gotten called before. Protect against certain kinds of kernel-mode access from user-mode. [NTOS]: Move unimplemented Mm*Section APIs into ARM3 as well. Added: trunk/reactos/ntoskrnl/mm/ARM3/section.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild 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] Sat Oct 2 02:14:39 2010 @@ -110,6 +110,7 @@ #define MM_NOCACHE 8 #define MM_DECOMMIT 0x10 #define MM_NOACCESS (MM_DECOMMIT | MM_NOCACHE) +#define MM_INVALID_PROTECTION 0xFFFFFFFF // // Specific PTE Definitions that map to the Memory Manager's Protection Mask Bits Added: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Oct 2 02:14:39 2010 @@ -1,0 +1,678 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/sectopm.c + * PURPOSE: ARM Memory Manager Section Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::SECTION" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +ACCESS_MASK MmMakeSectionAccess[8] = +{ + SECTION_MAP_READ, + SECTION_MAP_READ, + SECTION_MAP_EXECUTE, + SECTION_MAP_EXECUTE | SECTION_MAP_READ, + SECTION_MAP_WRITE, + SECTION_MAP_READ, + SECTION_MAP_EXECUTE | SECTION_MAP_WRITE, + SECTION_MAP_EXECUTE | SECTION_MAP_READ +}; + +CHAR MmUserProtectionToMask1[16] = +{ + 0, + MM_NOACCESS, + MM_READONLY, + (CHAR)MM_INVALID_PROTECTION, + MM_READWRITE, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + MM_WRITECOPY, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION +}; + +CHAR MmUserProtectionToMask2[16] = +{ + 0, + MM_EXECUTE, + MM_EXECUTE_READ, + (CHAR)MM_INVALID_PROTECTION, + MM_EXECUTE_READWRITE, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + MM_EXECUTE_WRITECOPY, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION, + (CHAR)MM_INVALID_PROTECTION +}; + +/* PRIVATE FUNCTIONS **********************************************************/ + +ULONG +NTAPI +MiMakeProtectionMask(IN ULONG Protect) +{ + ULONG Mask1, Mask2, ProtectMask; + + /* PAGE_EXECUTE_WRITECOMBINE is theoretically the maximum */ + if (Protect >= (PAGE_WRITECOMBINE * 2)) return MM_INVALID_PROTECTION; + + /* + * Windows API protection mask can be understood as two bitfields, differing + * by whether or not execute rights are being requested + */ + Mask1 = Protect & 0xF; + Mask2 = (Protect >> 4) & 0xF; + + /* Check which field is there */ + if (!Mask1) + { + /* Mask2 must be there, use it to determine the PTE protection */ + if (!Mask2) return MM_INVALID_PROTECTION; + ProtectMask = MmUserProtectionToMask2[Mask2]; + } + else + { + /* Mask2 should not be there, use Mask1 to determine the PTE mask */ + if (Mask2) return MM_INVALID_PROTECTION; + ProtectMask = MmUserProtectionToMask1[Mask1]; + } + + /* Make sure the final mask is a valid one */ + if (ProtectMask == MM_INVALID_PROTECTION) return MM_INVALID_PROTECTION; + + /* Check for PAGE_GUARD option */ + if (Protect & PAGE_GUARD) + { + /* It's not valid on no-access, nocache, or writecombine pages */ + if ((ProtectMask == MM_NOACCESS) || + (Protect & (PAGE_NOCACHE | PAGE_WRITECOMBINE))) + { + /* Fail such requests */ + return MM_INVALID_PROTECTION; + } + + /* This actually turns on guard page in this scenario! */ + ProtectMask |= MM_DECOMMIT; + } + + /* Check for nocache option */ + if (Protect & PAGE_NOCACHE) + { + /* The earlier check should've eliminated this possibility */ + ASSERT((Protect & PAGE_GUARD) == 0); + + /* Check for no-access page or write combine page */ + if ((ProtectMask == MM_NOACCESS) || (Protect & PAGE_WRITECOMBINE)) + { + /* Such a request is invalid */ + return MM_INVALID_PROTECTION; + } + + /* Add the PTE flag */ + ProtectMask |= MM_NOCACHE; + } + + /* Check for write combine option */ + if (Protect & PAGE_WRITECOMBINE) + { + /* The two earlier scenarios should've caught this */ + ASSERT((Protect & (PAGE_GUARD | PAGE_NOACCESS)) == 0); + + /* Don't allow on no-access pages */ + if (ProtectMask == MM_NOACCESS) return MM_INVALID_PROTECTION; + + /* This actually turns on write-combine in this scenario! */ + ProtectMask |= MM_NOACCESS; + } + + /* Return the final MM PTE protection mask */ + return ProtectMask; +} +/* SYSTEM CALLS ***************************************************************/ + +NTSTATUS +NTAPI +NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, + IN PVOID File2MappedAsFile) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtCreateSection(OUT PHANDLE SectionHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN PLARGE_INTEGER MaximumSize OPTIONAL, + IN ULONG SectionPageProtection OPTIONAL, + IN ULONG AllocationAttributes, + IN HANDLE FileHandle OPTIONAL) +{ + LARGE_INTEGER SafeMaximumSize; + PVOID SectionObject; + HANDLE Handle; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status; + PAGED_CODE(); + + /* Check for non-existing flags */ + if ((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | + SEC_LARGE_PAGES | SEC_IMAGE | SEC_NOCACHE | + SEC_NO_CHANGE))) + { + DPRINT1("Bogus allocation attribute: %lx\n", AllocationAttributes); + return STATUS_INVALID_PARAMETER_6; + } + + /* Check for no allocation type */ + if (!(AllocationAttributes & (SEC_COMMIT | SEC_RESERVE | SEC_IMAGE))) + { + DPRINT1("Missing allocation type in allocation attributes\n"); + return STATUS_INVALID_PARAMETER_6; + } + + /* Check for image allocation with invalid attributes */ + if ((AllocationAttributes & SEC_IMAGE) && + (AllocationAttributes & (SEC_COMMIT | SEC_RESERVE | SEC_LARGE_PAGES | + SEC_NOCACHE | SEC_NO_CHANGE))) + { + DPRINT1("Image allocation with invalid attributes\n"); + return STATUS_INVALID_PARAMETER_6; + } + + /* Check for allocation type is both commit and reserve */ + if ((AllocationAttributes & SEC_COMMIT) && (AllocationAttributes & SEC_RESERVE)) + { + DPRINT1("Commit and reserve in the same time\n"); + return STATUS_INVALID_PARAMETER_6; + } + + /* Now check for valid protection */ + if ((SectionPageProtection & PAGE_NOCACHE) || + (SectionPageProtection & PAGE_WRITECOMBINE) || + (SectionPageProtection & PAGE_GUARD) || + (SectionPageProtection & PAGE_NOACCESS)) + { + DPRINT1("Sections don't support these protections\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Use a maximum size of zero, if none was specified */ + SafeMaximumSize.QuadPart = 0; + + /* Check for user-mode caller */ + if (PreviousMode != KernelMode) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Safely check user-mode parameters */ + if (MaximumSize) SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); + MaximumSize = &SafeMaximumSize; + ProbeForWriteHandle(SectionHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else if (!MaximumSize) MaximumSize = &SafeMaximumSize; + + /* Create the section */ + Status = MmCreateSection(&SectionObject, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileHandle, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* FIXME: Should zero last page for a file mapping */ + + /* Now insert the object */ + Status = ObInsertObject(SectionObject, + NULL, + DesiredAccess, + 0, + NULL, + &Handle); + if (NT_SUCCESS(Status)) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Return the handle safely */ + *SectionHandle = Handle; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Nothing here */ + } + _SEH2_END; + } + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI +NtOpenSection(OUT PHANDLE SectionHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + HANDLE Handle; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Check for user-mode caller */ + if (PreviousMode != KernelMode) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Safely check user-mode parameters */ + ProbeForWriteHandle(SectionHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* Try opening the object */ + Status = ObOpenObjectByName(ObjectAttributes, + MmSectionObjectType, + PreviousMode, + NULL, + DesiredAccess, + NULL, + &Handle); + + /* Enter SEH */ + _SEH2_TRY + { + /* Return the handle safely */ + *SectionHandle = Handle; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Nothing here */ + } + _SEH2_END; + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI +NtMapViewOfSection(IN HANDLE SectionHandle, + IN HANDLE ProcessHandle, + IN OUT PVOID* BaseAddress, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PSIZE_T ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect) +{ + PVOID SafeBaseAddress; + LARGE_INTEGER SafeSectionOffset; + SIZE_T SafeViewSize; + PROS_SECTION_OBJECT Section; + PEPROCESS Process; + NTSTATUS Status; + ACCESS_MASK DesiredAccess; + ULONG ProtectionMask; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + /* Check for invalid zero bits */ + if (ZeroBits > 21) // per-arch? + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Check for invalid inherit disposition */ + if ((InheritDisposition > ViewUnmap) || (InheritDisposition < ViewShare)) + { + DPRINT1("Invalid inherit disposition\n"); + return STATUS_INVALID_PARAMETER_8; + } + + /* Allow only valid allocation types */ + if ((AllocationType & ~(MEM_TOP_DOWN | MEM_LARGE_PAGES | MEM_DOS_LIM | + SEC_NO_CHANGE | MEM_RESERVE))) + { + DPRINT1("Invalid allocation type\n"); + return STATUS_INVALID_PARAMETER_9; + } + + /* Convert the protection mask, and validate it */ + ProtectionMask = MiMakeProtectionMask(Protect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid page protection\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Now convert the protection mask into desired section access mask */ + DesiredAccess = MmMakeSectionAccess[ProtectionMask & 0x7]; + + /* Assume no section offset */ + SafeSectionOffset.QuadPart = 0; + + /* Enter SEH */ + _SEH2_TRY + { + /* Check for unsafe parameters */ + if (PreviousMode != KernelMode) + { + /* Probe the parameters */ + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(ViewSize); + } + + /* Check if a section offset was given */ + if (SectionOffset) + { + /* Check for unsafe parameters and capture section offset */ + if (PreviousMode != KernelMode) ProbeForWriteLargeInteger(SectionOffset); + SafeSectionOffset = *SectionOffset; + } + + /* Capture the other parameters */ + SafeBaseAddress = *BaseAddress; + SafeViewSize = *ViewSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Check for kernel-mode address */ + if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS) + { + DPRINT1("Kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for range entering kernel-mode */ + if (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)SafeBaseAddress) < SafeViewSize) + { + DPRINT1("Overflowing into kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for invalid zero bits */ + if (((ULONG_PTR)SafeBaseAddress + SafeViewSize) > (0xFFFFFFFF >> ZeroBits)) // arch? + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Reference the section */ + Status = ObReferenceObjectByHandle(SectionHandle, + DesiredAccess, + MmSectionObjectType, + PreviousMode, + (PVOID*)&Section, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Process); + return Status; + } + + /* Now do the actual mapping */ + Status = MmMapViewOfSection(Section, + Process, + &SafeBaseAddress, + ZeroBits, + CommitSize, + &SafeSectionOffset, + &SafeViewSize, + InheritDisposition, + AllocationType, + Protect); + + /* Check if this is an image for the current process */ + if ((Section->AllocationAttributes & SEC_IMAGE) && + (Process == PsGetCurrentProcess()) && + ((Status != STATUS_IMAGE_NOT_AT_BASE) || + (Status != STATUS_CONFLICTING_ADDRESSES))) + { + /* Notify the debugger */ + DbgkMapViewOfSection(Section, + SafeBaseAddress, + SafeSectionOffset.LowPart, + SafeViewSize); + } + + /* Return data only on success */ + if (NT_SUCCESS(Status)) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Return parameters to user */ + *BaseAddress = SafeBaseAddress; + *ViewSize = SafeViewSize; + if (SectionOffset) *SectionOffset = SafeSectionOffset; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Nothing to do */ + } + _SEH2_END; + } + + /* Dereference all objects and return status */ + ObDereferenceObject(Section); + ObDereferenceObject(Process); + return Status; +} + +NTSTATUS +NTAPI +NtUnmapViewOfSection(IN HANDLE ProcessHandle, + IN PVOID BaseAddress) +{ + PEPROCESS Process; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + /* Don't allowing mapping kernel views */ + if ((PreviousMode == UserMode) && (BaseAddress > MM_HIGHEST_USER_ADDRESS)) + { + DPRINT1("Trying to unmap a kernel view\n"); + return STATUS_NOT_MAPPED_VIEW; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Unmap the view */ + Status = MmUnmapViewOfSection(Process, BaseAddress); + + /* Dereference the process and return status */ + ObDereferenceObject(Process); + return Status; +} + +NTSTATUS +NTAPI +NtExtendSection(IN HANDLE SectionHandle, + IN OUT PLARGE_INTEGER NewMaximumSize) +{ + LARGE_INTEGER SafeNewMaximumSize; + PROS_SECTION_OBJECT Section; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + /* Check for user-mode parameters */ + if (PreviousMode != KernelMode) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Probe and capture the maximum size, it's both read and write */ + ProbeForWriteLargeInteger(NewMaximumSize); + SafeNewMaximumSize = *NewMaximumSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* Just read the size directly */ + SafeNewMaximumSize = *NewMaximumSize; + } + + /* Reference the section */ + Status = ObReferenceObjectByHandle(SectionHandle, + SECTION_EXTEND_SIZE, + MmSectionObjectType, + PreviousMode, + (PVOID*)&Section, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Really this should go in MmExtendSection */ + if (!(Section->AllocationAttributes & SEC_FILE)) + { + DPRINT1("Not extending a file\n"); + ObDereferenceObject(Section); + return STATUS_SECTION_NOT_EXTENDED; + } + + /* FIXME: Do the work */ + + /* Dereference the section */ + ObDereferenceObject(Section); + + /* Enter SEH */ + _SEH2_TRY + { + /* Write back the new size */ + *NewMaximumSize = SafeNewMaximumSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Nothing to do */ + } + _SEH2_END; + + /* Return the status */ + return STATUS_NOT_IMPLEMENTED; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmDisableModifiedWriteOfSection(IN PSECTION_OBJECT_POINTERS SectionObjectPointer) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmForceSectionClosed(IN PSECTION_OBJECT_POINTERS SectionObjectPointer, + IN BOOLEAN DelayClose) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmMapViewInSessionSpace(IN PVOID Section, + OUT PVOID *MappedBase, + IN OUT PSIZE_T ViewSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmUnmapViewInSessionSpace(IN PVOID MappedBase) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/section.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 2 02:14:39 2010 @@ -3307,14 +3307,6 @@ ULONG FileAccess = 0; /* - * Specifying a maximum size is meaningless for an image section - */ - if (UMaximumSize != NULL) - { - return(STATUS_INVALID_PARAMETER_4); - } - - /* * Check file access required */ if (SectionPageProtection & PAGE_READWRITE || @@ -3470,132 +3462,7 @@ return(Status); } -/* - * @implemented - */ -NTSTATUS NTAPI -NtCreateSection (OUT PHANDLE SectionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN PLARGE_INTEGER MaximumSize OPTIONAL, - IN ULONG SectionPageProtection OPTIONAL, - IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL) -{ - LARGE_INTEGER SafeMaximumSize; - PVOID SectionObject; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH2_TRY - { - if (MaximumSize != NULL) - { - /* make a copy on the stack */ - SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); - MaximumSize = &SafeMaximumSize; - } - ProbeForWriteHandle(SectionHandle); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - Status = MmCreateSection(&SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes, - FileHandle, - NULL); - if (NT_SUCCESS(Status)) - { - Status = ObInsertObject ((PVOID)SectionObject, - NULL, - DesiredAccess, - 0, - NULL, - SectionHandle); - } - - return Status; -} - - -/********************************************************************** - * NAME - * NtOpenSection - * - * DESCRIPTION - * - * ARGUMENTS - * SectionHandle - * - * DesiredAccess - * - * ObjectAttributes - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS NTAPI -NtOpenSection(PHANDLE SectionHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - HANDLE hSection; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH2_TRY - { - ProbeForWriteHandle(SectionHandle); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - Status = ObOpenObjectByName(ObjectAttributes, - MmSectionObjectType, - PreviousMode, - NULL, - DesiredAccess, - NULL, - &hSection); - - if(NT_SUCCESS(Status)) - { - _SEH2_TRY - { - *SectionHandle = hSection; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - return(Status); -} + static NTSTATUS MmMapViewOfSegment(PMMSUPPORT AddressSpace, @@ -3642,233 +3509,6 @@ } -/********************************************************************** - * NAME EXPORTED - * NtMapViewOfSection - * - * DESCRIPTION - * Maps a view of a section into the virtual address space of a - * process. - * - * ARGUMENTS - * SectionHandle - * Handle of the section. - * - * ProcessHandle - * Handle of the process. - * - * BaseAddress - * Desired base address (or NULL) on entry; - * Actual base address of the view on exit. - * - * ZeroBits - * Number of high order address bits that must be zero. - * - * CommitSize - * Size in bytes of the initially committed section of - * the view. - * - * SectionOffset - * Offset in bytes from the beginning of the section - * to the beginning of the view. - * - * ViewSize - * Desired length of map (or zero to map all) on entry - * Actual length mapped on exit. - * - * InheritDisposition - * Specified how the view is to be shared with - * child processes. - * - * AllocateType - * Type of allocation for the pages. - * - * Protect - * Protection for the committed region of the view. - * - * RETURN VALUE - * Status. - * - * @implemented - */ -NTSTATUS NTAPI -NtMapViewOfSection(IN HANDLE SectionHandle, - IN HANDLE ProcessHandle, - IN OUT PVOID* BaseAddress OPTIONAL, - IN ULONG_PTR ZeroBits OPTIONAL, - IN SIZE_T CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PSIZE_T ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType OPTIONAL, - IN ULONG Protect) -{ - PVOID SafeBaseAddress; - LARGE_INTEGER SafeSectionOffset; - SIZE_T SafeViewSize; - PROS_SECTION_OBJECT Section; - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - ULONG tmpProtect; - ACCESS_MASK DesiredAccess; - - /* - * Check the protection - */ - if (Protect & ~PAGE_FLAGS_VALID_FROM_USER_MODE) - { - return STATUS_INVALID_PARAMETER_10; - } - - tmpProtect = Protect & ~(PAGE_GUARD|PAGE_NOCACHE); - if (tmpProtect != PAGE_NOACCESS && - tmpProtect != PAGE_READONLY && - tmpProtect != PAGE_READWRITE && - tmpProtect != PAGE_WRITECOPY && - tmpProtect != PAGE_EXECUTE && - tmpProtect != PAGE_EXECUTE_READ && - tmpProtect != PAGE_EXECUTE_READWRITE && - tmpProtect != PAGE_EXECUTE_WRITECOPY) - { - return STATUS_INVALID_PAGE_PROTECTION; - } - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - SafeBaseAddress = NULL; - SafeSectionOffset.QuadPart = 0; - SafeViewSize = 0; - - _SEH2_TRY - { - if(BaseAddress != NULL) - { - ProbeForWritePointer(BaseAddress); - SafeBaseAddress = *BaseAddress; - } - if(SectionOffset != NULL) - { - ProbeForWriteLargeInteger(SectionOffset); - SafeSectionOffset = *SectionOffset; - } - ProbeForWriteSize_t(ViewSize); - SafeViewSize = *ViewSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - SafeBaseAddress = (BaseAddress != NULL ? *BaseAddress : NULL); - SafeSectionOffset.QuadPart = (SectionOffset != NULL ? SectionOffset->QuadPart : 0); - SafeViewSize = (ViewSize != NULL ? *ViewSize : 0); - } - - SafeSectionOffset.LowPart = PAGE_ROUND_DOWN(SafeSectionOffset.LowPart); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)(PVOID)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* Convert NT Protection Attr to Access Mask */ - if (Protect == PAGE_READONLY) - { - DesiredAccess = SECTION_MAP_READ; - } - else if (Protect == PAGE_READWRITE) - { - DesiredAccess = SECTION_MAP_WRITE; - } - else if (Protect == PAGE_WRITECOPY) - { - DesiredAccess = SECTION_QUERY; - } - /* FIXME: Handle other Protection Attributes. For now keep previous behavior */ - else - { - DesiredAccess = SECTION_MAP_READ; - } - - Status = ObReferenceObjectByHandle(SectionHandle, - DesiredAccess, - MmSectionObjectType, - PreviousMode, - (PVOID*)(PVOID)&Section, - NULL); - if (!(NT_SUCCESS(Status))) - { - DPRINT("ObReference failed rc=%x\n",Status); - ObDereferenceObject(Process); - return(Status); - } - - Status = MmMapViewOfSection(Section, - (PEPROCESS)Process, - (BaseAddress != NULL ? &SafeBaseAddress : NULL), - ZeroBits, - CommitSize, - (SectionOffset != NULL ? &SafeSectionOffset : NULL), - (ViewSize != NULL ? &SafeViewSize : NULL), - InheritDisposition, - AllocationType, - Protect); - - /* Check if this is an image for the current process */ - if ((Section->AllocationAttributes & SEC_IMAGE) && - (Process == PsGetCurrentProcess()) && - (Status != STATUS_IMAGE_NOT_AT_BASE)) - { - /* Notify the debugger */ - DbgkMapViewOfSection(Section, - SafeBaseAddress, - SafeSectionOffset.LowPart, - SafeViewSize); - } - - ObDereferenceObject(Section); - ObDereferenceObject(Process); - - if(NT_SUCCESS(Status)) - { - /* copy parameters back to the caller */ - _SEH2_TRY - { - if(BaseAddress != NULL) - { - *BaseAddress = SafeBaseAddress; - } - if(SectionOffset != NULL) - { - *SectionOffset = SafeSectionOffset; - } - if(ViewSize != NULL) - { - *ViewSize = SafeViewSize; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - return(Status); -} static VOID MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, @@ -4156,54 +3796,7 @@ return(STATUS_SUCCESS); } -/********************************************************************** - * NAME EXPORTED - * NtUnmapViewOfSection - * - * DESCRIPTION - * - * ARGUMENTS - * ProcessHandle - * - * BaseAddress - * - * RETURN VALUE - * Status. - * - * REVISIONS - */ -NTSTATUS NTAPI -NtUnmapViewOfSection (HANDLE ProcessHandle, - PVOID BaseAddress) -{ - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - - DPRINT("NtUnmapViewOfSection(ProcessHandle %x, BaseAddress %x)\n", - ProcessHandle, BaseAddress); - - PreviousMode = ExGetPreviousMode(); - - DPRINT("Referencing process\n"); - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)(PVOID)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle failed (Status %x)\n", Status); - return(Status); - } - - Status = MmUnmapViewOfSection(Process, BaseAddress); - - ObDereferenceObject(Process); - - return Status; -} + /** @@ -4346,76 +3939,7 @@ } -/** - * Extends size of file backed section. - * - * @param SectionHandle - * Handle to the section object. It must be opened with - * SECTION_EXTEND_SIZE access. - * @param NewMaximumSize - * New maximum size of the section in bytes. - * - * @return Status. - * - * @todo Move the actual code to internal function MmExtendSection. - * @unimplemented - */ -NTSTATUS NTAPI -NtExtendSection(IN HANDLE SectionHandle, - IN PLARGE_INTEGER NewMaximumSize) -{ - LARGE_INTEGER SafeNewMaximumSize; - PROS_SECTION_OBJECT Section; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH2_TRY - { - /* make a copy on the stack */ - SafeNewMaximumSize = ProbeForReadLargeInteger(NewMaximumSize); - NewMaximumSize = &SafeNewMaximumSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - Status = ObReferenceObjectByHandle(SectionHandle, - SECTION_EXTEND_SIZE, - MmSectionObjectType, - PreviousMode, - (PVOID*)&Section, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (!(Section->AllocationAttributes & SEC_FILE)) - { - ObDereferenceObject(Section); - return STATUS_INVALID_PARAMETER; - } - - /* - * - Acquire file extneding resource. - * - Check if we're not resizing the section below it's actual size! - * - Extend segments if needed. - * - Set file information (FileAllocationInformation) to the new size. - * - Release file extending resource. - */ - - ObDereferenceObject(Section); - - return STATUS_NOT_IMPLEMENTED; -} + /********************************************************************** * NAME EXPORTED @@ -4704,15 +4228,7 @@ } -/* - * @unimplemented - */ -BOOLEAN NTAPI -MmDisableModifiedWriteOfSection (ULONG Unknown0) -{ - UNIMPLEMENTED; - return (FALSE); -} + /* * @implemented @@ -4736,19 +4252,6 @@ } return FALSE; } - -/* - * @unimplemented - */ -BOOLEAN NTAPI -MmForceSectionClosed ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN BOOLEAN DelayClose) -{ - UNIMPLEMENTED; - return (FALSE); -} - /* * @implemented @@ -4798,22 +4301,6 @@ } /* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMapViewInSessionSpace ( - IN PVOID Section, - OUT PVOID *MappedBase, - IN OUT PSIZE_T ViewSize - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* * @implemented */ NTSTATUS NTAPI @@ -4831,18 +4318,6 @@ return Status; } -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmUnmapViewInSessionSpace ( - IN PVOID MappedBase - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} /********************************************************************** * NAME EXPORTED @@ -4957,14 +4432,6 @@ AllocationAttributes)); } -NTSTATUS -NTAPI -NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, - IN PVOID File2MappedAsFile) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Oct 2 02:14:39 2010 @@ -459,6 +459,7 @@ <file>pfnlist.c</file> <file>pool.c</file> <file>procsup.c</file> + <file>section.c</file> <file>sysldr.c</file> <file>syspte.c</file> <file>vadnode.c</file>

14 years, 2 months

[sir_richard] 48958: [PSDK]: Add missing SEC_XXX definitions for Server 2003 (Vista ones still missing). [KERNEL32]: NtCreateSection should not be called with merely SEC_FILE: this says nothing abo...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Oct 2 01:12:53 2010 New Revision: 48958 URL: http://svn.reactos.org/svn/reactos?rev=48958&view=rev Log: [PSDK]: Add missing SEC_XXX definitions for Server 2003 (Vista ones still missing). [KERNEL32]: NtCreateSection should not be called with merely SEC_FILE: this says nothing about what kind of operation should be done (a commit, a reserve, etc?). Use SEC_COMMIT instead to specify correct operation. This works in ReactOS as of now, but would've failed after the NtSection* API rewrite. [KERNEL32]: CreateFileMappingW should also accept/allow SEC_LARGE_PAGES, even if we don't suppport it yet. Modified: trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Sat Oct 2 01:12:53 2010 @@ -87,7 +87,7 @@ DesiredAccess = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; /* Get the attributes for the actual allocation and cleanup flProtect */ - Attributes = flProtect & (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_NOCACHE | SEC_COMMIT); + Attributes = flProtect & (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_NOCACHE | SEC_COMMIT | SEC_LARGE_PAGES); flProtect ^= Attributes; /* If the caller didn't say anything, assume SEC_COMMIT */ Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Sat Oct 2 01:12:53 2010 @@ -282,7 +282,7 @@ &ObjectAttributes, NULL, PAGE_READONLY, - SEC_FILE, + SEC_COMMIT, FileHandle); /* HACK: Check if another process was faster Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 2 01:12:53 2010 @@ -1305,6 +1305,8 @@ #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 +#define SEC_WRITECOMBINE 0x40000000 +#define SEC_LARGE_PAGES 0x80000000 #define SECTION_EXTEND_SIZE 16 #define SECTION_MAP_READ 4 #define SECTION_MAP_WRITE 2

14 years, 2 months

[akhaldi] 48957: [CMAKE] - Add wlanapi, wldap32, ws2_32(_new) and drmk to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 1 21:52:15 2010 New Revision: 48957 URL: http://svn.reactos.org/svn/reactos?rev=48957&view=rev Log: [CMAKE] - Add wlanapi, wldap32, ws2_32(_new) and drmk to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/drm/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libws2help.a (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/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] Fri Oct 1 21:52:15 2010 @@ -209,11 +209,11 @@ #add_subdirectory(winspool) #add_subdirectory(winsta) #add_subdirectory(wintrust) -#add_subdirectory(wlanapi) -#add_subdirectory(wldap32) +add_subdirectory(wlanapi) +add_subdirectory(wldap32) #add_subdirectory(wmi) -#add_subdirectory(ws2_32) -#add_subdirectory(ws2_32_new) +add_subdirectory(ws2_32) +add_subdirectory(ws2_32_new) add_subdirectory(ws2help) add_subdirectory(wshirda) add_subdirectory(wshtcpip) Added: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,17 @@ + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +spec2def(wlanapi ${CMAKE_CURRENT_SOURCE_DIR}/wlanapi.spec ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def) + +add_library(wlanapi SHARED main.c) + +set_target_properties(wlanapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(wlanapi + ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def + wlansvc_client + wine + pseh) + +add_importlibs(wlanapi kernel32 rpcrt4 ntdll) +add_dependencies(wlanapi wlanapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,37 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(wldap32 ${CMAKE_CURRENT_SOURCE_DIR}/wldap32.spec ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) + +add_library(wldap32 SHARED + add.c + ber.c + bind.c + compare.c + control.c + delete.c + dn.c + error.c + extended.c + init.c + main.c + misc.c + modify.c + modrdn.c + option.c + page.c + parse.c + rename.c + search.c + value.c + wldap32.rc) + +set_module_type(wldap32 win32dll) + +target_link_libraries(wldap32 + ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def + wine) + +add_importlibs(wldap32 ntdll user32) +add_dependencies(wldap32 wldap32_def psdk) Propchange: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,35 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DLE) +add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) + +list(APPEND SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch + misc/bsd.c + misc/catalog.c + misc/dllmain.c + misc/event.c + misc/handle.c + misc/ns.c + misc/sndrcv.c + misc/stubs.c + misc/upcall.c + misc/async.c + ws2_32.rc) + +add_library(ws2_32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch ${SOURCE}) + +set_module_type(ws2_32 win32dll) + +target_link_libraries(ws2_32 + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def + wine) + +add_importlibs(ws2_32 ntdll user32 advapi32 dnsapi ws2help) +add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) +add_dependencies(ws2_32 ws2_32_def psdk) Propchange: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,55 @@ + +add_definitions(-DLE) + +include_directories(inc) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) + +spec2def(ws2_32_new ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def) + +add_library(ws2_32_new SHARED + src/addrconv.c + src/addrinfo.c + src/async.c + src/bhook.c + src/dcatalog.c + src/dcatitem.c + src/dllmain.c + src/dprocess.c + src/dprovide.c + src/dsocket.c + src/dthread.c + src/dupsock.c + src/enumprot.c + src/event.c + src/getproto.c + src/getxbyxx.c + src/ioctl.c + src/nscatalo.c + src/nscatent.c + src/nspinstl.c + src/nsprovid.c + src/nsquery.c + src/qos.c + src/qshelpr.c + src/rasdial.c + src/recv.c + src/rnr.c + src/scihlpr.c + src/select.c + src/send.c + src/sockctrl.c + src/socklife.c + src/spinstal.c + src/sputil.c + src/startup.c + src/wsautil.c + ws2_32.rc) + +set_module_type(ws2_32_new win32dll) + +target_link_libraries(ws2_32_new + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def + wine) + +add_importlibs(ws2_32_new ntdll user32 advapi32 dnsapi ws2help) +add_dependencies(ws2_32_new ws2_32_new_def psdk) Propchange: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,5 +1,6 @@ add_subdirectory(backpln) +add_subdirectory(drm) add_subdirectory(filters) add_subdirectory(legacy) add_subdirectory(sysaudio) Added: branches/cmake-bringup/drivers/wdm/audio/drm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/drm/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(drmk) Propchange: branches/cmake-bringup/drivers/wdm/audio/drm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:52:15 2010 @@ -1,0 +1,12 @@ + +add_definitions(-DBUILDING_DRMK) + +spec2def(drmk ${CMAKE_CURRENT_SOURCE_DIR}/drmk.spec ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) + +add_library(drmk SHARED stubs.cpp drmk.rc) + +set_target_properties(drmk PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(drmk ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) +add_importlibs(drmk ntoskrnl) +add_dependencies(drmk drmk_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libws2help.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libws2help.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 2 months

[akhaldi] 48956: [CMAKE] - Make static libs out of the idl files. - Improve wshirda, wshtcpip and wsock32. - Include bmfd into build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 1 21:33:07 2010 New Revision: 48956 URL: http://svn.reactos.org/svn/reactos?rev=48956&view=rev Log: [CMAKE] - Make static libs out of the idl files. - Improve wshirda, wshtcpip and wsock32. - Include bmfd into build. Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt branches/cmake-bringup/drivers/video/font/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:33:07 2010 @@ -1,3 +1,5 @@ + +add_definitions(-DUNICODE -D_UNICODE) spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:33:07 2010 @@ -1,15 +1,16 @@ +add_definitions(-DUNICODE -D_UNICODE) include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc) -set_module_type(wshtcpip win32dll) +set_target_properties(wshtcpip PROPERTIES LINK_FLAGS "-Wl,-entry,0") target_link_libraries(wshtcpip ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def tdilib) -add_importlibs(wshtcpip ntdll ws2_32) +add_importlibs(wshtcpip kernel32 ntdll ws2_32) add_dependencies(wshtcpip wshtcpip_def psdk) Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:33:07 2010 @@ -1,3 +1,5 @@ + +add_definitions(-DUNICODE -D_UNICODE) add_library(wsock32 SHARED stubs.c wsock32.rc) Modified: branches/cmake-bringup/drivers/video/font/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:33:07 2010 @@ -1,2 +1,3 @@ +add_subdirectory(bmfd) add_subdirectory(ftfd) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Fri Oct 1 21:33:07 2010 @@ -29,7 +29,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c PROPERTIES GENERATED TRUE ) - add_custom_target(${FILE}_server ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c @@ -40,7 +40,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c PROPERTIES GENERATED TRUE ) - add_custom_target(${FILE}_client ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) ENDFOREACH(_in_FILE ${ARGN})

14 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010