Author: akhaldi
Date: Sun Oct 18 17:10:38 2015
New Revision: 69605
URL: http://svn.reactos.org/svn/reactos?rev=69605&view=rev
Log:
[MSCONFIG_NEW] C++ is coming. Resistance is futile.
Modified:
trunk/reactos/base/applications/msconfig_new/CMakeLists.txt
Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Sun Oct 18 17:10:38 2015
@@ -1,11 +1,7 @@
PROJECT(msconfig_new)
-# Currently, C++ files are the exception in this project. Therefore we
-# manually set up only what's needed for C++ support. If the project
-# is converted to C++, then we'll need to use the general C++ set-up.
set_cpp(WITH_RUNTIME)
-set(IS_CPP 0) # Disable C++ for PCH
include_directories(
.
@@ -22,25 +18,16 @@
generalpage.c
msconfig.c
stringutils.c
- utils.c
- precomp.h)
+ utils.c)
list(APPEND CPP_SOURCE
toolspage.cpp
- xmldomparser.cpp)
+ xmldomparser.cpp
+ precomp.h)
add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico)
add_executable(msconfig_new ${C_SOURCE} ${CPP_SOURCE} msconfig.rc)
-
-# Retrieve the COMPILE_FLAGS property for the .cpp files only
-get_property(cpp_file1_flag SOURCE toolspage.cpp PROPERTY COMPILE_FLAGS)
-get_property(cpp_file2_flag SOURCE xmldomparser.cpp PROPERTY COMPILE_FLAGS)
-# Define PCH usage (see 'add_pch' macro code for more information)
-add_pch(msconfig_new precomp.h C_SOURCE)
-# Remove PCH usage for the .cpp files only (set the original COMPILE_FLAGS property)
-set_property(SOURCE toolspage.cpp PROPERTY COMPILE_FLAGS ${cpp_file1_flag})
-set_property(SOURCE xmldomparser.cpp PROPERTY COMPILE_FLAGS ${cpp_file2_flag})
-
+add_pch(msconfig_new precomp.h CPP_SOURCE)
set_module_type(msconfig_new win32gui UNICODE)
target_link_libraries(msconfig_new comsupp)
add_importlibs(msconfig_new user32 advapi32 version comctl32 ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32)
Author: pschweitzer
Date: Sun Oct 18 16:09:11 2015
New Revision: 69602
URL: http://svn.reactos.org/svn/reactos?rev=69602&view=rev
Log:
[NTOSKRNL]
Don't keep spining forever in CcRosFlushDirtyPages() when flushing a dirty VACB fails on a RO volume.
This can be triggered with extX volumes and can prevent shutdown from succeeding
Modified:
trunk/reactos/ntoskrnl/cc/view.c
Modified: trunk/reactos/ntoskrnl/cc/view.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=696…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Oct 18 16:09:11 2015
@@ -235,7 +235,8 @@
KeAcquireGuardedMutex(&ViewLock);
CcRosVacbDecRefCount(current);
- if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE))
+ if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE) &&
+ (Status != STATUS_MEDIA_WRITE_PROTECTED))
{
DPRINT1("CC: Failed to flush VACB.\n");
}
Author: ekohl
Date: Sun Oct 18 13:52:51 2015
New Revision: 69600
URL: http://svn.reactos.org/svn/reactos?rev=69600&view=rev
Log:
USETUP: Do not ask to select language if just one language is available
Patch by Carlo Bramini. Thanks a lot!
CORE-10322 #resolve
Modified:
trunk/reactos/base/setup/usetup/genlist.c
trunk/reactos/base/setup/usetup/genlist.h
trunk/reactos/base/setup/usetup/interface/usetup.c
Modified: trunk/reactos/base/setup/usetup/genlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.…
==============================================================================
--- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun Oct 18 13:52:51 2015
@@ -653,4 +653,17 @@
List->CurrentEntry = List->BackupEntry;
}
+
+BOOL
+GenericListHasSingleEntry(
+ PGENERIC_LIST List)
+{
+ if (!IsListEmpty(&List->ListHead) && List->ListHead.Flink == List->ListHead.Blink)
+ return TRUE;
+
+ /* if both list head pointers (which normally point to the first and last list member, respectively)
+ point to the same entry then it means that there's just a single thing in there, otherwise... false! */
+ return FALSE;
+}
+
/* EOF */
Modified: trunk/reactos/base/setup/usetup/genlist.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.…
==============================================================================
--- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sun Oct 18 13:52:51 2015
@@ -53,10 +53,6 @@
SHORT Top,
SHORT Right,
SHORT Bottom);
-
-VOID
-DrawScrollBarGenericLis(
- PGENERIC_LIST List);
VOID
ScrollDownGenericList(
@@ -121,4 +117,8 @@
PGENERIC_LIST List,
CHAR AsciChar);
+BOOL
+GenericListHasSingleEntry(
+ PGENERIC_LIST List);
+
/* EOF */
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Oct 18 13:52:51 2015
@@ -633,6 +633,12 @@
/* Load the font */
SelectedLanguageId = DefaultLanguage;
SetConsoleCodePage();
+ UpdateKBLayout();
+
+ /* If there's just a single language in the list skip
+ * the language selection process altogether! */
+ if (GenericListHasSingleEntry(LanguageList))
+ return INTRO_PAGE;
DrawGenericList(LanguageList,
2,