fix pipe api

tboox · Jan 9, 2025 · 43b5723 · 43b5723
1 parent 33378af
commit 43b5723
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/tbox/platform/stdfile.c b/src/tbox/platform/stdfile.c
@@ -137,16 +137,19 @@ tb_bool_t tb_stdfile_readable(tb_stdfile_ref_t self)
 #endif
 
     HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
-    if (tb_kernel32()->PeekConsoleInputW && tb_kernel32()->PeekNamedPipeW)
+    DWORD fileType = GetFileType(hStdin);
+    if (fileType == FILE_TYPE_PIPE)
     {
-        DWORD fileType = GetFileType(hStdin);
-        if (fileType == FILE_TYPE_PIPE)
+        if (tb_kernel32()->PeekNamedPipe)
         {
             DWORD bytesAvailable = 0;
-            BOOL ok = tb_kernel32()->PeekNamedPipeW(hStdin, NULL, NULL, NULL, &bytesAvailable, tb_null);
+            BOOL ok = tb_kernel32()->PeekNamedPipe(hStdin, NULL, NULL, NULL, &bytesAvailable, tb_null);
             return ok && bytesAvailable;
         }
-        else
+    }
+    else
+    {
+        if (tb_kernel32()->PeekConsoleInputW)
         {
             // we need to ignore left 0x0d charactor, so bytesAvailable must contain at least two characters
             DWORD bytesAvailable = 0;

diff --git a/src/tbox/platform/windows/interface/kernel32.c b/src/tbox/platform/windows/interface/kernel32.c
@@ -67,7 +67,7 @@ static tb_bool_t tb_kernel32_instance_init(tb_kernel32_ref_t kernel32)
     TB_INTERFACE_LOAD(kernel32, DeleteProcThreadAttributeList);
     TB_INTERFACE_LOAD(kernel32, CopyFileExW);
     TB_INTERFACE_LOAD(kernel32, PeekConsoleInputW);
-    TB_INTERFACE_LOAD(kernel32, PeekNamedPipeW);
+    TB_INTERFACE_LOAD(kernel32, PeekNamedPipe);
 #if defined(TB_COMPILER_IS_MSVC) && TB_COMPILER_VERSION_BT(16, 0)
     TB_INTERFACE_LOAD(kernel32, GetLogicalProcessorInformationEx);
 #endif

diff --git a/src/tbox/platform/windows/interface/kernel32.h b/src/tbox/platform/windows/interface/kernel32.h
@@ -204,8 +204,8 @@ typedef BOOL (WINAPI* tb_kernel32_PeekConsoleInputW_t)(
     DWORD               nLength,
     LPDWORD             lpNumberOfEventsRead);
 
-// the PeekNamedPipeW func type
-typedef BOOL (WINAPI* tb_kernel32_PeekNamedPipeW_t)(
+// the PeekNamedPipe func type
+typedef BOOL (WINAPI* tb_kernel32_PeekNamedPipe_t)(
     HANDLE              hNamedPipe,
     LPVOID              lpBuffer,
     DWORD               nBufferSize,
@@ -298,7 +298,7 @@ typedef struct __tb_kernel32_t
     tb_kernel32_PeekConsoleInputW_t                     PeekConsoleInputW;
 
     // PeekNamedPipe
-    tb_kernel32_PeekNamedPipeW_t                        PeekNamedPipeW;
+    tb_kernel32_PeekNamedPipe_t                         PeekNamedPipe;
 
     // GetLogicalProcessorInformationEx
 #if defined(TB_COMPILER_IS_MSVC) && TB_COMPILER_VERSION_BT(16, 0)