18 May
2013
18 May
'13
11:54 a.m.
Author: tfaber
Date: Sat May 18 11:54:48 2013
New Revision: 59033
URL: http://svn.reactos.org/svn/reactos?rev=59033&view=rev
Log:
[LT2013]
- Merge r58706 (ntos/ke: Reset the state of the right thread when switching NPX threads)
- Merge r58727 (ntos/mm: Fix check for address range fitting the VAD when commiting
memory)
- Merge r58865 (bootdata: Add Themes folder during setup)
- Merge r59015 (rundll32: always return 0)
Modified:
branches/ros-branch-0_3_15-lt2013/ (props changed)
branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c
branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in
branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake
branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c
branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c
Propchange: branches/ros-branch-0_3_15-lt2013/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 18 11:54:48 2013
@@ -13,4 +13,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58759
+/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58706,58727,58759,58865,59015
Modified: branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s…
==============================================================================
--- branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_15-lt2013/base/system/rundll32/rundll32.c [iso-8859-1] Sat
May 18 11:54:48 2013
@@ -343,7 +343,7 @@
DllWinMainW fnDllWinMainW;
DllWinMainA fnDllWinMainA;
HWND hWindow;
- int nRetVal,i;
+ int i;
size_t nStrLen;
// Get command-line in argc-argv format
@@ -380,8 +380,6 @@
lptCmdLine = argv[i];
else
lptCmdLine = _T("");
-
- nRetVal = 0;
// Everything is all setup, so load the dll now
hDll = LoadLibrary(lptDllName);
@@ -439,13 +437,13 @@
if (fnDllWinMainW) {
// Convert the command-line string to unicode and call the dll function
lpwCmdLine = ConvertToWideChar(lptCmdLine);
- nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow);
+ fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow);
FreeConvertedWideChar(lpwCmdLine);
}
else if (fnDllWinMainA) {
// Convert the command-line string to ansi and call the dll function
lpaCmdLine = ConvertToMultiByte(lptCmdLine);
- nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow);
+ fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow);
FreeConvertedMultiByte(lpaCmdLine);
}
else {
@@ -478,6 +476,6 @@
}
if (argv) free(argv);
- return nRetVal;
-}
-
+ return 0; /* rundll32 always returns 0! */
+}
+
Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/b…
==============================================================================
--- branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in
[iso-8859-1] (original)
+++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in
[iso-8859-1] Sat May 18 11:54:48 2013
@@ -28,6 +28,8 @@
12 = Microsoft.NET\Framework\v1.0.3705
13 = Microsoft.NET\Framework\v1.1.4322
14 = Microsoft.NET\Framework\v2.0.50727
+15 = Resources
+16 = Resources\Themes
.InfEnd
Modified: branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/cmake/…
==============================================================================
--- branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/ros-branch-0_3_15-lt2013/cmake/CMakeMacros.cmake [iso-8859-1] Sat May 18
11:54:48 2013
@@ -111,6 +111,10 @@
set(${var} 13)
elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
set(${var} 14)
+ elseif(${dir} STREQUAL reactos/Resources)
+ set(${var} 15)
+ elseif(${dir} STREQUAL reactos/Resources/Themes)
+ set(${var} 16)
else()
message(ERROR "Wrong destination: ${dir}")
endif()
Modified: branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/ntoskr…
==============================================================================
--- branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_15-lt2013/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat
May 18 11:54:48 2013
@@ -756,7 +756,7 @@
//Ke386SaveFpuState(NpxSaveArea);
/* Update NPX state */
- Thread->NpxState = NPX_STATE_NOT_LOADED;
+ NpxThread->NpxState = NPX_STATE_NOT_LOADED;
}
/* Load FPU state */
Modified: branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/ntoskr…
==============================================================================
--- branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_15-lt2013/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat
May 18 11:54:48 2013
@@ -4080,7 +4080,7 @@
//
// Make sure that this address range actually fits within the VAD for it
//
- if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) &&
+ if (((StartingAddress >> PAGE_SHIFT) < FoundVad->StartingVpn) ||
((EndingAddress >> PAGE_SHIFT) > FoundVad->EndingVpn))
{
DPRINT1("Address range does not fit into the VAD\n");