[ros-diffs] [ion] 52817: [KERNEL32]: Simplify CreateMemoryResourceNotification and bring up to ReactOS coding standards. [KERNEL32]: Bug: QueryMemoryResourceNotification should set ERROR_INVALID_PARAMETER and ...

Author: ion
Date: Sat Jul 23 18:50:20 2011
New Revision: 52817

URL: http://svn.reactos.org/svn/reactos?rev=52817&view=rev
Log:
[KERNEL32]: Simplify CreateMemoryResourceNotification and bring up to ReactOS coding
standards.
[KERNEL32]: Bug: QueryMemoryResourceNotification should set ERROR_INVALID_PARAMETER and
fail if the Handle is NULL or INVALID_HANDLE_VALUE.
[KERNEL32]: Fix ULONG<->BOOL cast in QueryMemoryResourceNotification as well.

Modified:
    trunk/reactos/dll/win32/kernel32/client/resntfy.c

Modified: trunk/reactos/dll/win32/kernel32/client/resntfy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/resntfy.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/resntfy.c [iso-8859-1] Sat Jul 23 18:50:20
2011
@@ -1,49 +1,42 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS kernel
- * FILE:                 lib/kernel32/mem/resnotify.c
- * PURPOSE:              Memory Resource Notification
+ * PROJECT:              ReactOS Win32 Base API
+ * FILE:                 dll/win32/kernel32/client/resnotify.c
+ * PURPOSE:              Memory Resource Notifications
  * PROGRAMMER:           Thomas Weidenmueller &lt;w3seek(a)reactos.com&gt;
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
 
 #include <k32.h>
 
 #define NDEBUG
 #include <debug.h>
 
-/* FUNCTIONS *****************************************************************/
+/* FUNCTIONS ******************************************************************/
 
 /*
  * @implemented
  */
 HANDLE
 WINAPI
-CreateMemoryResourceNotification(
-    MEMORY_RESOURCE_NOTIFICATION_TYPE NotificationType
-    )
+CreateMemoryResourceNotification(IN MEMORY_RESOURCE_NOTIFICATION_TYPE NotificationType)
 {
     UNICODE_STRING EventName;
     OBJECT_ATTRIBUTES ObjectAttributes;
     HANDLE hEvent;
     NTSTATUS Status;
-
-    switch(NotificationType)
+    
+    if (NotificationType > HighMemoryResourceNotification)
     {
-      case LowMemoryResourceNotification:
-        RtlInitUnicodeString(&EventName,
L"\\KernelObjects\\LowMemoryCondition");
-        break;
-
-      case HighMemoryResourceNotification:
-        RtlInitUnicodeString(&EventName,
L"\\KernelObjects\\HighMemoryCondition");
-        break;
-
-      default:
         SetLastError(ERROR_INVALID_PARAMETER);
         return NULL;
     }
+    
+    RtlInitUnicodeString(&EventName,
+                         NotificationType ?
+                         L"\\KernelObjects\\HighMemoryCondition" :
+                         L"\\KernelObjects\\LowMemoryCondition");
 
     InitializeObjectAttributes(&ObjectAttributes,
                                &EventName,
@@ -54,47 +47,46 @@
     Status = NtOpenEvent(&hEvent,
                          EVENT_QUERY_STATE | SYNCHRONIZE,
                          &ObjectAttributes);
-    if(!NT_SUCCESS(Status))
+    if (!NT_SUCCESS(Status))
     {
-      SetLastErrorByStatus(Status);
-      return NULL;
+        SetLastErrorByStatus(Status);
+        return NULL;
     }
 
     return hEvent;
 }
-
 
 /*
  * @implemented
  */
 BOOL
 WINAPI
-QueryMemoryResourceNotification(
-    HANDLE ResourceNotificationHandle,
-    PBOOL  ResourceState
-    )
+QueryMemoryResourceNotification(IN HANDLE ResourceNotificationHandle,
+                                OUT PBOOL ResourceState)
 {
-    EVENT_BASIC_INFORMATION ebi;
+    EVENT_BASIC_INFORMATION EventInfo;
     NTSTATUS Status;
 
-    if(ResourceState != NULL)
+    if ((ResourceNotificationHandle) &&
+        (ResourceNotificationHandle != INVALID_HANDLE_VALUE) &&
+        (ResourceState))
     {
-      Status = NtQueryEvent(ResourceNotificationHandle,
-                            EventBasicInformation,
-                            &ebi,
-                            sizeof(ebi),
-                            NULL);
-      if(NT_SUCCESS(Status))
-      {
-        *ResourceState = ebi.EventState;
-        return TRUE;
-      }
+        Status = NtQueryEvent(ResourceNotificationHandle,
+                              EventBasicInformation,
+                              &EventInfo,
+                              sizeof(EventInfo),
+                              NULL);
+        if (NT_SUCCESS(Status))
+        {
+            *ResourceState = (EventInfo.EventState == 1);
+            return TRUE;
+        }
 
-      SetLastErrorByStatus(Status);
+        SetLastErrorByStatus(Status);
     }
-    else /* ResourceState == NULL */
+    else
     {
-      SetLastError(ERROR_INVALID_PARAMETER);
+        SetLastError(ERROR_INVALID_PARAMETER);
     }
 
     return FALSE;