Skip to content

Commit f3bb314

Browse files
committed
[ROSTESTS] Use unicode functions in pipes.c instead of ANSI
1 parent 26ab246 commit f3bb314

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

  • modules/rostests/apitests/kernel32

modules/rostests/apitests/kernel32/Pipes.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
#include "precomp.h"
1010

11-
static const char* g_PipeName = "\\\\.\\pipe\\rostest_pipe";
11+
static PCWSTR g_PipeName = L"\\\\.\\pipe\\rostest_pipe"
1212

1313
#define MINBUFFERSIZE 1
1414
#define MAXBUFFERSIZE 255
1515
#define TEST_MESSAGE "Test"
16-
#define TEST_MESSAGE_SIZE 4
16+
#define TEST_MESSAGE_SIZE (sizeof(TEST_MESSAGE) - sizeof(ANSI_NULL))
1717

1818
static DWORD g_dwReadBufferSize;
1919

@@ -38,7 +38,7 @@ DWORD WINAPI PipeReader(_In_ PVOID Param)
3838
BOOL Success = ReadFile(hPipe, outMsg, g_dwReadBufferSize, &cbRead, NULL);
3939

4040
if (g_dwReadBufferSize == MINBUFFERSIZE)
41-
ok(!Success, "ReadFile() unexpectedly succeeded\n");
41+
ok(!Success, "ReadFile() succeeded unexpectedly\n");
4242
else
4343
ok(Success, "ReadFile() failed, last error = 0x%lx\n", GetLastError());
4444

@@ -53,11 +53,11 @@ DWORD WINAPI PipeReader(_In_ PVOID Param)
5353
VOID StartTestCORE17376(_In_ DWORD adReadBufferSize)
5454
{
5555
HANDLE hPipeReader, hPipeWriter, hThreadReader, hThreadWriter;
56-
trace("adReadBufferSize = %ld - START\n", adReadBufferSize);
56+
trace("adReadBufferSize = %lu - START\n", adReadBufferSize);
5757

5858
g_dwReadBufferSize = adReadBufferSize;
5959

60-
hPipeReader = CreateNamedPipeA(
60+
hPipeReader = CreateNamedPipeW(
6161
g_PipeName,
6262
PIPE_ACCESS_DUPLEX,
6363
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
@@ -66,23 +66,23 @@ VOID StartTestCORE17376(_In_ DWORD adReadBufferSize)
6666
MAXBUFFERSIZE,
6767
0,
6868
NULL);
69-
ok(hPipeReader != INVALID_HANDLE_VALUE, "CreateNamedPipeA failed\n");
69+
ok(hPipeReader != INVALID_HANDLE_VALUE, "CreateNamedPipeW failed\n");
7070

7171
if (hPipeReader == INVALID_HANDLE_VALUE)
7272
return;
7373

7474
hThreadReader = CreateThread(NULL, 0, PipeReader, hPipeReader, 0, NULL);
7575
ok(hThreadReader != INVALID_HANDLE_VALUE, "CreateThread failed\n");
7676

77-
hPipeWriter = CreateFile(
77+
hPipeWriter = CreateFileW(
7878
g_PipeName,
7979
GENERIC_READ | GENERIC_WRITE,
8080
FILE_SHARE_READ | FILE_SHARE_WRITE,
8181
NULL,
8282
OPEN_EXISTING,
8383
FILE_ATTRIBUTE_NORMAL,
8484
NULL);
85-
ok(hPipeWriter != INVALID_HANDLE_VALUE, "CreateFile failed\n");
85+
ok(hPipeWriter != INVALID_HANDLE_VALUE, "CreateFileW failed\n");
8686

8787
if (hPipeWriter != INVALID_HANDLE_VALUE)
8888
{
@@ -104,7 +104,7 @@ VOID StartTestCORE17376(_In_ DWORD adReadBufferSize)
104104
}
105105
CloseHandle(hPipeReader);
106106

107-
trace("adReadBufferSize = %ld - COMPLETED\n", adReadBufferSize);
107+
trace("adReadBufferSize = %lu - COMPLETED\n", adReadBufferSize);
108108
}
109109

110110
START_TEST(Pipes)

0 commit comments

Comments
 (0)