From 8f5e781644ac800740b4cf17fd8eec37692c4f1e Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <[email protected]>
Date: Tue, 5 May 2026 20:31:15 +0000
Subject: [PATCH] crt/libsrc: Include activscp.h for missing GUIDs in uuid library

Required for https://github.com/zufuliu/notepad4/commit/2090fbfd8c8be035c225e83fb9181ce809e9f752
Fixes https://github.com/mingw-w64/mingw-w64/issues/171

Signed-off-by: Biswapriyo Nath <[email protected]>
---
 mingw-w64-crt/Makefile.am           |  2 +-
 mingw-w64-crt/libsrc/ativscp-uuid.c | 16 ----------------
 mingw-w64-crt/libsrc/uuid.c         |  1 +
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 mingw-w64-crt/libsrc/ativscp-uuid.c

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 946e2805f4d5..cfb429f9ae55 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -136,7 +136,7 @@ src_libgdiplus=libsrc/gdiplus.c
 src_adsiid=libsrc/activeds-uuid.c
 
 src_libuuid=\
-  libsrc/ativscp-uuid.c   libsrc/atsmedia-uuid.c    libsrc/bth-uuid.c         libsrc/cguid-uuid.c     libsrc/comcat-uuid.c   \
+  libsrc/atsmedia-uuid.c    libsrc/bth-uuid.c         libsrc/cguid-uuid.c     libsrc/comcat-uuid.c   \
   libsrc/ctxtcall-uuid.c \
   libsrc/devguid.c        libsrc/docobj-uuid.c      libsrc/dxva-uuid.c        libsrc/exdisp-uuid.c    libsrc/extras-uuid.c   \
   libsrc/fwp-uuid.c       libsrc/guid_nul.c         libsrc/hlguids-uuid.c     libsrc/hlink-uuid.c     libsrc/mlang-uuid.c    \
diff --git a/mingw-w64-crt/libsrc/ativscp-uuid.c b/mingw-w64-crt/libsrc/ativscp-uuid.c
deleted file mode 100644
index 4cfdc3e80520..000000000000
--- a/mingw-w64-crt/libsrc/ativscp-uuid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ativscp-uuid.c */
-/* Generate GUIDs for ActiveScript interfaces */
-
-/* All IIDs defined in this file were extracted from
- * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */
-
-/* All CLSIDs defined in this file were extracted from
- * HKEY_CLASSES_ROOT\CLSID\ */
-
-#define INITGUID
-#include <basetyps.h>
-DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptParse,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptSite,0xdb01a1e3,0xa42b,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptSiteWindow,0xd10f6761,0x83e9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
diff --git a/mingw-w64-crt/libsrc/uuid.c b/mingw-w64-crt/libsrc/uuid.c
index 48d555b38d60..bff218d1d86a 100644
--- a/mingw-w64-crt/libsrc/uuid.c
+++ b/mingw-w64-crt/libsrc/uuid.c
@@ -14,6 +14,7 @@
 #define INITGUID
 #include <basetyps.h>
 
+#include <activscp.h>
 #include <credentialprovider.h>
 #include <httprequest.h>
 #include <functiondiscoverykeys.h>
-- 
2.54.0

_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to