[ros-diffs] [tfaber] 71241: [0.4.1] - Merge the fix to NtSetValueKey in r71232/r71236 (ROSTESTS-200)

Author: tfaber
Date: Tue May  3 13:07:03 2016
New Revision: 71241

URL: http://svn.reactos.org/svn/reactos?rev=71241&view=rev
Log:
[0.4.1]
- Merge the fix to NtSetValueKey in r71232/r71236 (ROSTESTS-200)

Added:
    branches/ros-branch-0_4_1/rostests/apitests/ntdll/NtSetValueKey.c
      - copied unchanged from r71232, trunk/rostests/apitests/ntdll/NtSetValueKey.c
Modified:
    branches/ros-branch-0_4_1/reactos/   (props changed)
    branches/ros-branch-0_4_1/reactos/ntoskrnl/config/ntapi.c
    branches/ros-branch-0_4_1/rostests/   (props changed)
    branches/ros-branch-0_4_1/rostests/apitests/ntdll/CMakeLists.txt
    branches/ros-branch-0_4_1/rostests/apitests/ntdll/testlist.c
    branches/ros-branch-0_4_1/rostests/winetests/reg/reg.c

Propchange: branches/ros-branch-0_4_1/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Tue May  3 13:07:03 2016
@@ -20,3 +20,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:71232

Modified: branches/ros-branch-0_4_1/reactos/ntoskrnl/config/ntapi.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/ntoskr…
==============================================================================
--- branches/ros-branch-0_4_1/reactos/ntoskrnl/config/ntapi.c	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_1/reactos/ntoskrnl/config/ntapi.c	[iso-8859-1] Tue May  3
13:07:03 2016
@@ -630,11 +630,11 @@
         Data = NULL;
 
     /* Probe and copy the data */
-    if ((PreviousMode != KernelMode) && Data)
+    if ((PreviousMode != KernelMode) && (DataSize != 0))
     {
         PVOID DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM);
         if (!DataCopy)
-            return STATUS_NO_MEMORY;
+            return STATUS_INSUFFICIENT_RESOURCES;
         _SEH2_TRY
         {
             ProbeForRead(Data, DataSize, 1);

Propchange: branches/ros-branch-0_4_1/rostests/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Tue May  3 13:07:03 2016
@@ -1,2 +1,3 @@
 /branches/GSoC_2011/KMTestSuite:51165-53670
 /branches/ros-amd64-bringup/rostests:44459,44462,44537
+/trunk/rostests:71232,71236

Modified: branches/ros-branch-0_4_1/rostests/apitests/ntdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/apite…
==============================================================================
--- branches/ros-branch-0_4_1/rostests/apitests/ntdll/CMakeLists.txt	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_1/rostests/apitests/ntdll/CMakeLists.txt	[iso-8859-1] Tue May 
3 13:07:03 2016
@@ -18,6 +18,7 @@
     NtQuerySystemEnvironmentValue.c
     NtQueryVolumeInformationFile.c
     NtSaveKey.c
+    NtSetValueKey.c
     RtlAllocateHeap.c
     RtlBitmap.c
     RtlCopyMappedMemory.c

Modified: branches/ros-branch-0_4_1/rostests/apitests/ntdll/testlist.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/apite…
==============================================================================
--- branches/ros-branch-0_4_1/rostests/apitests/ntdll/testlist.c	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_1/rostests/apitests/ntdll/testlist.c	[iso-8859-1] Tue May  3
13:07:03 2016
@@ -21,6 +21,7 @@
 extern void func_NtQuerySystemEnvironmentValue(void);
 extern void func_NtQueryVolumeInformationFile(void);
 extern void func_NtSaveKey(void);
+extern void func_NtSetValueKey(void);
 extern void func_NtSystemInformation(void);
 extern void func_RtlAllocateHeap(void);
 extern void func_RtlBitmap(void);
@@ -63,6 +64,7 @@
     { "NtQuerySystemEnvironmentValue",  func_NtQuerySystemEnvironmentValue },
     { "NtQueryVolumeInformationFile",   func_NtQueryVolumeInformationFile },
     { "NtSaveKey",                      func_NtSaveKey},
+    { "NtSetValueKey",                  func_NtSetValueKey},
     { "NtSystemInformation",            func_NtSystemInformation },
     { "RtlAllocateHeap",                func_RtlAllocateHeap },
     { "RtlBitmapApi",                   func_RtlBitmap },

Modified: branches/ros-branch-0_4_1/rostests/winetests/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/winet…
==============================================================================
--- branches/ros-branch-0_4_1/rostests/winetests/reg/reg.c	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_1/rostests/winetests/reg/reg.c	[iso-8859-1] Tue May  3
13:07:03 2016
@@ -450,10 +450,7 @@
         return;
     }
 
-    if (!winetest_interactive)
-        skip("ROSTESTS-200: Skipping test_add because of exceptions in
Cm.\n");
-    else
-        test_add();
+    test_add();
     test_delete();
     test_query();
     test_v_flags();