[ros-diffs] [hbelusca] 57668: [KERNEL32] Use the new messaging structures...

Author: hbelusca
Date: Fri Nov  2 18:30:27 2012
New Revision: 57668

URL: http://svn.reactos.org/svn/reactos?rev=57668&view=rev
Log:
[KERNEL32]
Use the new messaging structures...

Modified:
    branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c
    branches/ros-csrss/dll/win32/kernel32/client/file/filename.c

Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl…
==============================================================================
--- branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c [iso-8859-1] Fri Nov  2
18:30:27 2012
@@ -18,21 +18,22 @@
 WINAPI
 NotifySoundSentry(VOID)
 {
-    CSR_API_MESSAGE ApiMessage;
+    BASE_API_MESSAGE ApiMessage;
+    PBASE_SOUND_SENTRY SoundSentryRequest = &ApiMessage.Data.SoundSentryRequest;
 
     /* Get the video mode */
-    if (!GetConsoleDisplayMode(&ApiMessage.Data.SoundSentryRequest.VideoMode))
-    {
-        ApiMessage.Data.SoundSentryRequest.VideoMode = 0;
+    if (!GetConsoleDisplayMode(&SoundSentryRequest->VideoMode))
+    {
+        SoundSentryRequest->VideoMode = 0;
     }
 
     /* Make sure it's not fullscreen, and send the message if not */
-    if (ApiMessage.Data.SoundSentryRequest.VideoMode == 0)
-    {
-        CsrClientCallServer(&ApiMessage,
+    if (SoundSentryRequest->VideoMode == 0)
+    {
+        CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                             NULL,
                             CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX,
BasepSoundSentryNotification),
-                            sizeof(CSR_API_MESSAGE));
+                            sizeof(BASE_SOUND_SENTRY));
     }
 }
 

Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl…
==============================================================================
--- branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original)
+++ branches/ros-csrss/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Fri Nov  2
18:30:27 2012
@@ -1,10 +1,9 @@
-/* $Id: file.c 54310 2011-11-06 04:13:21Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/file.c
  * PURPOSE:         Directory functions
- * PROGRAMMER:      Ariadne ( ariadne(a)xs4all.nl)
+ * PROGRAMMERS:     Ariadne (ariadne(a)xs4all.nl)
  *                  Pierre Schweitzer (pierre.schweitzer(a)reactos.org)
  * UPDATE HISTORY:
  *                  Created 01/11/98
@@ -92,7 +91,8 @@
     UINT ID, Num = 0;
     CHAR IDString[5];
     WCHAR * TempFileName;
-    CSR_API_MESSAGE ApiMessage;
+    BASE_API_MESSAGE ApiMessage;
+    PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFile;
     DWORD FileAttributes, LastError;
     UNICODE_STRING PathNameString, PrefixString;
     static const WCHAR Ext[] = { L'.', 't', 'm', 'p',
UNICODE_NULL };
@@ -158,17 +158,17 @@
         /* If user didn't gave any ID, ask Csrss to give one */
         if (!uUnique)
         {
-            CsrClientCallServer(&ApiMessage,
+            CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                 NULL,
                                 CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX,
BasepGetTempFile),
-                                sizeof(CSR_API_MESSAGE));
-            if (ApiMessage.Data.GetTempFile.UniqueID == 0)
+                                sizeof(BASE_GET_TEMP_FILE));
+            if (GetTempFile->UniqueID == 0)
             {
                 Num++;
                 continue;
             }
  
-            ID = ApiMessage.Data.GetTempFile.UniqueID;
+            ID = GetTempFile->UniqueID;
         }
         else
         {