Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 67691: [NDK] Add FILE_READ_ONLY_VOLUME definition in NTOS_MODE_USER mode. [SHELL32] Remove the now unneeded FILE_READ_ONLY_VOLUME definition.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 12:51:50 2015 New Revision: 67691 URL: http://svn.reactos.org/svn/reactos?rev=67691&view=rev Log: [NDK] Add FILE_READ_ONLY_VOLUME definition in NTOS_MODE_USER mode. [SHELL32] Remove the now unneeded FILE_READ_ONLY_VOLUME definition. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue May 12 12:51:50 2015 @@ -13,9 +13,6 @@ */ #include "precomp.h" - -/* FIXME: ntifs.h */ -#define FILE_READ_ONLY_VOLUME 0x00080000 WINE_DEFAULT_DEBUG_CHANNEL(dmenu); Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Tue May 12 12:51:50 2015 @@ -50,6 +50,13 @@ // #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | 0x0001 +#endif + +#ifdef NTOS_MODE_USER + +/* File System Attributes Flags */ +#define FILE_READ_ONLY_VOLUME 0x00080000 + #endif //

1 0

[akhaldi] 67690: [CMAKE] Prevent CMake from doing importlib handling as we do that on our own.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 12:19:41 2015 New Revision: 67690 URL: http://svn.reactos.org/svn/reactos?rev=67690&view=rev Log: [CMAKE] Prevent CMake from doing importlib handling as we do that on our own. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67690&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 12:19:41 2015 @@ -67,6 +67,9 @@ if(MSVC_IDE) add_compile_flags("/MP") endif() + +# We don't need CMake importlib handling +unset(CMAKE_IMPORT_LIBRARY_SUFFIX) if(NOT CMAKE_CROSSCOMPILING)

1 0

[akhaldi] 67689: [CMAKE] The /SUBSYSTEM flag takes uppercase parameters.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 12:18:02 2015 New Revision: 67689 URL: http://svn.reactos.org/svn/reactos?rev=67689&view=rev Log: [CMAKE] The /SUBSYSTEM flag takes uppercase parameters. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67689… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 12 12:18:02 2015 @@ -210,10 +210,11 @@ endfunction() function(set_subsystem MODULE SUBSYSTEM) + string(TOUPPER ${SUBSYSTEM} _subsystem) if(ARCH STREQUAL "amd64") - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02") - else() - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.02") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.01") endif() endfunction()

1 0

[akhaldi] 67688: [CMAKE] Take into account the build type when referencing rsym.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 12:11:50 2015 New Revision: 67688 URL: http://svn.reactos.org/svn/reactos?rev=67688&view=rev Log: [CMAKE] Take into account the build type when referencing rsym. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=67688&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue May 12 12:11:50 2015 @@ -216,7 +216,8 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - get_target_property(RSYM native-rsym IMPORTED_LOCATION) + string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) + get_target_property(RSYM native-rsym IMPORTED_LOCATION_${_build_type}) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")

1 0

[akhaldi] 67687: [CMAKE] Update rsym location in the GCC build.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 11:40:07 2015 New Revision: 67687 URL: http://svn.reactos.org/svn/reactos?rev=67687&view=rev Log: [CMAKE] Update rsym location in the GCC build. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=67687&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue May 12 11:40:07 2015 @@ -216,7 +216,7 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) + get_target_property(RSYM native-rsym IMPORTED_LOCATION) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")

1 0

[akhaldi] 67686: [CMAKE] Set the /MP flag for MSVC_IDE globally.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 11:38:32 2015 New Revision: 67686 URL: http://svn.reactos.org/svn/reactos?rev=67686&view=rev Log: [CMAKE] Set the /MP flag for MSVC_IDE globally. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67686&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 11:38:32 2015 @@ -63,6 +63,10 @@ include(cmake/compilerflags.cmake) add_definitions(-D__REACTOS__) + +if(MSVC_IDE) + add_compile_flags("/MP") +endif() if(NOT CMAKE_CROSSCOMPILING) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67686… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 12 11:38:32 2015 @@ -82,11 +82,8 @@ add_compile_flags("/Ob2 /D NDEBUG") endif() -if(MSVC_IDE) - add_compile_flags("/MP") - if(NOT DEFINED USE_FOLDER_STRUCTURE) - set(USE_FOLDER_STRUCTURE FALSE) - endif() +if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE)) + set(USE_FOLDER_STRUCTURE FALSE) endif() if(NOT DEFINED RUNTIME_CHECKS)

