Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69031: [NTOS:MM] - Use MmExpansionLock to synchronize changes to MmProcessList. Should fix random crashes in MmDeleteProcessAddressSpace. CORE-10111 #resolve
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 14:39:40 2015 New Revision: 69031 URL: http://svn.reactos.org/svn/reactos?rev=69031&view=rev Log: [NTOS:MM] - Use MmExpansionLock to synchronize changes to MmProcessList. Should fix random crashes in MmDeleteProcessAddressSpace. CORE-10111 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -634,6 +634,8 @@ extern ULONG_PTR MmSubsectionBase; extern LARGE_INTEGER MmCriticalSectionTimeout; extern LIST_ENTRY MmWorkingSetExpansionHead; +extern KSPIN_LOCK MmExpansionLock; +extern PETHREAD MiExpansionLockOwner; FORCEINLINE BOOLEAN @@ -1328,6 +1330,29 @@ /* Reacquire unsafely */ MiLockProcessWorkingSetUnsafe(Process, Thread); } +} + +FORCEINLINE +KIRQL +MiAcquireExpansionLock(VOID) +{ + KIRQL OldIrql; + + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + KeAcquireSpinLock(&MmExpansionLock, &OldIrql); + ASSERT(MiExpansionLockOwner == NULL); + MiExpansionLockOwner = PsGetCurrentThread(); + return OldIrql; +} + +FORCEINLINE +VOID +MiReleaseExpansionLock(KIRQL OldIrql) +{ + ASSERT(MiExpansionLockOwner == PsGetCurrentThread()); + MiExpansionLockOwner = NULL; + KeReleaseSpinLock(&MmExpansionLock, OldIrql); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -1178,7 +1178,9 @@ Pfn1->PteAddress = (PMMPTE)PDE_BASE; /* Insert us into the Mm process list */ + OldIrql = MiAcquireExpansionLock(); InsertTailList(&MmProcessList, &Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); /* Get a PTE to map the page directory */ PointerPte = MiReserveSystemPtes(1, SystemPteSpace); Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -34,29 +34,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ - -FORCEINLINE -KIRQL -MiAcquireExpansionLock(VOID) -{ - KIRQL OldIrql; - - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - KeAcquireSpinLock(&MmExpansionLock, &OldIrql); - ASSERT(MiExpansionLockOwner == NULL); - MiExpansionLockOwner = PsGetCurrentThread(); - return OldIrql; -} - -FORCEINLINE -VOID -MiReleaseExpansionLock(KIRQL OldIrql) -{ - ASSERT(MiExpansionLockOwner == PsGetCurrentThread()); - MiExpansionLockOwner = NULL; - KeReleaseSpinLock(&MmExpansionLock, OldIrql); - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); -} VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -575,13 +575,16 @@ NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) { + KIRQL OldIrql; PVOID Address; DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, Process->ImageFileName); #ifndef _M_AMD64 + OldIrql = MiAcquireExpansionLock(); RemoveEntryList(&Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); #endif MmLockAddressSpace(&Process->Vm);

1 0

[akhaldi] 69030: [GDI32] Get back the condition we had before.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 14:39:27 2015 New Revision: 69030 URL: http://svn.reactos.org/svn/reactos?rev=69030&view=rev Log: [GDI32] Get back the condition we had before. Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Sat Sep 5 14:39:27 2015 @@ -519,7 +519,8 @@ DbgRaiseAssertionFailure(); } -#if (_MSC_VER < 1900) && (DBG != 1) +#if defined(_MSC_VER) && (DBG != 1) + /* MSVC uses its own in this case. */ #else

1 0

[akhaldi] 69029: [CMAKE] Set Debug as the default build type for MSVC builds.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 14:38:50 2015 New Revision: 69029 URL: http://svn.reactos.org/svn/reactos?rev=69029&view=rev Log: [CMAKE] Set Debug as the default build type for MSVC builds. Modified: trunk/reactos/toolchain-msvc.cmake Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=6… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Sat Sep 5 14:38:50 2015 @@ -1,6 +1,12 @@ if(NOT ARCH) set(ARCH i386) +endif() + +# Default to Debug for the build type +if(NOT DEFINED CMAKE_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.") endif() # the name of the target operating system

1 0

[akhaldi] 69028: [MESA] Fix mesa_swrast VS 2015 build.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 14:32:44 2015 New Revision: 69028 URL: http://svn.reactos.org/svn/reactos?rev=69028&view=rev Log: [MESA] Fix mesa_swrast VS 2015 build. Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Sat Sep 5 14:32:44 2015 @@ -31,7 +31,7 @@ add_pch(mesa_swrast precomp.h SOURCE) if(MSVC) - add_target_compile_flags(mesa_swrast "/wd4189") + replace_compile_flags("/we4189" " ") else() add_target_compile_flags(mesa_swrast "-Wno-unused-variable") endif()

1 0

[akhaldi] 69027: [LIBXML2] Actually, the VS build has the /wd4189 flag before /we4189 rendering it useless. Use another approach to silencing it.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 14:29:27 2015 New Revision: 69027 URL: http://svn.reactos.org/svn/reactos?rev=69027&view=rev Log: [LIBXML2] Actually, the VS build has the /wd4189 flag before /we4189 rendering it useless. Use another approach to silencing it. Removed: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/uri.c Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Sat Sep 5 14:29:27 2015 @@ -68,7 +68,7 @@ add_dependencies(libxml2 psdk) if(MSVC) - add_target_compile_flags(libxml2 "/wd4189") + replace_compile_flags("/we4189" " ") else() add_target_compile_flags(libxml2 "-w") endif() Removed: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff (removed) @@ -1,14 +0,0 @@ -Index: uri.c -=================================================================== ---- uri.c (revision 69017) -+++ uri.c (working copy) -@@ -2389,7 +2389,9 @@ - */ - #if defined(_WIN32) && !defined(__CYGWIN__) - int len = 0; -+#ifndef __REACTOS__ - int i = 0; -+#endif - xmlChar *p = NULL; - #endif - xmlURIPtr uri; Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] Sat Sep 5 14:29:27 2015 @@ -2389,9 +2389,7 @@ */ #if defined(_WIN32) && !defined(__CYGWIN__) int len = 0; -#ifndef __REACTOS__ int i = 0; -#endif xmlChar *p = NULL; #endif xmlURIPtr uri;

1 0

[akhaldi] 69026: [LIBXML2] Fix VS 2015 build.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 14:14:35 2015 New Revision: 69026 URL: http://svn.reactos.org/svn/reactos?rev=69026&view=rev Log: [LIBXML2] Fix VS 2015 build. Added: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff (with props) Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c Added: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff (added) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff [iso-8859-1] Sat Sep 5 14:14:35 2015 @@ -0,0 +1,14 @@ +Index: uri.c +=================================================================== +--- uri.c (revision 69017) ++++ uri.c (working copy) +@@ -2389,7 +2389,9 @@ + */ + #if defined(_WIN32) && !defined(__CYGWIN__) + int len = 0; ++#ifndef __REACTOS__ + int i = 0; ++#endif + xmlChar *p = NULL; + #endif + xmlURIPtr uri; Propchange: trunk/reactos/lib/3rdparty/libxml2/libxml2_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] Sat Sep 5 14:14:35 2015 @@ -2389,7 +2389,9 @@ */ #if defined(_WIN32) && !defined(__CYGWIN__) int len = 0; +#ifndef __REACTOS__ int i = 0; +#endif xmlChar *p = NULL; #endif xmlURIPtr uri;

1 0

[tfaber] 69025: [ACPI] - Arch, don't shut down the system on IRP_MN_QUERY_POWER! CORE-10110
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 13:24:30 2015 New Revision: 69025 URL: http://svn.reactos.org/svn/reactos?rev=69025&view=rev Log: [ACPI] - Arch, don't shut down the system on IRP_MN_QUERY_POWER! CORE-10110 Modified: trunk/reactos/drivers/bus/acpi/power.c Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Sat Sep 5 13:24:30 2015 @@ -70,7 +70,6 @@ ((powerType == SystemPowerState) ? \ DbgSystemPowerString(powerState.SystemState) :\ DbgDevicePowerString(powerState.DeviceState))); - } if (powerType == SystemPowerState) { @@ -105,6 +104,7 @@ status = STATUS_UNSUCCESSFUL; } } + } PoStartNextPowerIrp (Irp); IoSkipCurrentIrpStackLocation(Irp); status = PoCallDriver (Data->NextLowerDriver, Irp);

1 0

