the callback management doesn't have to be serialized as it's only accessed by the thread itself

svn path=/trunk/; revision=13512

reactos/include/napi/win32.h

@@ -8,7 +8,6 @@ typedef struct _W32THREAD
   PVOID MessageQueue;
   FAST_MUTEX WindowListLock;
   LIST_ENTRY WindowListHead;
-  FAST_MUTEX W32CallbackListLock;
   LIST_ENTRY W32CallbackListHead;
   struct _KBDTABLES* KeyboardLayout;
   struct _DESKTOP_OBJECT* Desktop;

reactos/ntoskrnl/ps/process.c

@@ -51,7 +51,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] =
   ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION),  sizeof(ULONG), ICIF_QUERY | ICIF_SET ),          /* ProcessWorkingSetWatch */
   ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(ULONG), ICIF_SET ),                       /* ProcessUserModeIOPL */
   ICI_SQ_SAME( sizeof(BOOLEAN),                       sizeof(ULONG), ICIF_SET ),                       /* ProcessEnableAlignmentFaultFixup */
-  ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS),        sizeof(USHORT), ICIF_SET ),                       /* ProcessPriorityClass */
+  ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS),        sizeof(USHORT), ICIF_QUERY | ICIF_SET ),         /* ProcessPriorityClass */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG), ICIF_QUERY ),                     /* ProcessWx86Information */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG), ICIF_QUERY ),                     /* ProcessHandleCount */
   ICI_SQ_SAME( sizeof(KAFFINITY),                     sizeof(ULONG), ICIF_SET ),                       /* ProcessAffinityMask */
@@ -1845,12 +1845,6 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
 	break;
 
       case ProcessDebugPort:
-      {
-        if(ProcessInformationLength != sizeof(HANDLE))
-        {
-          Status = STATUS_INFO_LENGTH_MISMATCH;
-        }
-        else
       {
         HANDLE PortHandle = NULL;
 
@@ -1928,17 +1922,10 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
             }
           }
         }
-        }
         break;
       }
 
       case ProcessExceptionPort:
-      {
-        if(ProcessInformationLength != sizeof(HANDLE))
-        {
-          Status = STATUS_INFO_LENGTH_MISMATCH;
-        }
-        else
       {
         HANDLE PortHandle = NULL;
 
@@ -1997,17 +1984,10 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
             }
           }
         }
-        }
         break;
       }
 
       case ProcessAccessToken:
-      {
-        if(ProcessInformationLength != sizeof(PROCESS_ACCESS_TOKEN))
-        {
-          Status = STATUS_INFO_LENGTH_MISMATCH;
-        }
-        else
       {
         HANDLE TokenHandle = NULL;
 
@@ -2028,17 +2008,10 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
           /* in case we had success reading from the buffer, perform the actual task */
           Status = PspAssignPrimaryToken(Process, TokenHandle);
         }
-        }
 	break;
       }
 
       case ProcessDefaultHardErrorMode:
-      {
-        if(ProcessInformationLength != sizeof(UINT))
-        {
-          Status = STATUS_INFO_LENGTH_MISMATCH;
-        }
-        else
       {
         _SEH_TRY
         {
@@ -2051,17 +2024,10 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
           Status = _SEH_GetExceptionCode();
         }
         _SEH_END;
-        }
         break;
       }
       
       case ProcessSessionInformation:
-      {
-        if(ProcessInformationLength != sizeof(UINT))
-        {
-          Status = STATUS_INFO_LENGTH_MISMATCH;
-        }
-        else
       {
         PROCESS_SESSION_INFORMATION SessionInfo;
         Status = STATUS_SUCCESS;
@@ -2125,7 +2091,6 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
             PsUnlockProcess(Process);
           }
         }
-        }
         break;
       }
 	

reactos/subsys/win32k/main/dllmain.c

@@ -178,7 +178,6 @@ Win32kThreadCallback (struct _ETHREAD *Thread,
       InitializeListHead(&Win32Thread->WindowListHead);
       ExInitializeFastMutex(&Win32Thread->WindowListLock);
       InitializeListHead(&Win32Thread->W32CallbackListHead);
-      ExInitializeFastMutex(&Win32Thread->W32CallbackListLock);
     }
   else
     {

reactos/subsys/win32k/ntuser/callback.c

@@ -63,9 +63,7 @@ IntCbAllocateMemory(ULONG Size)
   
   /* insert the callback memory into the thread's callback list */
   
-  ExAcquireFastMutex(&W32Thread->W32CallbackListLock);
   InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry);
-  ExReleaseFastMutex(&W32Thread->W32CallbackListLock);
   
   return (Mem + 1);
 }
@@ -84,9 +82,7 @@ IntCbFreeMemory(PVOID Data)
   ASSERT(W32Thread);
   
   /* remove the memory block from the thread's callback list */
-  ExAcquireFastMutex(&W32Thread->W32CallbackListLock);
   RemoveEntryList(&Mem->ListEntry);
-  ExReleaseFastMutex(&W32Thread->W32CallbackListLock);
   
   /* free memory */
   ExFreePool(Mem);
@@ -98,7 +94,6 @@ IntCleanupThreadCallbacks(PW32THREAD W32Thread)
   PLIST_ENTRY CurrentEntry;
   PINT_CALLBACK_HEADER Mem;
   
-  ExAcquireFastMutex(&W32Thread->W32CallbackListLock);
   while (!IsListEmpty(&W32Thread->W32CallbackListHead))
   {
     CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead);
@@ -108,7 +103,6 @@ IntCleanupThreadCallbacks(PW32THREAD W32Thread)
     /* free memory */
     ExFreePool(Mem);
   }
-  ExReleaseFastMutex(&W32Thread->W32CallbackListLock);
 }
 
 /* FUNCTIONS *****************************************************************/