1 0

[akhaldi] 67685: [CMAKE] Set "Debug" as the default build type globally.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 11:35:19 2015 New Revision: 67685 URL: http://svn.reactos.org/svn/reactos?rev=67685&view=rev Log: [CMAKE] Set "Debug" as the default build type globally. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67685&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 11:35:19 2015 @@ -46,6 +46,10 @@ # for more information. string(TOLOWER ${ARCH} ARCH) +# Default to Debug for the build type +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + # Compile options if(ARCH STREQUAL "i386") include(cmake/config.cmake) @@ -101,10 +105,6 @@ #useful stuff! include(CMakeParseArguments) - - # Default to Debug for the build type - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING -"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup file(REMOVE

1 0

[akhaldi] 67684: [GENINCDATA] Add missing psdk dependency.
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 11:32:51 2015 New Revision: 67684 URL: http://svn.reactos.org/svn/reactos?rev=67684&view=rev Log: [GENINCDATA] Add missing psdk dependency. Modified: trunk/reactos/include/asm/CMakeLists.txt Modified: trunk/reactos/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/CMakeLists.txt… ============================================================================== --- trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] Tue May 12 11:32:51 2015 @@ -2,7 +2,7 @@ add_library(genincdata SHARED genincdata.c) set_entrypoint(genincdata 0) -add_dependencies(genincdata bugcodes) +add_dependencies(genincdata bugcodes psdk) if(MSVC) set(OPT_MS "-ms")

1 0

[akhaldi] 67683: [SHELL32] Don't provide the format option when the volume is read only. By Barrett Karish. CORE-9530
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 10:57:24 2015 New Revision: 67683 URL: http://svn.reactos.org/svn/reactos?rev=67683&view=rev Log: [SHELL32] Don't provide the format option when the volume is read only. By Barrett Karish. CORE-9530 Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue May 12 10:57:24 2015 @@ -13,6 +13,9 @@ */ #include "precomp.h" + +/* FIXME: ntifs.h */ +#define FILE_READ_ONLY_VOLUME 0x00080000 WINE_DEFAULT_DEBUG_CHANNEL(dmenu); @@ -880,11 +883,20 @@ if (_ILIsDrive(m_apidl[0])) { - /* The 'Format' option must be always available, - * thus it is not registered as a static shell extension */ - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); - bAddSep = TRUE; + char szDrive[8] = {0}; + DWORD dwFlags; + + _ILGetDrive(m_apidl[0], szDrive, sizeof(szDrive)); + if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) + { + /* Disable format if read only */ + if (!(dwFlags & FILE_READ_ONLY_VOLUME)) + { + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + bAddSep = TRUE; + } + } } BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM));

1 0

[akhaldi] 67682: [LIVECD] Rename "Audiorecorder" shortcut to "Sound Recorder". By Jared Smudde. CORE-9687
by akhaldi＠svn.reactos.org 12 May '15

12 May '15

Author: akhaldi Date: Tue May 12 10:46:26 2015 New Revision: 67682 URL: http://svn.reactos.org/svn/reactos?rev=67682&view=rev Log: [LIVECD] Rename "Audiorecorder" shortcut to "Sound Recorder". By Jared Smudde. CORE-9687 Modified: trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Tue May 12 10:46:26 2015 @@ -58,7 +58,7 @@ add_livecd_shortcut("Notepad" notepad.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Remote desktop" mstsc.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("WordPad" wordpad.exe "Profiles/All Users/Start Menu/Programs/Accessories") -add_livecd_shortcut("Audiorecorder" sndrec32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") +add_livecd_shortcut("Sound Recorder" sndrec32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") add_livecd_shortcut("Multimedia Player" mplay32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") add_livecd_shortcut("Volume Control" sndvol32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") add_livecd_shortcut("Solitaire" sol.exe "Profiles/All Users/Start Menu/Programs/Games")

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs