koffi 2.1.3 → 2.1.4

package/src/cnoke/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "cnoke",
+  "version": "3.2.1",
+  "description": "Build native Node addons based on CMake, without extra dependency",
+  "keywords": [
+    "native",
+    "addon",
+    "cmake",
+    "c",
+    "c++"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Koromix/rygel.git"
+  },
+  "author": "Niels Martignène <niels.martignene@protonmail.com>",
+  "bin": "cnoke.js",
+  "license": "AGPL-3.0",
+  "files": [
+    "cnoke.js",
+    "LICENSE.txt",
+    "README.md",
+    "assets"
+  ]
+}

package/{vendor → src/core}/libcc/libcc.cc

@@ -3069,6 +3069,7 @@ OpenResult OpenDescriptor(const char *filename, unsigned int flags, unsigned int
     DWORD access = 0;
     DWORD share = 0;
     DWORD creation = 0;
+    DWORD attributes = 0;
     int oflags = -1;
     switch (flags & ((int)OpenFlag::Read |
                      (int)OpenFlag::Write |
@@ -3077,47 +3078,63 @@ OpenResult OpenDescriptor(const char *filename, unsigned int flags, unsigned int
             access = GENERIC_READ;
             share = FILE_SHARE_READ | FILE_SHARE_WRITE;
             creation = OPEN_EXISTING;
-
+            attributes = FILE_ATTRIBUTE_NORMAL;
             oflags = _O_RDONLY | _O_BINARY | _O_NOINHERIT;
         } break;
         case (int)OpenFlag::Write: {
             access = GENERIC_WRITE;
             share = FILE_SHARE_READ | FILE_SHARE_WRITE;
-            creation = (flags & (int)OpenFlag::Exclusive) ? CREATE_NEW : CREATE_ALWAYS;
-
+            creation = CREATE_ALWAYS;
+            attributes = FILE_ATTRIBUTE_NORMAL;
             oflags = _O_WRONLY | _O_CREAT | _O_TRUNC | _O_BINARY | _O_NOINHERIT;
         } break;
         case (int)OpenFlag::Read | (int)OpenFlag::Write: {
             access = GENERIC_READ | GENERIC_WRITE;
             share = FILE_SHARE_READ | FILE_SHARE_WRITE;
-            creation = (flags & (int)OpenFlag::Exclusive) ? CREATE_NEW : CREATE_ALWAYS;
-
+            creation = CREATE_ALWAYS;
+            attributes = FILE_ATTRIBUTE_NORMAL;
             oflags = _O_RDWR | _O_CREAT | _O_TRUNC | _O_BINARY | _O_NOINHERIT;
         } break;
         case (int)OpenFlag::Append: {
             access = GENERIC_WRITE;
             share = FILE_SHARE_READ | FILE_SHARE_WRITE;
-            creation = (flags & (int)OpenFlag::Exclusive) ? CREATE_NEW : CREATE_ALWAYS;
-
+            creation = CREATE_ALWAYS;
+            attributes = FILE_ATTRIBUTE_NORMAL;
             oflags = _O_WRONLY | _O_CREAT | _O_APPEND | _O_BINARY | _O_NOINHERIT;
         } break;
     }
     RG_ASSERT(oflags >= 0);
 
-    if (flags & (int)OpenFlag::Exclusive) {
+    if (flags & (int)OpenFlag::Directory) {
+        RG_ASSERT(!(flags & (int)OpenFlag::Exclusive));
+        RG_ASSERT(!(flags & (int)OpenFlag::Append));
+
+        creation = OPEN_EXISTING;
+        attributes = FILE_FLAG_BACKUP_SEMANTICS;
+        oflags &= ~(_O_CREAT | _O_TRUNC | _O_BINARY);
+    }
+    if (flags & (int)OpenFlag::Exists) {
+        RG_ASSERT(!(flags & (int)OpenFlag::Exclusive));
+
+        creation = OPEN_EXISTING;
+        oflags &= ~_O_CREAT;
+    } else if (flags & (int)OpenFlag::Exclusive) {
+        RG_ASSERT(creation == CREATE_ALWAYS);
+
+        creation = CREATE_NEW;
         oflags |= (int)_O_EXCL;
     }
     share |= FILE_SHARE_DELETE;
 
     HANDLE h;
     if (win32_utf8) {
-        h = CreateFileA(filename, access, share, nullptr, creation, FILE_ATTRIBUTE_NORMAL, nullptr);
+        h = CreateFileA(filename, access, share, nullptr, creation, attributes, nullptr);
     } else {
         wchar_t filename_w[4096];
         if (ConvertUtf8ToWin32Wide(filename, filename_w) < 0)
             return OpenResult::OtherError;
 
-        h = CreateFileW(filename_w, access, share, nullptr, creation, FILE_ATTRIBUTE_NORMAL, nullptr);
+        h = CreateFileW(filename_w, access, share, nullptr, creation, attributes, nullptr);
     }
     if (h == INVALID_HANDLE_VALUE) {
         DWORD err = GetLastError();
@@ -3410,7 +3427,17 @@ OpenResult OpenDescriptor(const char *filename, unsigned int flags, unsigned int
     }
     RG_ASSERT(oflags >= 0);
 
-    if (flags & (int)OpenFlag::Exclusive) {
+    if (flags & (int)OpenFlag::Directory) {
+        RG_ASSERT(!(flags & (int)OpenFlag::Exclusive));
+        RG_ASSERT(!(flags & (int)OpenFlag::Append));
+
+        oflags &= ~O_CREAT;
+    }
+    if (flags & (int)OpenFlag::Exists) {
+        RG_ASSERT(!(flags & (int)OpenFlag::Exclusive));
+        oflags &= ~O_CREAT;
+    } else if (flags & (int)OpenFlag::Exclusive) {
+        RG_ASSERT(oflags & O_CREAT);
         oflags |= O_EXCL;
     }
 

package/{vendor → src/core}/libcc/libcc.hh

@@ -272,7 +272,7 @@ constexpr Size Kilobytes(Size len) { return len * 1000; }
 template <typename T, unsigned N>
 char (&ComputeArraySize(T const (&)[N]))[N];
 #define RG_LEN(Array) RG_SIZE(RG::ComputeArraySize(Array))
-#define RG_OFFSET_OF(Type, Member) __builtin_offsetof(Type, Member)
+#define RG_OFFSET_OF(Type, Member) ((Size)__builtin_offsetof(Type, Member))
 
 static inline constexpr uint16_t ReverseBytes(uint16_t u)
 {
@@ -3868,7 +3868,9 @@ enum class OpenFlag {
     Write = 1 << 1,
     Append = 1 << 2,
 
-    Exclusive = 1 << 3
+    Directory = 1 << 3,
+    Exists = 1 << 4,
+    Exclusive = 1 << 5
 };
 
 enum class OpenResult {

package/{CMakeLists.txt → src/koffi/CMakeLists.txt}

@@ -44,7 +44,7 @@ set(KOFFI_SRC
     src/ffi.cc
     src/parser.cc
     src/util.cc
-    vendor/libcc/libcc.cc
+    ../../src/core/libcc/libcc.cc
 )
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     # CMAKE_SYSTEM_PROCESSOR is wrong on Windows ARM64
@@ -98,9 +98,9 @@ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
 endif()
 
 add_node_addon(NAME koffi SOURCES ${KOFFI_SRC})
-target_include_directories(koffi PRIVATE . vendor/node-addon-api)
+target_include_directories(koffi PRIVATE . ../.. ../../vendor/node-addon-api)
 
-target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=8)
+target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=8 LIBCC_NO_BROTLI LIBCC_NO_MINIZ)
 if(WIN32)
     target_compile_definitions(koffi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
     target_link_libraries(koffi PRIVATE ws2_32)

package/{ChangeLog.md → src/koffi/ChangeLog.md}

@@ -2,6 +2,17 @@
 
 ## History
 
+### Koffi 2.1.4
+
+**Main changes:**
+
+- Increase maximum type size from 32 kiB to 64 MiB
+- Add configurable option for maximum type size
+
+**Other changes:**
+
+- Moved Koffi to a new repository: https://github.com/Koromix/rygel/
+
 ### Koffi 2.1.3
 
 **Main changes:**