[LT2013]
authorThomas Faber <thomas.faber@reactos.org>
Sat, 18 May 2013 11:54:48 +0000 (11:54 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Sat, 18 May 2013 11:54:48 +0000 (11:54 +0000)
- 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)

svn path=/branches/ros-branch-0_3_15-lt2013/; revision=59033

base/system/rundll32/rundll32.c
boot/bootdata/packages/reactos.dff.in
cmake/CMakeMacros.cmake
ntoskrnl/ke/i386/traphdlr.c
ntoskrnl/mm/ARM3/virtual.c

index 82a97fe..be5b364 100644 (file)
@@ -343,7 +343,7 @@ int WINAPI _tWinMain(
     DllWinMainW fnDllWinMainW;
     DllWinMainA fnDllWinMainA;
     HWND hWindow;
-    int nRetVal,i;
+    int i;
     size_t nStrLen;
 
     // Get command-line in argc-argv format
@@ -381,8 +381,6 @@ int WINAPI _tWinMain(
     else
         lptCmdLine = _T("");
 
-    nRetVal = 0;
-
     // Everything is all setup, so load the dll now
     hDll = LoadLibrary(lptDllName);
     if (hDll) {
@@ -439,13 +437,13 @@ int WINAPI _tWinMain(
         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 @@ int WINAPI _tWinMain(
     }
 
     if (argv) free(argv);
-    return nRetVal;
+    return 0; /* rundll32 always returns 0! */
 }
 
index 3018dfc..d3ce2e6 100644 (file)
@@ -28,6 +28,8 @@ Signature = "$ReactOS$"
 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
 
index ba7f4a7..8091cc7 100644 (file)
@@ -111,6 +111,10 @@ macro(dir_to_num dir var)
         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()
index e54deab..9bd9670 100644 (file)
@@ -756,7 +756,7 @@ KiTrap07Handler(IN PKTRAP_FRAME TrapFrame)
                 //Ke386SaveFpuState(NpxSaveArea);
 
                 /* Update NPX state */
-                Thread->NpxState = NPX_STATE_NOT_LOADED;
+                NpxThread->NpxState = NPX_STATE_NOT_LOADED;
            }
        
             /* Load FPU state */
index 55562cc..0d82e09 100644 (file)
@@ -4080,7 +4080,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle,
     //
     // 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");