- Optimize CallNamedPipeA too and remove accidental define.

[reactos.git] / reactos / lib / kernel32 / file / npipe.c

diff --git a/reactos/lib/kernel32/file/npipe.c b/reactos/lib/kernel32/file/npipe.c
index 7695bbe..91d6546 100644 (file)
--- a/reactos/lib/kernel32/file/npipe.c
+++ b/reactos/lib/kernel32/file/npipe.c
@@ -12,7 +12,7 @@
 #include <k32.h>
 
 #define NDEBUG
 #include <k32.h>
 
 #define NDEBUG

-#define USING_PROPER_NPFS_WAIT_SEMANTICS
+//#define USING_PROPER_NPFS_WAIT_SEMANTICS

 #include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 #include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/


@@ -664,35 +664,33 @@ SetNamedPipeHandleState(HANDLE hNamedPipe,
 /*
  * @implemented
  */
 /*
  * @implemented
  */

-BOOL STDCALL
+BOOL
+WINAPI

 CallNamedPipeA(LPCSTR lpNamedPipeName,
 CallNamedPipeA(LPCSTR lpNamedPipeName,

-              LPVOID lpInBuffer,
-              DWORD nInBufferSize,
-              LPVOID lpOutBuffer,
-              DWORD nOutBufferSize,
-              LPDWORD lpBytesRead,
-              DWORD nTimeOut)
+               LPVOID lpInBuffer,
+               DWORD nInBufferSize,
+               LPVOID lpOutBuffer,
+               DWORD nOutBufferSize,
+               LPDWORD lpBytesRead,
+               DWORD nTimeOut)

 {
 {

-  UNICODE_STRING PipeName;
-  BOOL Result;
-
-  RtlCreateUnicodeStringFromAsciiz(&PipeName,
-                                  (LPSTR)lpNamedPipeName);
-
-  Result = CallNamedPipeW(PipeName.Buffer,
-                         lpInBuffer,
-                         nInBufferSize,
-                         lpOutBuffer,
-                         nOutBufferSize,
-                         lpBytesRead,
-                         nTimeOut);
+    UNICODE_STRING PipeName = &NtCurrentTeb()->StaticUnicodeString;
+    ANSI_STRING AnsiPipe;

 
 

-  RtlFreeUnicodeString(&PipeName);
+    /* Initialize the string as ANSI_STRING and convert to Unicode */
+    RtlInitAnsiString(&NameA, (LPSTR)lpName);
+    RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE);

 
 

-  return(Result);
+    /* Call the Unicode function */
+    return CallNamedPipeW(PipeName->Buffer,
+                          lpInBuffer,
+                          nInBufferSize,
+                          lpOutBuffer,
+                          nOutBufferSize,
+                          lpBytesRead,
+                          nTimeOut);

 }
 
 }
 

-

 /*
  * @implemented
  */
 /*
  * @implemented
  */