Index: C:/ROS/reactos/dll/win32/rpcrt4/rpc_transport.c
===================================================================
--- dll/win32/rpcrt4/rpc_transport.c	(revision 57364)
+++ dll/win32/rpcrt4/rpc_transport.c	(working copy)
@@ -437,11 +437,13 @@
   while (bytes_left)
   {
     DWORD bytes_read;
-    ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl);
-    if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING))
+    ret = ReadFile(npc->pipe, buf, bytes_left, NULL, &ovl);
+    if (!ret && (GetLastError() != ERROR_IO_PENDING) && (GetLastError() != ERROR_MORE_DATA))
         break;
     ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE);
-    if (!ret && (GetLastError() != ERROR_MORE_DATA))
+    if (!ret && (GetLastError() == ERROR_MORE_DATA))
+        ret = TRUE;
+    if (!ret || !bytes_read)
         break;
     bytes_left -= bytes_read;
     buf += bytes_read;
@@ -458,18 +460,18 @@
   BOOL ret = TRUE;
   unsigned int bytes_left = count;
   OVERLAPPED ovl;
-  
+
   ZeroMemory(&ovl, sizeof(ovl));
   ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
 
   while (bytes_left)
   {
     DWORD bytes_written;
-    ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl);
-    if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING))
+    ret = WriteFile(npc->pipe, buf, bytes_left, NULL, &ovl);
+    if (!ret && (GetLastError() != ERROR_IO_PENDING))
         break;
     ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE);
-    if (!ret && (GetLastError() != ERROR_MORE_DATA))
+    if (!ret || !bytes_written)
         break;
     bytes_left -= bytes_written;
     buf += bytes_written;
Index: C:/ROS/reactos/modules/rostests/winetests/qmgr/testlist.c
===================================================================
--- modules/rostests/winetests/qmgr/testlist.c	(revision 57355)
+++ modules/rostests/winetests/qmgr/testlist.c	(working copy)
@@ -12,21 +12,12 @@
 extern void func_job(void);
 extern void func_qmgr(void);
 
-#ifdef __REACTOS__
-void func_skipped(void) { skip("qmgr tests skipped due to CORE-6536\n"); }
-#endif
-
 const struct test winetest_testlist[] =
 {
-/* Skipped because of testbot timeouts. See CORE-6536. */
-#ifdef __REACTOS__
-    { "skipped", func_skipped },
-#else
     { "enum_files", func_enum_files },
     { "enum_jobs", func_enum_jobs },
     { "file", func_file },
     { "job", func_job },
     { "qmgr", func_qmgr },
-#endif
     { 0, 0 }
 };