[KERNEL32]
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 2 Nov 2012 18:30:27 +0000 (18:30 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 2 Nov 2012 18:30:27 +0000 (18:30 +0000)
Use the new messaging structures...

svn path=/branches/ros-csrss/; revision=57668

dll/win32/kernel32/client/file/deviceio.c
dll/win32/kernel32/client/file/filename.c

index 4d67961..c477c4f 100644 (file)
@@ -18,21 +18,22 @@ VOID
 WINAPI
 NotifySoundSentry(VOID)
 {
 WINAPI
 NotifySoundSentry(VOID)
 {
-    CSR_API_MESSAGE ApiMessage;
+    BASE_API_MESSAGE ApiMessage;
+    PBASE_SOUND_SENTRY SoundSentryRequest = &ApiMessage.Data.SoundSentryRequest;
 
     /* Get the video mode */
 
     /* Get the video mode */
-    if (!GetConsoleDisplayMode(&ApiMessage.Data.SoundSentryRequest.VideoMode))
+    if (!GetConsoleDisplayMode(&SoundSentryRequest->VideoMode))
     {
     {
-        ApiMessage.Data.SoundSentryRequest.VideoMode = 0;
+        SoundSentryRequest->VideoMode = 0;
     }
 
     /* Make sure it's not fullscreen, and send the message if not */
     }
 
     /* Make sure it's not fullscreen, and send the message if not */
-    if (ApiMessage.Data.SoundSentryRequest.VideoMode == 0)
+    if (SoundSentryRequest->VideoMode == 0)
     {
     {
-        CsrClientCallServer(&ApiMessage,
+        CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                             NULL,
                             CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSoundSentryNotification),
                             NULL,
                             CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSoundSentryNotification),
-                            sizeof(CSR_API_MESSAGE));
+                            sizeof(BASE_SOUND_SENTRY));
     }
 }
 
     }
 }
 
index 1e94be3..afbe867 100644 (file)
@@ -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
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/file.c
  * PURPOSE:         Directory functions
- * PROGRAMMER:      Ariadne ( ariadne@xs4all.nl)
+ * PROGRAMMERS:     Ariadne (ariadne@xs4all.nl)
  *                  Pierre Schweitzer (pierre.schweitzer@reactos.org)
  * UPDATE HISTORY:
  *                  Created 01/11/98
  *                  Pierre Schweitzer (pierre.schweitzer@reactos.org)
  * UPDATE HISTORY:
  *                  Created 01/11/98
@@ -92,7 +91,8 @@ GetTempFileNameW(IN LPCWSTR lpPathName,
     UINT ID, Num = 0;
     CHAR IDString[5];
     WCHAR * TempFileName;
     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 };
     DWORD FileAttributes, LastError;
     UNICODE_STRING PathNameString, PrefixString;
     static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL };
@@ -158,17 +158,17 @@ GetTempFileNameW(IN LPCWSTR lpPathName,
         /* If user didn't gave any ID, ask Csrss to give one */
         if (!uUnique)
         {
         /* 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),
                                 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;
             }
  
             {
                 Num++;
                 continue;
             }
  
-            ID = ApiMessage.Data.GetTempFile.UniqueID;
+            ID = GetTempFile->UniqueID;
         }
         else
         {
         }
         else
         {