[hbelusca] 69024: [MSCONFIG_NEW] - Associate a temporary VS project (will be removed later on); change the name of the target for now... - Allow only one instance of MSConfig running on the system ...
by hbelusca＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: hbelusca Date: Sat Sep 5 13:03:04 2015 New Revision: 69024 URL: http://svn.reactos.org/svn/reactos?rev=69024&view=rev Log: [MSCONFIG_NEW] - Associate a temporary VS project (will be removed later on); change the name of the target for now... - Allow only one instance of MSConfig running on the system (we use a semaphore, compatible with MS' msconfig, so that if you try to run ROS msconfig on windows, you cannot run also windows' msconfig, and vice versa). - Introduce some utility functions (for strings and other stuff), will be used later on. CORE-9333 Added: trunk/reactos/base/applications/msconfig_new/stringutils.c (with props) trunk/reactos/base/applications/msconfig_new/stringutils.h (with props) trunk/reactos/base/applications/msconfig_new/utils.c (with props) trunk/reactos/base/applications/msconfig_new/utils.h (with props) Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc trunk/reactos/base/applications/msconfig_new/lang/en-US.rc trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/precomp.h trunk/reactos/base/applications/msconfig_new/resource.h 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] Sat Sep 5 13:03:04 2015 @@ -1,3 +1,5 @@ + +PROJECT(msconfig_new) list(APPEND SOURCE toolspage.c @@ -7,11 +9,13 @@ freeldrpage.c generalpage.c msconfig.c + stringutils.c + utils.c precomp.h) add_rc_deps(msconfig.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/msconfig.ico) -add_executable(msconfig ${SOURCE} msconfig.rc) -set_module_type(msconfig win32gui UNICODE) -add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) -add_pch(msconfig precomp.h SOURCE) -add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all) +add_executable(msconfig_new ${SOURCE} msconfig.rc) +set_module_type(msconfig_new win32gui UNICODE) +add_importlibs(msconfig_new user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) +add_pch(msconfig_new precomp.h SOURCE) +add_cd_file(TARGET msconfig_new DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°" + IDS_MSCONFIG "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ÐÐ±ÑÐ¸" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Programa de configuracio de sistema" + IDS_MSCONFIG "Programa de configuracio de sistema" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -129,7 +129,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "NÃ¡stroj pro konfiguraci systÃ©mu" + IDS_MSCONFIG "NÃ¡stroj pro konfiguraci systÃ©mu" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ObecnÃ©" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Systemkonfiguration" + IDS_MSCONFIG "Systemkonfiguration" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Allgemein" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Î ÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎ±ÏÎ±Î¼ÎµÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï" + IDS_MSCONFIG "Î ÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎ±ÏÎ±Î¼ÎµÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ÎÎµÎ½Î¹ÎºÎ¬" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/en-US.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "System configuration program" + IDS_MSCONFIG "System configuration program" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -126,7 +126,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Utilidad de configuraciÃ³n del sistema" + IDS_MSCONFIG "Utilidad de configuraciÃ³n del sistema" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Utilitaire de configuration systÃ¨me" + IDS_MSCONFIG "Utilitaire de configuration systÃ¨me" + IDS_MSCONFIG_2 "Configuration du systÃ¨me" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "GÃ©nÃ©ral" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "××× ×©××¨××ª ××§×××¢×ª ×ª×¦××¨×ª ×××¢×¨××ª" + IDS_MSCONFIG "××× ×©××¨××ª ××§×××¢×ª ×ª×¦××¨×ª ×××¢×¨××ª" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "××××" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "RendszerkonfigurÃ¡ciÃ¼s segÃ©dprogram" + IDS_MSCONFIG "RendszerkonfigurÃ¡ciÃ¼s segÃ©dprogram" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ÃltalÃ¡nos" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Program konfigurasi sistem" + IDS_MSCONFIG "Program konfigurasi sistem" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Umum" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "UtilitÃ di configurazione del sistema" + IDS_MSCONFIG "UtilitÃ di configurazione del sistema" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Generale" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "System ì¤ì íë¡ê·¸ë¨" + IDS_MSCONFIG "System ì¤ì íë¡ê·¸ë¨" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ì¼ë°" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie" + IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Algemeen" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -123,7 +123,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Systemkonfigurasjon" + IDS_MSCONFIG "Systemkonfigurasjon" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Generelt" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -131,7 +131,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Program konfiguracji systemu" + IDS_MSCONFIG "Program konfiguracji systemu" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "OgÃ³lne" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Programa de configuraÃ§Ã£o do sistema" + IDS_MSCONFIG "Programa de configuraÃ§Ã£o do sistema" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Geral" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Configuratorul de sistem" + IDS_MSCONFIG "Configuratorul de sistem" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Generale" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ÐÐ±ÑÐ¸Ðµ" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -127,7 +127,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Program na konfigurÃ¡ciu systÃ©mu" + IDS_MSCONFIG "Program na konfigurÃ¡ciu systÃ©mu" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "VÅ¡eobecnÃ©" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -127,7 +127,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Programi i konfigurimit te sistemit" + IDS_MSCONFIG "Programi i konfigurimit te sistemit" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -130,7 +130,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Systemkonfiguration" + IDS_MSCONFIG "Systemkonfiguration" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "Generellt" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "à¹à¸à¸£à¹à¸à¸£à¸¡à¹à¸à¸£à¸à¹à¸à¸à¸£à¸°à¸à¸" + IDS_MSCONFIG "à¹à¸à¸£à¹à¸à¸£à¸¡à¹à¸à¸£à¸à¹à¸à¸à¸£à¸°à¸à¸" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "à¸à¸±à¹à¸§à¹à¸" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "Dizge YapÄ±landÄ±rma Ä°zlencesi" + IDS_MSCONFIG "Dizge YapÄ±landÄ±rma Ä°zlencesi" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "UmÃ»mÃ®" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -131,7 +131,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸" + IDS_MSCONFIG "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ÐÐ°Ð³Ð°Ð»ÑÐ½Ñ" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ç³»ç»éç½®å®ç¨ç¨åº" + IDS_MSCONFIG "ç³»ç»éç½®å®ç¨ç¨åº" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ä¸è¬" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -125,7 +125,12 @@ STRINGTABLE BEGIN - IDS_MSCONFIG "ç³»çµ±è¨å®" + IDS_MSCONFIG "ç³»çµ±è¨å®" + IDS_MSCONFIG_2 "System Configuration" +END + +STRINGTABLE +BEGIN IDS_TAB_GENERAL "ä¸è¬" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -8,6 +8,7 @@ */ #include "precomp.h" +#include "utils.h" #include "toolspage.h" #include "srvpage.h" @@ -16,9 +17,24 @@ #include "systempage.h" #include "generalpage.h" -HINSTANCE hInst = 0; - +/* Allow only for a single instance of MSConfig */ +#ifdef _MSC_VER + #pragma data_seg("MSConfigInstance") + HWND hSingleWnd = NULL; + #pragma data_seg() + #pragma comment(linker, "/SECTION:MSConfigInstance,RWS") +#else + HWND hSingleWnd __attribute__((section ("MSConfigInstance"), shared)) = NULL; +#endif + +/* Defaults for ReactOS */ +BOOL bIsWindows = FALSE; +BOOL bIsOSVersionLessThanVista = TRUE; + +HINSTANCE hInst = NULL; +LPWSTR szAppName = NULL; HWND hMainWnd; /* Main Window */ + HWND hTabWnd; /* Tab Control Window */ UINT uXIcon = 0, uYIcon = 0; /* Icon sizes */ HICON hDialogIcon = NULL; @@ -32,7 +48,7 @@ // // -// Copied from uxtheme.h +// Copied from uxtheme.h // If you have this new header, then delete these and // #include <uxtheme.h> instead! // @@ -45,7 +61,7 @@ typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); // -// Try to call EnableThemeDialogTexture, if uxtheme.dll is present +// Try to call EnableThemeDialogTexture, if uxtheme.dll is present // BOOL EnableDialogTheme(HWND hwnd) { @@ -300,26 +316,95 @@ return 0; } + +BOOL Initialize(HINSTANCE hInstance) +{ + BOOL Success = TRUE; + LPWSTR lpszVistaAppName = NULL; + HANDLE hSemaphore; + INITCOMMONCONTROLSEX InitControls; + + /* Initialize our global version flags */ + bIsWindows = TRUE; /* IsWindowsOS(); */ // TODO: Commented for testing purposes... + bIsOSVersionLessThanVista = TRUE; /* IsOSVersionLessThanVista(); */ // TODO: Commented for testing purposes... + + /* Initialize global strings */ + szAppName = LoadResourceString(hInstance, IDS_MSCONFIG); + if (!bIsOSVersionLessThanVista) + lpszVistaAppName = LoadResourceString(hInstance, IDS_MSCONFIG_2); + + /* We use a semaphore in order to have a single-instance application */ + hSemaphore = CreateSemaphoreW(NULL, 0, 1, L"MSConfigRunning"); + if (!hSemaphore || GetLastError() == ERROR_ALREADY_EXISTS) + { + CloseHandle(hSemaphore); + + /* + * A semaphore with the same name already exist. It should have been + * created by another instance of MSConfig. Try to find its window + * and bring it to front. + */ + if ( (hSingleWnd && IsWindow(hSingleWnd)) || + ( (hSingleWnd = FindWindowW(L"#32770", szAppName)) != NULL ) || + (!bIsOSVersionLessThanVista ? ( (hSingleWnd = FindWindowW(L"#32770", lpszVistaAppName)) != NULL ) : FALSE) ) + { + /* Found it. Show the window. */ + ShowWindow(hSingleWnd, SW_SHOWNORMAL); + SetForegroundWindow(hSingleWnd); + } + + /* Quit this instance of MSConfig */ + Success = FALSE; + } + if (!bIsOSVersionLessThanVista) MemFree(lpszVistaAppName); + + /* Quit now if we failed */ + if (!Success) + { + MemFree(szAppName); + return FALSE; + } + + /* Initialize the common controls */ + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_TREEVIEW_CLASSES | ICC_UPDOWN_CLASS /* | ICC_PROGRESS_CLASS | ICC_HOTKEY_CLASS*/; + InitCommonControlsEx(&InitControls); + + hInst = hInstance; + + return Success; +} + +VOID Cleanup(VOID) +{ + MemFree(szAppName); + + // // Close the sentry semaphore. + // CloseHandle(hSemaphore); +} + int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { - - INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow); - InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; - InitCommonControlsEx(&InitControls); - - hInst = hInstance; - - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); - + /* + * Initialize this instance of MSConfig. Quit if we have + * another instance already running. + */ + if (!Initialize(hInstance)) + return -1; + + // hInst = hInstance; + + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + + /* Finish cleanup and return */ + Cleanup(); return 0; } Modified: trunk/reactos/base/applications/msconfig_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/precomp.h [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -1,7 +1,16 @@ #ifndef _MSCONFIG_PCH_ #define _MSCONFIG_PCH_ +// NOTE: It is completely idiotic to need those defines defined +// for having the *_s string functions. In the MS CRT they are +// directly available without further tricks. +#define MINGW_HAS_SECURE_API 1 + #include <stdarg.h> + +#include <stdio.h> +#include <string.h> // FIXME: Should be normally useless in a proper CRT... +#include <tchar.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -10,9 +19,11 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <winreg.h> -#include <tchar.h> -#include <stdio.h> +#include <winuser.h> +#include <winver.h> + #include <shlobj.h> #include <strsafe.h> Modified: trunk/reactos/base/applications/msconfig_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -111,6 +111,7 @@ #define IDS_SERVICES_YES 2202 #define IDS_SERVICES_UNKNOWN 2203 -#define IDS_MSCONFIG 3000 +#define IDS_MSCONFIG 3000 +#define IDS_MSCONFIG_2 3001 -#define IDI_APPICON 3001 +#define IDI_APPICON 3010 Added: trunk/reactos/base/applications/msconfig_new/stringutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/stringutils.c (added) +++ trunk/reactos/base/applications/msconfig_new/stringutils.c [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -0,0 +1,238 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig/stringutils.c + * PURPOSE: ANSI & UNICODE String Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" +#include "utils.h" +#include "stringutils.h" + +// +// String formatting +// +LPTSTR FormatStringV(LPCTSTR str, va_list args) +{ + LPTSTR lpszString = NULL; + + if (str) + { + size_t strLenPlusNull = _vsctprintf(str, args) + 1; + lpszString = (LPTSTR)MemAlloc(0, strLenPlusNull * sizeof(TCHAR)); + if (lpszString) + StringCchVPrintf(lpszString, strLenPlusNull, str, args); + } + + return lpszString; +} + +LPTSTR FormatString(LPCTSTR str, ...) +{ + LPTSTR lpszString; + va_list args; + + va_start(args, str); + lpszString = FormatStringV(str, args); + va_end(args); + + return lpszString; +} + +// +// String handling (ANSI <-> Unicode UTF16) +// +LPSTR UnicodeToAnsi(LPCWSTR strW) +{ + LPSTR strA = NULL; + + if (strW) + { + int iNeededChars = WideCharToMultiByte(CP_ACP, + WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, + strW, -1, NULL, 0, NULL, NULL); + + strA = (LPSTR)MemAlloc(0, iNeededChars * sizeof(CHAR)); + if (strA) + { + WideCharToMultiByte(CP_ACP, + WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, + strW, -1, strA, iNeededChars, NULL, NULL); + } + } + + return strA; +} + +LPWSTR AnsiToUnicode(LPCSTR strA) +{ + LPWSTR strW = NULL; + + if (strA) + { + int iNeededChars = MultiByteToWideChar(CP_ACP, + MB_PRECOMPOSED, + strA, -1, NULL, 0); + + strW = (LPWSTR)MemAlloc(0, iNeededChars * sizeof(WCHAR)); + if (strW) + { + MultiByteToWideChar(CP_ACP, + MB_PRECOMPOSED, + strA, -1, strW, iNeededChars); + } + } + + return strW; +} + +LPSTR DuplicateStringA(LPCSTR str) +{ + LPSTR dupStr = NULL; + + if (str) + { + size_t strSizePlusNull = strlen(str) + 1; + + dupStr = (LPSTR)MemAlloc(0, strSizePlusNull * sizeof(CHAR)); + if (dupStr) + StringCchCopyA(dupStr, strSizePlusNull, str); + } + + return dupStr; +} + +LPWSTR DuplicateStringW(LPCWSTR str) +{ + LPWSTR dupStr = NULL; + + if (str) + { + size_t strSizePlusNull = wcslen(str) + 1; + + dupStr = (LPWSTR)MemAlloc(0, strSizePlusNull * sizeof(WCHAR)); + if (dupStr) + StringCchCopyW(dupStr, strSizePlusNull, str); + } + + return dupStr; +} + +LPSTR DuplicateStringAEx(LPCSTR str, size_t numOfChars) +{ + LPSTR dupStr = NULL; + + if (str) + { + size_t strSize = min(strlen(str), numOfChars); + + dupStr = (LPSTR)MemAlloc(0, (strSize + 1) * sizeof(CHAR)); + if (dupStr) + { + StringCchCopyNA(dupStr, strSize + 1, str, strSize); + dupStr[strSize] = '\0'; + } + } + + return dupStr; +} + +LPWSTR DuplicateStringWEx(LPCWSTR str, size_t numOfChars) +{ + LPWSTR dupStr = NULL; + + if (str) + { + size_t strSize = min(wcslen(str), numOfChars); + + dupStr = (LPWSTR)MemAlloc(0, (strSize + 1) * sizeof(WCHAR)); + if (dupStr) + { + StringCchCopyNW(dupStr, strSize + 1, str, strSize); + dupStr[strSize] = L'\0'; + } + } + + return dupStr; +} + +// +// String search functions +// +/*** +*wchar_t *wcsstr(string1, string2) - search for string2 in string1 +* (wide strings) +* +*Purpose: +* finds the first occurrence of string2 in string1 (wide strings) +* +*Entry: +* wchar_t *string1 - string to search in +* wchar_t *string2 - string to search for +* +*Exit: +* returns a pointer to the first occurrence of string2 in +* string1, or NULL if string2 does not occur in string1 +* +*Uses: +* +*Exceptions: +* +*******************************************************************************/ +LPTSTR FindSubStrI(LPCTSTR str, LPCTSTR strSearch) +{ + LPTSTR cp = (LPTSTR)str; + LPTSTR s1, s2; + + if (!*strSearch) + return (LPTSTR)str; + + while (*cp) + { + s1 = cp; + s2 = (LPTSTR)strSearch; + + while (*s1 && *s2 && (_totupper(*s1) == _totupper(*s2))) + ++s1, ++s2; + + if (!*s2) + return cp; + + ++cp; + } + + return NULL; +} + +/************************************************************************* + * AppendPathSeparator + * + * Append a backslash ('\') to a path if one doesn't exist. + * + * PARAMS + * lpszPath [I/O] The path to append a backslash to. + * + * RETURNS + * Success: The position of the last backslash in the path. + * Failure: NULL, if lpszPath is NULL or the path is too large. + */ +LPTSTR AppendPathSeparator(LPTSTR lpszPath) +{ + size_t iLen = 0; + + if (!lpszPath || (iLen = _tcslen(lpszPath)) >= MAX_PATH) + return NULL; + + if (iLen >= 1) + { + lpszPath += iLen - 1; + if (*lpszPath++ != _T('\\')) + { + *lpszPath++ = _T('\\'); + *lpszPath = _T('\0'); + } + } + + return lpszPath; +} Propchange: trunk/reactos/base/applications/msconfig_new/stringutils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/stringutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/stringutils.h (added) +++ trunk/reactos/base/applications/msconfig_new/stringutils.h [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig/stringutils.h + * PURPOSE: ANSI & UNICODE String Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef __STRINGUTILS_H__ +#define __STRINGUTILS_H__ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +// +// String formatting +// +LPTSTR FormatStringV(LPCTSTR str, va_list args); +LPTSTR FormatString(LPCTSTR str, ...); + +// +// String handling (ANSI <-> Unicode UTF16) +// +LPSTR UnicodeToAnsi(LPCWSTR strW); +LPWSTR AnsiToUnicode(LPCSTR strA); +LPSTR DuplicateStringA(LPCSTR str); +LPWSTR DuplicateStringW(LPCWSTR str); +LPSTR DuplicateStringAEx(LPCSTR str, size_t numOfChars); +LPWSTR DuplicateStringWEx(LPCWSTR str, size_t numOfChars); + +// +// Conversion macros ANSI <-> Unicode +// +#ifdef UNICODE + #define NewAnsiString(x) UnicodeToAnsi(x) + #define NewPortableString(x) AnsiToUnicode(x) + #define DuplicateString(x) DuplicateStringW(x) + #define DuplicateStringEx(x, y) DuplicateStringWEx((x), (y)) +#else + #define NewAnsiString(x) DuplicateStringA(x) + #define NewPortableString(x) DuplicateString(x) + #define DuplicateString(x) DuplicateStringA(x) + #define DuplicateStringEx(x, y) DuplicateStringAEx((x), (y)) +#endif + +// +// String search functions +// +#define FindSubStr(str, strSearch) _tcsstr((str), (strSearch)) +LPTSTR FindSubStrI(LPCTSTR str, LPCTSTR strSearch); + +LPTSTR AppendPathSeparator(LPTSTR lpszPath); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __STRINGUTILS_H__ + +/* EOF */ Propchange: trunk/reactos/base/applications/msconfig_new/stringutils.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.c (added) +++ trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -0,0 +1,177 @@ +#include "precomp.h" +#include "utils.h" +#include "stringutils.h" + +// HANDLE g_hHeap = GetProcessHeap(); +#define g_hHeap GetProcessHeap() + +#if 0 +VOID +MemInit(IN HANDLE Heap) +{ + /* Save the heap handle */ + g_hHeap = Heap; +} +#endif + +BOOL +MemFree(IN PVOID lpMem) +{ + /* Free memory back into the heap */ + return HeapFree(g_hHeap, 0, lpMem); +} + +PVOID +MemAlloc(IN DWORD dwFlags, + IN DWORD dwBytes) +{ + /* Allocate memory from the heap */ + return HeapAlloc(g_hHeap, dwFlags, dwBytes); +} + +LPWSTR +FormatDateTime(IN LPSYSTEMTIME pDateTime) +{ + LPWSTR lpszDateTime = NULL; + + if (pDateTime) + { + int iDateBufSize = 0, iTimeBufSize = 0; + + iDateBufSize = GetDateFormatW(LOCALE_USER_DEFAULT, + /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, + pDateTime, + NULL, + NULL, + 0); + iTimeBufSize = GetTimeFormatW(LOCALE_USER_DEFAULT, + 0, + pDateTime, + NULL, + NULL, + 0); + + if ( (iDateBufSize > 0) && (iTimeBufSize > 0) ) + { + lpszDateTime = (LPWSTR)MemAlloc(0, (iDateBufSize + iTimeBufSize) * sizeof(TCHAR)); + + GetDateFormatW(LOCALE_USER_DEFAULT, + /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, + pDateTime, + NULL, + lpszDateTime, + iDateBufSize); + if (iDateBufSize > 0) lpszDateTime[iDateBufSize-1] = L' '; + GetTimeFormatW(LOCALE_USER_DEFAULT, + 0, + pDateTime, + NULL, + lpszDateTime + iDateBufSize, + iTimeBufSize); + } + } + + return lpszDateTime; +} + +VOID +FreeDateTime(IN LPWSTR lpszDateTime) +{ + if (lpszDateTime) + MemFree(lpszDateTime); +} + +LPWSTR +LoadResourceStringEx(IN HINSTANCE hInstance, + IN UINT uID, + OUT size_t* pSize OPTIONAL) +{ + LPWSTR lpszDestBuf = NULL, lpszResourceString = NULL; + size_t iStrSize = 0; + + // When passing a zero-length buffer size, LoadString(...) returns a + // read-only pointer buffer to the program's resource string. + iStrSize = LoadString(hInstance, uID, (LPTSTR)&lpszResourceString, 0); + + if ( lpszResourceString && ( (lpszDestBuf = (LPWSTR)MemAlloc(0, (iStrSize + 1) * sizeof(WCHAR))) != NULL ) ) + { + _tcsncpy(lpszDestBuf, lpszResourceString, iStrSize); + lpszDestBuf[iStrSize] = L'\0'; // NULL-terminate the string + + if (pSize) + *pSize = iStrSize + 1; + } + else + { + if (pSize) + *pSize = 0; + } + + return lpszDestBuf; +} + +LPWSTR +LoadConditionalResourceStringEx(IN HINSTANCE hInstance, + IN BOOL bCondition, + IN UINT uIDifTrue, + IN UINT uIDifFalse, + IN size_t* pSize OPTIONAL) +{ + return LoadResourceStringEx(hInstance, + (bCondition ? uIDifTrue : uIDifFalse), + pSize); +} + +LPWSTR +GetExecutableVendor(IN LPCWSTR lpszFilename) +{ + LPWSTR lpszVendor = NULL; + DWORD dwHandle = 0; + DWORD dwLen; + + LPVOID lpData; + + LPVOID pvData = NULL; + UINT BufLen = 0; + WORD wCodePage = 0, wLangID = 0; + LPTSTR lpszStrFileInfo = NULL; + + LPWSTR lpszData = NULL; + + if (lpszFilename == NULL) return NULL; + + dwLen = GetFileVersionInfoSizeW(lpszFilename, &dwHandle); + if (dwLen == 0) return NULL; + + lpData = MemAlloc(0, dwLen); + if (!lpData) return NULL; + + GetFileVersionInfoW(lpszFilename, dwHandle, dwLen, lpData); + + if (VerQueryValueW(lpData, L"\\VarFileInfo\\Translation", &pvData, &BufLen)) + { + wCodePage = LOWORD(*(DWORD*)pvData); + wLangID = HIWORD(*(DWORD*)pvData); + + lpszStrFileInfo = FormatString(L"StringFileInfo\\%04X%04X\\CompanyName", + wCodePage, + wLangID); + } + + VerQueryValueW(lpData, lpszStrFileInfo, (LPVOID*)&lpszData, &BufLen); + if (lpszData) + { + lpszVendor = (LPWSTR)MemAlloc(0, BufLen * sizeof(WCHAR)); + if (lpszVendor) + wcscpy(lpszVendor, lpszData); + } + else + { + lpszVendor = NULL; + } + + MemFree(lpszStrFileInfo); + MemFree(lpData); + + return lpszVendor; +} Propchange: trunk/reactos/base/applications/msconfig_new/utils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.h (added) +++ trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] Sat Sep 5 13:03:04 2015 @@ -0,0 +1,55 @@ +#ifndef __UTILS_H__ +#define __UTILS_H__ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#if 0 +VOID +MemInit(IN HANDLE Heap); +#endif + +BOOL +MemFree(IN PVOID lpMem); + +PVOID +MemAlloc(IN DWORD dwFlags, + IN DWORD dwBytes); + +LPWSTR +FormatDateTime(IN LPSYSTEMTIME pDateTime); + +VOID +FreeDateTime(IN LPWSTR lpszDateTime); + +LPWSTR +LoadResourceStringEx(IN HINSTANCE hInstance, + IN UINT uID, + OUT size_t* pSize OPTIONAL); + +LPWSTR +LoadConditionalResourceStringEx(IN HINSTANCE hInstance, + IN BOOL bCondition, + IN UINT uIDifTrue, + IN UINT uIDifFalse, + IN size_t* pSize OPTIONAL); + +#define LoadResourceString(hInst, uID) \ + LoadResourceStringEx((hInst), (uID), NULL) + +#define LoadConditionalResourceString(hInst, bCond, uIDifT, uIDifF) \ + LoadConditionalResourceStringEx((hInst), (bCond), (uIDifT), (uIDifF), NULL) + +LPWSTR +GetExecutableVendor(IN LPCWSTR lpszFilename); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __UTILS_H__ + +/* EOF */ Propchange: trunk/reactos/base/applications/msconfig_new/utils.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 69023: [NTOS] - Addendum to r69022
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 11:53:04 2015 New Revision: 69023 URL: http://svn.reactos.org/svn/reactos?rev=69023&view=rev Log: [NTOS] - Addendum to r69022 Modified: trunk/reactos/ntoskrnl/ntos.cmake Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Sat Sep 5 11:53:04 2015 @@ -244,11 +244,11 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/po/poshtdwn.c ${REACTOS_SOURCE_DIR}/ntoskrnl/po/povolume.c ${REACTOS_SOURCE_DIR}/ntoskrnl/po/power.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/apphelp.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/debug.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/job.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/kill.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/process.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/apphelp.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psmgr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psnotify.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/query.c

