BaseTools LzmaCompress: Update LZMA to new 16.04 version

[mirror_edk2.git] / BaseTools / Source / C / LzmaCompress / Sdk / C / 7zFile.c

diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/7zFile.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/7zFile.c
index 2b605a5665876d55d8183e14df153faa89c7a62b..98fe7164f56f85d4819f5a4921a7e8a9a49f05a7 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/7zFile.c
+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/7zFile.c
@@ -1,15 +1,17 @@
 /* 7zFile.c -- File IO\r
-2008-11-22 : Igor Pavlov : Public domain */\r
+2009-11-24 : Igor Pavlov : Public domain */\r
+\r
+#include "Precomp.h"\r
 \r
 #include "7zFile.h"\r
 \r
 #ifndef USE_WINDOWS_FILE\r
 \r
+#ifndef UNDER_CE\r
 #include <errno.h>\r
-\r
 #endif\r
 \r
-#ifdef USE_WINDOWS_FILE\r
+#else\r
 \r
 /*\r
    ReadFile and WriteFile functions in Windows have BUG:\r
@@ -34,6 +36,7 @@ void File_Construct(CSzFile *p)
   #endif\r
 }\r
 \r
+#if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE)\r
 static WRes File_Open(CSzFile *p, const char *name, int writeMode)\r
 {\r
   #ifdef USE_WINDOWS_FILE\r
@@ -45,12 +48,32 @@ static WRes File_Open(CSzFile *p, const char *name, int writeMode)
   return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();\r
   #else\r
   p->file = fopen(name, writeMode ? "wb+" : "rb");\r
-  return (p->file != 0) ? 0 : errno;\r
+  return (p->file != 0) ? 0 :\r
+    #ifdef UNDER_CE\r
+    2; /* ENOENT */\r
+    #else\r
+    errno;\r
+    #endif\r
   #endif\r
 }\r
 \r
 WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); }\r
 WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); }\r
+#endif\r
+\r
+#ifdef USE_WINDOWS_FILE\r
+static WRes File_OpenW(CSzFile *p, const WCHAR *name, int writeMode)\r
+{\r
+  p->handle = CreateFileW(name,\r
+      writeMode ? GENERIC_WRITE : GENERIC_READ,\r
+      FILE_SHARE_READ, NULL,\r
+      writeMode ? CREATE_ALWAYS : OPEN_EXISTING,\r
+      FILE_ATTRIBUTE_NORMAL, NULL);\r
+  return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();\r
+}\r
+WRes InFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 0); }\r
+WRes OutFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 1); }\r
+#endif\r
 \r
 WRes File_Close(CSzFile *p)\r
 {\r