From 22c0673bd9043da34c1da1c5d7fdb9b80e147b0e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 26 Oct 2019 22:50:44 +0100
Subject: [PATCH] [CABINET_WINETEST] Sync with Wine Staging 4.18. CORE-16441

---
 modules/rostests/winetests/cabinet/fdi.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/rostests/winetests/cabinet/fdi.c b/modules/rostests/winetests/cabinet/fdi.c
index 80f6a3c5716..732f816bda3 100644
--- a/modules/rostests/winetests/cabinet/fdi.c
+++ b/modules/rostests/winetests/cabinet/fdi.c
@@ -20,6 +20,8 @@
  */
 
 #include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <windows.h>
 #include "fci.h"
 #include "fdi.h"
@@ -31,16 +33,6 @@
 
 static CHAR CURR_DIR[MAX_PATH];
 
-/* avoid including CRT headers */
-#ifndef _O_BINARY
-# define _O_BINARY 0x8000
-#endif
-
-#ifndef _S_IREAD
-# define _S_IREAD  0x0100
-# define _S_IWRITE 0x0080
-#endif
-
 #include <pshpack1.h>
 
 struct CFHEADER
@@ -784,7 +776,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb)
 
 static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb)
 {
-    static const char expected[12] = "Hello World!";
+    static const char expected[] = "Hello World!";
 
     trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb);
 
-- 
2.17.1