1 0

[tfaber] 69022: [NTOS:PS] - Implement NtApphelpCacheControl. Patch by Mark Jansen CORE-9914 #resolve
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 11:49:54 2015 New Revision: 69022 URL: http://svn.reactos.org/svn/reactos?rev=69022&view=rev Log: [NTOS:PS] - Implement NtApphelpCacheControl. Patch by Mark Jansen CORE-9914 #resolve Added: trunk/reactos/ntoskrnl/ps/apphelp.c (with props) trunk/rostests/apitests/ntdll/NtApphelpCacheControl.c (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ntos.cmake trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -1280,6 +1280,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" +# This is an empty app compat cache +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatCache","AppCompatCache", 0x00000001, \ + fe,0f,dc,ba,00,00,00,00 ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -411,6 +411,18 @@ BOOLEAN NTAPI PspIsProcessExiting(IN PEPROCESS Process); + +// +// Apphelp functions +// +NTSTATUS +NTAPI +INIT_FUNCTION +ApphelpCacheInitialize(VOID); + +VOID +NTAPI +ApphelpCacheShutdown(VOID); // // Global data inside the Process Manager Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -531,6 +531,9 @@ /* Initialize PnP manager */ IopInitializePlugPlayServices(); + /* Initialize SHIM engine */ + ApphelpCacheInitialize(); + /* Initialize WMI */ WmiInitialize(); Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -248,6 +248,7 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/job.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/kill.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/process.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/apphelp.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psmgr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/psnotify.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -266,6 +266,9 @@ /* First, the HAL handles any "end of boot" special functionality */ DPRINT("HAL shutting down\n"); HalEndOfBoot(); + + /* Shut down the Shim cache if enabled */ + ApphelpCacheShutdown(); /* In this step, the I/O manager does first-chance shutdown notification */ DPRINT("I/O manager shutting down in phase 0\n"); Added: trunk/reactos/ntoskrnl/ps/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/apphelp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/apphelp.c (added) +++ trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -0,0 +1,739 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ps/apphelp.c + * PURPOSE: SHIM engine caching. + * This caching speeds up checks for the apphelp compatibility layer. + * PROGRAMMERS: Mark Jansen + */ + +/* +Useful references: +https://github.com/mandiant/ShimCacheParser/blob/master/ShimCacheParser.py +http://technet.microsoft.com/en-us/library/dd837644(v=ws.10).aspx +http://msdn.microsoft.com/en-us/library/bb432182(v=vs.85).aspx +http://www.alex-ionescu.com/?p=43 +http://recxltd.blogspot.nl/2012/04/windows-appcompat-research-notes-part-1.html +http://journeyintoir.blogspot.ch/2013/12/revealing-recentfilecachebcf-file.html +https://dl.mandiant.com/EE/library/Whitepaper_ShimCacheParser.pdf +*/ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +static BOOLEAN ApphelpCacheEnabled = FALSE; +static ERESOURCE ApphelpCacheLock; +static RTL_AVL_TABLE ApphelpShimCache; +static LIST_ENTRY ApphelpShimCacheAge; + +extern ULONG InitSafeBootMode; + +static UNICODE_STRING AppCompatCacheKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\AppCompatCache"); +static OBJECT_ATTRIBUTES AppCompatKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&AppCompatCacheKey, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE); +static UNICODE_STRING AppCompatCacheValue = RTL_CONSTANT_STRING(L"AppCompatCache"); + +#define EMPTY_SHIM_ENTRY { { 0 }, { { 0 } }, 0 } +#define MAX_SHIM_ENTRIES 0x200 +#define TAG_SHIM 'MIHS' + +#ifndef INVALID_HANDLE_VALUE +#define INVALID_HANDLE_VALUE (HANDLE)(-1) +#endif + +#include <pshpack1.h> + +typedef struct SHIM_PERSISTENT_CACHE_HEADER_52 +{ + ULONG Magic; + ULONG NumEntries; +} SHIM_PERSISTENT_CACHE_HEADER_52, *PSHIM_PERSISTENT_CACHE_HEADER_52; + +/* The data that is present in the registry (Win2k3 version) */ +typedef struct SHIM_PERSISTENT_CACHE_ENTRY_52 +{ + UNICODE_STRING ImageName; + LARGE_INTEGER DateTime; + LARGE_INTEGER FileSize; +} SHIM_PERSISTENT_CACHE_ENTRY_52, *PSHIM_PERSISTENT_CACHE_ENTRY_52; + +#include <poppack.h> + +#define CACHE_MAGIC_NT_52 0xbadc0ffe +#define CACHE_HEADER_SIZE_NT_52 0x8 +#define NT52_PERSISTENT_ENTRY_SIZE32 0x18 +#define NT52_PERSISTENT_ENTRY_SIZE64 0x20 + +//#define CACHE_MAGIC_NT_61 0xbadc0fee +//#define CACHE_HEADER_SIZE_NT_61 0x80 +//#define NT61_PERSISTENT_ENTRY_SIZE32 0x20 +//#define NT61_PERSISTENT_ENTRY_SIZE64 0x30 + +#define SHIM_CACHE_MAGIC CACHE_MAGIC_NT_52 +#define SHIM_CACHE_HEADER_SIZE CACHE_HEADER_SIZE_NT_52 +#ifdef _WIN64 +#define SHIM_PERSISTENT_CACHE_ENTRY_SIZE NT52_PERSISTENT_ENTRY_SIZE64 +#else +#define SHIM_PERSISTENT_CACHE_ENTRY_SIZE NT52_PERSISTENT_ENTRY_SIZE32 +#endif +#define SHIM_PERSISTENT_CACHE_HEADER SHIM_PERSISTENT_CACHE_HEADER_52 +#define PSHIM_PERSISTENT_CACHE_HEADER PSHIM_PERSISTENT_CACHE_HEADER_52 +#define SHIM_PERSISTENT_CACHE_ENTRY SHIM_PERSISTENT_CACHE_ENTRY_52 +#define PSHIM_PERSISTENT_CACHE_ENTRY PSHIM_PERSISTENT_CACHE_ENTRY_52 + +C_ASSERT(sizeof(SHIM_PERSISTENT_CACHE_ENTRY) == SHIM_PERSISTENT_CACHE_ENTRY_SIZE); +C_ASSERT(sizeof(SHIM_PERSISTENT_CACHE_HEADER) == SHIM_CACHE_HEADER_SIZE); + +/* The struct we keep in memory */ +typedef struct SHIM_CACHE_ENTRY +{ + LIST_ENTRY List; + SHIM_PERSISTENT_CACHE_ENTRY Persistent; + ULONG CompatFlags; +} SHIM_CACHE_ENTRY, *PSHIM_CACHE_ENTRY; + +/* PRIVATE FUNCTIONS *********************************************************/ + +PVOID +ApphelpAlloc( + _In_ ULONG ByteSize) +{ + return ExAllocatePoolWithTag(PagedPool, ByteSize, TAG_SHIM); +} + +VOID +ApphelpFree( + _In_ PVOID Data) +{ + ExFreePoolWithTag(Data, TAG_SHIM); +} + +VOID +ApphelpCacheAcquireLock(VOID) +{ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&ApphelpCacheLock, TRUE); +} + +BOOLEAN +ApphelpCacheTryAcquireLock(VOID) +{ + KeEnterCriticalRegion(); + if (!ExTryToAcquireResourceExclusiveLite(&ApphelpCacheLock)) + { + KeLeaveCriticalRegion(); + return FALSE; + } + return TRUE; +} + +VOID +ApphelpCacheReleaseLock(VOID) +{ + ExReleaseResourceLite(&ApphelpCacheLock); + KeLeaveCriticalRegion(); +} + +VOID +ApphelpDuplicateUnicodeString( + _Out_ PUNICODE_STRING Destination, + _In_ PCUNICODE_STRING Source) +{ + Destination->Length = Source->Length; + if (Destination->Length) + { + Destination->MaximumLength = Destination->Length + sizeof(WCHAR); + Destination->Buffer = ApphelpAlloc(Destination->MaximumLength); + RtlCopyMemory(Destination->Buffer, Source->Buffer, Destination->Length); + Destination->Buffer[Destination->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + else + { + Destination->MaximumLength = 0; + Destination->Buffer = NULL; + } +} + +VOID +ApphelpFreeUnicodeString( + _Inout_ PUNICODE_STRING String) +{ + if (String->Buffer) + { + ApphelpFree(String->Buffer); + } + String->Length = 0; + String->MaximumLength = 0; + String->Buffer = NULL; +} + +/* Query file info from a handle, storing it in Entry */ +NTSTATUS +ApphelpCacheQueryInfo( + _In_ HANDLE ImageHandle, + _Out_ PSHIM_CACHE_ENTRY Entry) +{ + IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileBasic; + FILE_STANDARD_INFORMATION FileStandard; + NTSTATUS Status; + + Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, + &FileBasic, sizeof(FileBasic), FileBasicInformation); + if (NT_SUCCESS(Status)) + { + Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, + &FileStandard, sizeof(FileStandard), FileStandardInformation); + if (NT_SUCCESS(Status)) + { + Entry->Persistent.DateTime = FileBasic.LastWriteTime; + Entry->Persistent.FileSize = FileStandard.EndOfFile; + } + } + return Status; +} + +RTL_GENERIC_COMPARE_RESULTS +NTAPI +ApphelpShimCacheCompareRoutine( + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID FirstStruct, + _In_ PVOID SecondStruct) +{ + LONG lResult = RtlCompareUnicodeString( + &((PSHIM_CACHE_ENTRY)FirstStruct)->Persistent.ImageName, + &((PSHIM_CACHE_ENTRY)SecondStruct)->Persistent.ImageName, TRUE); + + if (lResult < 0) + return GenericLessThan; + else if (lResult == 0) + return GenericEqual; + return GenericGreaterThan; +} + +PVOID +NTAPI +ApphelpShimCacheAllocateRoutine( + _In_ PRTL_AVL_TABLE Table, + _In_ CLONG ByteSize) +{ + return ApphelpAlloc(ByteSize); +} + +VOID +NTAPI +ApphelpShimCacheFreeRoutine( + _In_ PRTL_AVL_TABLE Table, + _In_ PVOID Buffer) +{ + ApphelpFree(Buffer); +} + +NTSTATUS +ApphelpCacheParse( + _In_reads_(DataLength) PUCHAR Data, + _In_ ULONG DataLength) +{ + PSHIM_PERSISTENT_CACHE_HEADER Header = (PSHIM_PERSISTENT_CACHE_HEADER)Data; + + if (DataLength < CACHE_HEADER_SIZE_NT_52) + { + DPRINT1("SHIMS: ApphelpCacheParse not enough data for a minimal header (0x%x)\n", DataLength); + return STATUS_INVALID_PARAMETER; + } + if (Header->Magic == SHIM_CACHE_MAGIC) + { + ULONG Cur; + ULONG NumEntries = Header->NumEntries; + DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); + for (Cur = 0; Cur < NumEntries; ++Cur) + { + UNICODE_STRING String; + SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Result; + PSHIM_PERSISTENT_CACHE_ENTRY pPersistent = + (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + + (Cur * SHIM_PERSISTENT_CACHE_ENTRY_SIZE)); + /* The entry in the Persitent storage is not really a UNICODE_STRING, + so we have to convert the offset into a real pointer before using it. */ + String.Length = pPersistent->ImageName.Length; + String.MaximumLength = pPersistent->ImageName.MaximumLength; + String.Buffer = (PWCHAR)((ULONG_PTR)pPersistent->ImageName.Buffer + Data); + + /* Now we copy all data to a local buffer, that can be safely duplicated by RtlInsert */ + Entry.Persistent = *pPersistent; + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, &String); + Result = RtlInsertElementGenericTableAvl(&ApphelpShimCache, &Entry, sizeof(Entry), NULL); + if (!Result) + { + DPRINT1("SHIMS: ApphelpCacheParse insert failed\n"); + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + return STATUS_INVALID_PARAMETER; + } + InsertTailList(&ApphelpShimCacheAge, &Result->List); + } + return STATUS_SUCCESS; + } + DPRINT1("SHIMS: ApphelpCacheParse found invalid magic (0x%x)\n", Header->Magic); + return STATUS_INVALID_PARAMETER; +} + +BOOLEAN +ApphelpCacheRead(VOID) +{ + HANDLE KeyHandle; + NTSTATUS Status; + KEY_VALUE_PARTIAL_INFORMATION KeyValueObject; + PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation = &KeyValueObject; + ULONG KeyInfoSize, ResultSize; + + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("SHIMS: ApphelpCacheRead could not even open Session Manager\\AppCompatCache (0x%x)\n", Status); + return FALSE; + } + + Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, + KeyValuePartialInformation, KeyValueInformation, + sizeof(KeyValueObject), &ResultSize); + + if (Status == STATUS_BUFFER_OVERFLOW) + { + KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + KeyValueInformation->DataLength; + KeyValueInformation = ApphelpAlloc(KeyInfoSize); + if (KeyValueInformation != NULL) + { + Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, + KeyValuePartialInformation, KeyValueInformation, + KeyInfoSize, &ResultSize); + } + } + + if (NT_SUCCESS(Status) && KeyValueInformation->Type == REG_BINARY) + { + Status = ApphelpCacheParse(KeyValueInformation->Data, + KeyValueInformation->DataLength); + } + else + { + DPRINT1("SHIMS: ApphelpCacheRead not loaded from registry (0x%x)\n", Status); + } + + if (KeyValueInformation != &KeyValueObject && KeyValueInformation != NULL) + ApphelpFree(KeyValueInformation); + + ZwClose(KeyHandle); + return NT_SUCCESS(Status); +} + +BOOLEAN +ApphelpCacheWrite(VOID) +{ + ULONG Length = SHIM_CACHE_HEADER_SIZE; + ULONG NumEntries = 0; + PLIST_ENTRY ListEntry; + PUCHAR Buffer, BufferNamePos; + PSHIM_PERSISTENT_CACHE_HEADER Header; + PSHIM_PERSISTENT_CACHE_ENTRY WriteEntry; + HANDLE KeyHandle; + NTSTATUS Status; + + /* First we have to calculate the required size. */ + ApphelpCacheAcquireLock(); + ListEntry = ApphelpShimCacheAge.Flink; + while (ListEntry != &ApphelpShimCacheAge) + { + PSHIM_CACHE_ENTRY Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); + Length += SHIM_PERSISTENT_CACHE_ENTRY_SIZE; + Length += Entry->Persistent.ImageName.MaximumLength; + ++NumEntries; + ListEntry = ListEntry->Flink; + } + DPRINT1("SHIMS: ApphelpCacheWrite, %d Entries, total size: %d\n", NumEntries, Length); + Length = ROUND_UP(Length, sizeof(ULONGLONG)); + DPRINT1("SHIMS: ApphelpCacheWrite, Rounded to: %d\n", Length); + + /* Now we allocate and prepare some helpers */ + Buffer = ApphelpAlloc(Length); + BufferNamePos = Buffer + Length; + Header = (PSHIM_PERSISTENT_CACHE_HEADER)Buffer; + WriteEntry = (PSHIM_PERSISTENT_CACHE_ENTRY)(Buffer + SHIM_CACHE_HEADER_SIZE); + + Header->Magic = SHIM_CACHE_MAGIC; + Header->NumEntries = NumEntries; + + ListEntry = ApphelpShimCacheAge.Flink; + while (ListEntry != &ApphelpShimCacheAge) + { + PSHIM_CACHE_ENTRY Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); + USHORT ImageNameLen = Entry->Persistent.ImageName.MaximumLength; + /* Copy the Persistent structure over */ + *WriteEntry = Entry->Persistent; + BufferNamePos -= ImageNameLen; + /* Copy the image name over */ + RtlCopyMemory(BufferNamePos, Entry->Persistent.ImageName.Buffer, ImageNameLen); + /* Fix the Persistent structure, so that Buffer is once again an offset */ + WriteEntry->ImageName.Buffer = (PWCH)(BufferNamePos - Buffer); + + ++WriteEntry; + ListEntry = ListEntry->Flink; + } + ApphelpCacheReleaseLock(); + + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &AppCompatKeyAttributes); + if (NT_SUCCESS(Status)) + { + Status = ZwSetValueKey(KeyHandle, &AppCompatCacheValue, 0, REG_BINARY, Buffer, Length); + ZwClose(KeyHandle); + } + else + { + DPRINT1("SHIMS: ApphelpCacheWrite could not even open Session Manager\\AppCompatCache (0x%x)\n", Status); + } + + ApphelpFree(Buffer); + return NT_SUCCESS(Status); +} + + +NTSTATUS +NTAPI +INIT_FUNCTION +ApphelpCacheInitialize(VOID) +{ + DPRINT1("SHIMS: ApphelpCacheInitialize\n"); + /* If we are booting in safemode we do not want to use the apphelp cache */ + if (InitSafeBootMode) + { + DPRINT1("SHIMS: Safe mode detected, disabling cache.\n"); + ApphelpCacheEnabled = FALSE; + } + else + { + ExInitializeResourceLite(&ApphelpCacheLock); + RtlInitializeGenericTableAvl(&ApphelpShimCache, + ApphelpShimCacheCompareRoutine, + ApphelpShimCacheAllocateRoutine, + ApphelpShimCacheFreeRoutine, + NULL); + InitializeListHead(&ApphelpShimCacheAge); + ApphelpCacheEnabled = ApphelpCacheRead(); + } + DPRINT1("SHIMS: ApphelpCacheInitialize: %d\n", ApphelpCacheEnabled); + return STATUS_SUCCESS; +} + +VOID +NTAPI +ApphelpCacheShutdown(VOID) +{ + if (ApphelpCacheEnabled) + { + ApphelpCacheWrite(); + } +} + +NTSTATUS +ApphelpValidateData( + _In_opt_ PAPPHELP_CACHE_SERVICE_LOOKUP ServiceData, + _Out_ PUNICODE_STRING ImageName, + _Out_ PHANDLE ImageHandle) +{ + NTSTATUS Status = STATUS_INVALID_PARAMETER; + + if (ServiceData) + { + UNICODE_STRING LocalImageName; + _SEH2_TRY + { + ProbeForRead(ServiceData, sizeof(APPHELP_CACHE_SERVICE_LOOKUP), sizeof(ULONG)); + LocalImageName = ServiceData->ImageName; + *ImageHandle = ServiceData->ImageHandle; + if (LocalImageName.Length && LocalImageName.Buffer) + { + ProbeForRead(LocalImageName.Buffer, LocalImageName.Length * sizeof(WCHAR), 1); + ApphelpDuplicateUnicodeString(ImageName, &LocalImageName); + Status = STATUS_SUCCESS; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("SHIMS: ApphelpValidateData: invalid data passed\n"); + } + return Status; +} + +NTSTATUS +ApphelpCacheRemoveEntryNolock( + _In_ PSHIM_CACHE_ENTRY Entry) +{ + if (Entry) + { + PWSTR Buffer = Entry->Persistent.ImageName.Buffer; + RemoveEntryList(&Entry->List); + if (RtlDeleteElementGenericTableAvl(&ApphelpShimCache, Entry)) + ApphelpFree(Buffer); + return STATUS_SUCCESS; + } + return STATUS_NOT_FOUND; +} + +NTSTATUS +ApphelpCacheLookupEntry( + _In_ PUNICODE_STRING ImageName, + _In_ HANDLE ImageHandle) +{ + NTSTATUS Status = STATUS_NOT_FOUND; + + if (ApphelpCacheTryAcquireLock()) + { + SHIM_CACHE_ENTRY Lookup = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Entry; + Lookup.Persistent.ImageName = *ImageName; + Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, &Lookup); + if (Entry) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found %wZ\n", ImageName); + if (ImageHandle == INVALID_HANDLE_VALUE) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: ok\n"); + /* just return if we know it, do not query file info */ + Status = STATUS_SUCCESS; + } + else if (NT_SUCCESS(ApphelpCacheQueryInfo(ImageHandle, &Lookup)) && + Lookup.Persistent.DateTime.QuadPart == Entry->Persistent.DateTime.QuadPart && + Lookup.Persistent.FileSize.QuadPart == Entry->Persistent.FileSize.QuadPart) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found & validated\n"); + Status = STATUS_SUCCESS; + /* move it to the front to keep it alive */ + RemoveEntryList(&Entry->List); + InsertHeadList(&ApphelpShimCacheAge, &Entry->List); + } + else + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: file info mismatch\n"); + /* Could not read file info, or it did not match, drop it from the cache */ + ApphelpCacheRemoveEntryNolock(Entry); + } + } + else + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: could not find %wZ\n", ImageName); + } + ApphelpCacheReleaseLock(); + } + return Status; +} + +NTSTATUS +ApphelpCacheRemoveEntry( + _In_ PUNICODE_STRING ImageName) +{ + PSHIM_CACHE_ENTRY Entry; + NTSTATUS Status; + + ApphelpCacheAcquireLock(); + Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, ImageName); + Status = ApphelpCacheRemoveEntryNolock(Entry); + ApphelpCacheReleaseLock(); + return Status; +} + +/* Validate that we are either called from r0, or from a service-like context */ +NTSTATUS +ApphelpCacheAccessCheck(VOID) +{ + if (ExGetPreviousMode() != KernelMode) + { + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, UserMode)) + { + DPRINT1("SHIMS: ApphelpCacheAccessCheck failed\n"); + return STATUS_ACCESS_DENIED; + } + } + return STATUS_SUCCESS; +} + +NTSTATUS +ApphelpCacheUpdateEntry( + _In_ PUNICODE_STRING ImageName, + _In_ HANDLE ImageHandle) +{ + NTSTATUS Status = STATUS_SUCCESS; + SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Lookup; + PVOID NodeOrParent; + TABLE_SEARCH_RESULT SearchResult; + + ApphelpCacheAcquireLock(); + + /* If we got a file handle, query it for info */ + if (ImageHandle != INVALID_HANDLE_VALUE) + { + Status = ApphelpCacheQueryInfo(ImageHandle, &Entry); + } + + if (NT_SUCCESS(Status)) + { + /* Use ImageName for the lookup, don't actually duplicate it */ + Entry.Persistent.ImageName = *ImageName; + Lookup = RtlLookupElementGenericTableFullAvl(&ApphelpShimCache, &Entry, + &NodeOrParent, &SearchResult); + if (Lookup) + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Entry already exists, reusing it\n"); + /* Unlink the found item, so we can put it back at the front, + and copy the earlier obtained file info*/ + RemoveEntryList(&Lookup->List); + Lookup->Persistent.DateTime = Entry.Persistent.DateTime; + Lookup->Persistent.FileSize = Entry.Persistent.FileSize; + } + else + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Inserting new Entry\n"); + /* Insert a new entry, with its own copy of the ImageName */ + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, ImageName); + Lookup = RtlInsertElementGenericTableFullAvl(&ApphelpShimCache, + &Entry, sizeof(Entry), 0, NodeOrParent, SearchResult); + if (!Lookup) + { + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + Status = STATUS_NO_MEMORY; + } + } + if (Lookup) + { + /* Either we re-used an existing item, or we inserted a new one, keep it alive */ + InsertHeadList(&ApphelpShimCacheAge, &Lookup->List); + if (RtlNumberGenericTableElementsAvl(&ApphelpShimCache) > MAX_SHIM_ENTRIES) + { + PSHIM_CACHE_ENTRY Remove; + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Cache growing too big, dropping oldest item\n"); + Remove = CONTAINING_RECORD(ApphelpShimCacheAge.Blink, SHIM_CACHE_ENTRY, List); + Status = ApphelpCacheRemoveEntryNolock(Remove); + } + } + } + ApphelpCacheReleaseLock(); + return Status; +} + +NTSTATUS +ApphelpCacheFlush(VOID) +{ + PVOID p; + + DPRINT1("SHIMS: ApphelpCacheFlush\n"); + ApphelpCacheAcquireLock(); + while ((p = RtlEnumerateGenericTableAvl(&ApphelpShimCache, TRUE))) + { + ApphelpCacheRemoveEntryNolock((PSHIM_CACHE_ENTRY)p); + } + ApphelpCacheReleaseLock(); + return STATUS_SUCCESS; +} + +NTSTATUS +ApphelpCacheDump(VOID) +{ + PLIST_ENTRY ListEntry; + + DPRINT1("SHIMS: NtApphelpCacheControl( Dumping entries, newset to oldest )\n"); + ApphelpCacheAcquireLock(); + ListEntry = ApphelpShimCacheAge.Flink; + while (ListEntry != &ApphelpShimCacheAge) + { + PSHIM_CACHE_ENTRY Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); + DPRINT1("Entry: %S\n", Entry->Persistent.ImageName.Buffer); + DPRINT1("DateTime High: 0x%x, Low: 0x%x\n", + Entry->Persistent.DateTime.HighPart, Entry->Persistent.DateTime.LowPart); + DPRINT1("FileSize High: 0x%x, Low: 0x%x\n", + Entry->Persistent.FileSize.HighPart, Entry->Persistent.FileSize.LowPart); + DPRINT1("Flags: 0x%x\n", Entry->CompatFlags); + ListEntry = ListEntry->Flink; + } + ApphelpCacheReleaseLock(); + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +NtApphelpCacheControl( + _In_ APPHELPCACHESERVICECLASS Service, + _In_opt_ PAPPHELP_CACHE_SERVICE_LOOKUP ServiceData) +{ + NTSTATUS Status = STATUS_INVALID_PARAMETER; + UNICODE_STRING ImageName = { 0 }; + HANDLE Handle = INVALID_HANDLE_VALUE; + + if (!ApphelpCacheEnabled) + { + DPRINT1("NtApphelpCacheControl: ApphelpCacheEnabled == 0\n"); + return Status; + } + switch (Service) + { + case ApphelpCacheServiceLookup: + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpCacheServiceLookup )\n"); + Status = ApphelpValidateData(ServiceData, &ImageName, &Handle); + if (NT_SUCCESS(Status)) + Status = ApphelpCacheLookupEntry(&ImageName, Handle); + break; + case ApphelpCacheServiceRemove: + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpCacheServiceRemove )\n"); + Status = ApphelpValidateData(ServiceData, &ImageName, &Handle); + if (NT_SUCCESS(Status)) + Status = ApphelpCacheRemoveEntry(&ImageName); + break; + case ApphelpCacheServiceUpdate: + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpCacheServiceUpdate )\n"); + Status = ApphelpCacheAccessCheck(); + if (NT_SUCCESS(Status)) + { + Status = ApphelpValidateData(ServiceData, &ImageName, &Handle); + if (NT_SUCCESS(Status)) + Status = ApphelpCacheUpdateEntry(&ImageName, Handle); + } + break; + case ApphelpCacheServiceFlush: + Status = ApphelpCacheFlush(); + break; + case ApphelpCacheServiceDump: + Status = ApphelpCacheDump(); + break; + case ApphelpDBGReadRegistry: + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpDBGReadRegistry ): flushing cache.\n"); + ApphelpCacheFlush(); + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpDBGReadRegistry ): reading cache.\n"); + Status = ApphelpCacheRead() ? STATUS_SUCCESS : STATUS_NOT_FOUND; + break; + case ApphelpDBGWriteRegistry: + DPRINT1("SHIMS: NtApphelpCacheControl( ApphelpDBGWriteRegistry ): writing cache.\n"); + Status = ApphelpCacheWrite() ? STATUS_SUCCESS : STATUS_NOT_FOUND; + break; + default: + DPRINT1("SHIMS: NtApphelpCacheControl( Invalid service requested )\n"); + break; + } + if (ImageName.Buffer) + { + ApphelpFreeUnicodeString(&ImageName); + } + return Status; +} + Propchange: trunk/reactos/ntoskrnl/ps/apphelp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -250,7 +250,7 @@ LARGE_INTEGER Offset = {{0, 0}}; SIZE_T ViewSize = 0; PVOID ImageBase = 0; - + /* Map the System DLL */ Status = MmMapViewOfSection(PspSystemDllSection, Process, @@ -267,7 +267,7 @@ /* Normalize status code */ Status = STATUS_CONFLICTING_ADDRESSES; } - + /* Write the image base and return status */ if (DllBase) *DllBase = ImageBase; return Status; @@ -677,13 +677,4 @@ return (NtBuildNumber >> 28) == 0xC; } -NTSTATUS -NTAPI -NtApphelpCacheControl(IN APPHELPCACHESERVICECLASS Service, - IN PAPPHELP_CACHE_SERVICE_LOOKUP ServiceData) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -2,6 +2,7 @@ list(APPEND SOURCE LdrEnumResources.c NtAllocateVirtualMemory.c + NtApphelpCacheControl.c NtContinue.c NtCreateFile.c NtCreateThread.c Added: trunk/rostests/apitests/ntdll/NtApphelpCacheControl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtApphelpC… ============================================================================== --- trunk/rostests/apitests/ntdll/NtApphelpCacheControl.c (added) +++ trunk/rostests/apitests/ntdll/NtApphelpCacheControl.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -0,0 +1,367 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL - See COPYING.LIB in the top level directory + * PURPOSE: Tests for SHIM engine caching. + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> + +#include <windows.h> + +#define WIN32_NO_STATUS +#include <ntndk.h> + +enum ServiceCommands +{ + RegisterShimCacheWithHandle = 128, + RegisterShimCacheWithoutHandle = 129, +}; + + +NTSTATUS CallCacheControl(UNICODE_STRING* PathName, BOOLEAN WithMapping, APPHELPCACHESERVICECLASS Service) +{ + APPHELP_CACHE_SERVICE_LOOKUP CacheEntry = { {0} }; + NTSTATUS Status; + CacheEntry.ImageName = *PathName; + if (WithMapping) + { + OBJECT_ATTRIBUTES LocalObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + InitializeObjectAttributes(&LocalObjectAttributes, PathName, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&CacheEntry.ImageHandle, + SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_EXECUTE, + &LocalObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + ok_ntstatus(Status, STATUS_SUCCESS); + } + else + { + CacheEntry.ImageHandle = INVALID_HANDLE_VALUE; + } + Status = NtApphelpCacheControl(Service, &CacheEntry); + if (CacheEntry.ImageHandle != INVALID_HANDLE_VALUE) + NtClose(CacheEntry.ImageHandle); + return Status; +} + +int InitEnv(UNICODE_STRING* PathName) +{ + NTSTATUS Status = CallCacheControl(PathName, FALSE, ApphelpCacheServiceRemove); + if (Status == STATUS_INVALID_PARAMETER) + { + /* Windows Vista+ has a different layout for APPHELP_CACHE_SERVICE_LOOKUP */ + return 0; + } + ok(Status == STATUS_SUCCESS || Status == STATUS_NOT_FOUND, + "Wrong value for Status, expected: SUCCESS or NOT_FOUND, got: 0x%lx\n", + Status); + return 1; +} + +void CheckValidation(UNICODE_STRING* PathName) +{ + APPHELP_CACHE_SERVICE_LOOKUP CacheEntry = { {0} }; + NTSTATUS Status; + + /* Validate the handling of a NULL pointer */ + Status = NtApphelpCacheControl(ApphelpCacheServiceRemove, NULL); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, NULL); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + /* Validate the handling of a NULL pointer inside the struct */ + Status = NtApphelpCacheControl(ApphelpCacheServiceRemove, &CacheEntry); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + /* Just call the dump function */ + Status = NtApphelpCacheControl(ApphelpCacheServiceDump, NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Validate the handling of an invalid handle inside the struct */ + CacheEntry.ImageName = *PathName; + CacheEntry.ImageHandle = (HANDLE)2; + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + /* Validate the handling of an invalid service number */ + Status = NtApphelpCacheControl(999, NULL); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + Status = NtApphelpCacheControl(999, &CacheEntry); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); +} + +static BOOLEAN RequestAddition(SC_HANDLE service_handle, BOOLEAN WithMapping) +{ + SERVICE_STATUS Status; + ControlService(service_handle, WithMapping ? RegisterShimCacheWithHandle : + RegisterShimCacheWithoutHandle, &Status); + /* TODO: how to get a return code from the service? */ + return TRUE; +} + +static void RunApphelpCacheControlTests(SC_HANDLE service_handle) +{ + WCHAR szPath[MAX_PATH]; + UNICODE_STRING ntPath; + BOOLEAN Result; + NTSTATUS Status; + APPHELP_CACHE_SERVICE_LOOKUP CacheEntry; + + GetModuleFileNameW(NULL, szPath, sizeof(szPath) / sizeof(szPath[0])); + Result = RtlDosPathNameToNtPathName_U(szPath, &ntPath, NULL, NULL); + ok(Result == TRUE, "RtlDosPathNameToNtPathName_U\n"); + if (!InitEnv(&ntPath)) + { + skip("NtApphelpCacheControl expects a different structure layout\n"); + return; + } + /* At this point we have made sure that our binary is not present in the cache, + and that the NtApphelpCacheControl function expects the struct layout we use. */ + CheckValidation(&ntPath); + + /* We expect not to find it */ + Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_NOT_FOUND); + Status = CallCacheControl(&ntPath, FALSE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + /* First we add our process without a file handle (so it will be registered without file info) */ + RequestAddition(service_handle, FALSE); + + /* now we try to find it without validating file info */ + Status = CallCacheControl(&ntPath, FALSE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_SUCCESS); + /* when validating file info the cache notices the file is wrong, so it is dropped from the cache */ + Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_NOT_FOUND); + /* making the second check without info also fail. */ + Status = CallCacheControl(&ntPath, FALSE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + + /* Now we add the file with file info */ + RequestAddition(service_handle, TRUE); + + /* so both checks should succeed */ + Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = CallCacheControl(&ntPath, FALSE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* We know the file is in the cache now (assuming previous tests succeeded, + let's test invalid handle behavior */ + CacheEntry.ImageName = ntPath; + CacheEntry.ImageHandle = 0; + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + /* re-add it for the next test */ + RequestAddition(service_handle, TRUE); + Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_SUCCESS); + CacheEntry.ImageHandle = (HANDLE)1; + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + /* and again */ + RequestAddition(service_handle, TRUE); + Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); + ok_ntstatus(Status, STATUS_SUCCESS); + CacheEntry.ImageHandle = (HANDLE)0x80000000; + Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + ok_ntstatus(Status, STATUS_NOT_FOUND); + + RtlFreeHeap(RtlGetProcessHeap(), 0, ntPath.Buffer); +} + + +/* Most service related code was taken from services_winetest:service and modified for usage here + The rest came from MSDN */ + +static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); +static char service_name[100] = "apphelp_test_service"; +static HANDLE service_stop_event; +static SERVICE_STATUS_HANDLE service_status; + +static BOOLEAN RegisterInShimCache(BOOLEAN WithMapping) +{ + WCHAR szPath[MAX_PATH]; + UNICODE_STRING ntPath; + BOOLEAN Result; + NTSTATUS Status; + GetModuleFileNameW(NULL, szPath, sizeof(szPath) / sizeof(szPath[0])); + Result = RtlDosPathNameToNtPathName_U(szPath, &ntPath, NULL, NULL); + if (!Result) + { + DbgPrint("RegisterInShimCache: RtlDosPathNameToNtPathName_U failed\n"); + return FALSE; + } + + Status = CallCacheControl(&ntPath, WithMapping, ApphelpCacheServiceUpdate); + if (!NT_SUCCESS(Status)) + { + DbgPrint("RegisterInShimCache: CallCacheControl failed\n"); + RtlFreeHeap(RtlGetProcessHeap(), 0, ntPath.Buffer); + return FALSE; + } + RtlFreeHeap(RtlGetProcessHeap(), 0, ntPath.Buffer); + return TRUE; +} + + +static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *context) +{ + SERVICE_STATUS status = {0}; + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus(service_status, &status); + SetEvent(service_stop_event); + return NO_ERROR; + case RegisterShimCacheWithHandle: + if (!RegisterInShimCache(TRUE)) + { + /* TODO: how should we communicate a failure? */ + } + break; + case RegisterShimCacheWithoutHandle: + if (!RegisterInShimCache(FALSE)) + { + /* TODO: how should we communicate a failure? */ + } + break; + default: + DbgPrint("Unhandled: %d\n", ctrl); + break; + } + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(service_status, &status); + return NO_ERROR; +} + +static void WINAPI service_main(DWORD argc, char **argv) +{ + SERVICE_STATUS status = {0}; + service_status = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); + if(!service_status) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + SetServiceStatus(service_status, &status); + + WaitForSingleObject(service_stop_event, INFINITE); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus(service_status, &status); +} + +static SC_HANDLE InstallService(SC_HANDLE scm_handle) +{ + char service_cmd[MAX_PATH+150], *ptr; + SC_HANDLE service; + + ptr = service_cmd + GetModuleFileNameA(NULL, service_cmd, MAX_PATH); + strcpy(ptr, " NtApphelpCacheControl service"); + ptr += strlen(ptr); + + service = CreateServiceA(scm_handle, service_name, service_name, GENERIC_ALL, + SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_IGNORE, + service_cmd, NULL, NULL, NULL, NULL, NULL); + if (!service) + { + skip("Could not create helper service\n"); + return NULL; + } + return service; +} + +static void WaitService(SC_HANDLE service_handle, DWORD Status, SERVICE_STATUS_PROCESS* ssp) +{ + DWORD dwBytesNeeded; + DWORD dwStartTime = GetTickCount(); + while (ssp->dwCurrentState != Status) + { + Sleep(40); + if (!QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, + (LPBYTE)ssp, sizeof(SERVICE_STATUS_PROCESS), &dwBytesNeeded )) + { + ok(0, "QueryServiceStatusEx failed waiting for %lu\n", Status); + break; + } + if ((GetTickCount() - dwStartTime) > 1000) + { + ok(0, "Timeout waiting for (%lu) from service, is: %lu.\n", + Status, ssp->dwCurrentState); + break; + } + } +} + +static void RunTest() +{ + SC_HANDLE scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + SC_HANDLE service_handle = InstallService(scm_handle); + if (service_handle) + { + SERVICE_STATUS_PROCESS ssp = {0}; + BOOL res = StartServiceA(service_handle, 0, NULL); + if (res) + { + WaitService(service_handle, SERVICE_RUNNING, &ssp); + RunApphelpCacheControlTests(service_handle); + ControlService(service_handle, SERVICE_CONTROL_STOP, (LPSERVICE_STATUS)&ssp); + WaitService(service_handle, SERVICE_STOPPED, &ssp); + } + else + { + skip("Could not start helper service\n"); + } + DeleteService(service_handle); + } + CloseServiceHandle(scm_handle); +} + +START_TEST(NtApphelpCacheControl) +{ + char **argv; + int argc; + + pRegisterServiceCtrlHandlerExA = (void*)GetProcAddress(GetModuleHandleA("advapi32.dll"), "RegisterServiceCtrlHandlerExA"); + if (!pRegisterServiceCtrlHandlerExA) + { + win_skip("RegisterServiceCtrlHandlerExA not available, skipping tests\n"); + return; + } + argc = winetest_get_mainargs(&argv); + if(argc < 3) + { + RunTest(); + } + else + { + SERVICE_TABLE_ENTRYA servtbl[] = { + {service_name, service_main}, + {NULL, NULL} + }; + service_stop_event = CreateEventA(NULL, TRUE, FALSE, NULL); + StartServiceCtrlDispatcherA(servtbl); + Sleep(50); + CloseHandle(service_stop_event); + } +} + + Propchange: trunk/rostests/apitests/ntdll/NtApphelpCacheControl.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 5 11:49:54 2015 @@ -5,6 +5,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); +extern void func_NtApphelpCacheControl(void); extern void func_NtContinue(void); extern void func_NtCreateFile(void); extern void func_NtCreateThread(void); @@ -40,6 +41,7 @@ { { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, + { "NtApphelpCacheControl", func_NtApphelpCacheControl }, { "NtContinue", func_NtContinue }, { "NtCreateFile", func_NtCreateFile }, { "NtCreateThread", func_NtCreateThread },

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