[PATCH v2 2/3] mshtml_private.tlb: Add private typelib.

Paul Gofman pgofman at codeweavers.com
Tue Jul 6 07:27:24 CDT 2021


Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
 configure.ac                                  |  1 +
 dlls/mshtml/main.c                            |  5 +--
 dlls/mshtml/mshtml_private.h                  |  2 ++
 dlls/mshtml_private.tlb/Makefile.in           |  3 ++
 .../mshtml_private.tlb.spec                   |  1 +
 .../mshtml_private.tlb/mshtml_private_tlb.idl | 21 ++++++++++++
 include/Makefile.in                           |  1 +
 include/wine/mshtml_private_iface.idl         | 32 +++++++++++++++++++
 8 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 dlls/mshtml_private.tlb/Makefile.in
 create mode 100644 dlls/mshtml_private.tlb/mshtml_private.tlb.spec
 create mode 100644 dlls/mshtml_private.tlb/mshtml_private_tlb.idl
 create mode 100644 include/wine/mshtml_private_iface.idl

diff --git a/configure.ac b/configure.ac
index f0a42cf3b0a..81d08f1f427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3405,6 +3405,7 @@ WINE_CONFIG_MAKEFILE(dlls/msgsm32.acm)
 WINE_CONFIG_MAKEFILE(dlls/mshtml.tlb)
 WINE_CONFIG_MAKEFILE(dlls/mshtml)
 WINE_CONFIG_MAKEFILE(dlls/mshtml/tests)
+WINE_CONFIG_MAKEFILE(dlls/mshtml_private.tlb)
 WINE_CONFIG_MAKEFILE(dlls/msi)
 WINE_CONFIG_MAKEFILE(dlls/msi/tests)
 WINE_CONFIG_MAKEFILE(dlls/msident)
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 959d2d66214..859e03396ec 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -583,8 +583,8 @@ static HRESULT register_server(BOOL do_register)
     HMODULE hAdvpack;
     HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
     STRTABLEA strtable;
-    STRENTRYA pse[35];
-    static CLSID const *clsids[35];
+    STRENTRYA pse[36];
+    static CLSID const *clsids[36];
     unsigned int i = 0;
 
     TRACE("(%x)\n", do_register);
@@ -624,6 +624,7 @@ static HRESULT register_server(BOOL do_register)
     INF_SET_CLSID(SysimageProtocol);
     INF_SET_CLSID(TridentAPI);
     INF_SET_ID(LIBID_MSHTML);
+    INF_SET_ID(LIBID_MSHTML_private);
 
     for(i=0; i < ARRAY_SIZE(pse); i++) {
         pse[i].pszValue = heap_alloc(39);
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index e3486aa3314..682685338d0 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -40,6 +40,8 @@
 
 #include "nsiface.h"
 
+#include "wine/mshtml_private_iface.h"
+
 #include <assert.h>
 
 #define NS_ERROR_GENERATE_FAILURE(module,code) \
diff --git a/dlls/mshtml_private.tlb/Makefile.in b/dlls/mshtml_private.tlb/Makefile.in
new file mode 100644
index 00000000000..6e512ca6394
--- /dev/null
+++ b/dlls/mshtml_private.tlb/Makefile.in
@@ -0,0 +1,3 @@
+MODULE    = mshtml_private.tlb
+
+IDL_SRCS = mshtml_private_tlb.idl
diff --git a/dlls/mshtml_private.tlb/mshtml_private.tlb.spec b/dlls/mshtml_private.tlb/mshtml_private.tlb.spec
new file mode 100644
index 00000000000..b427b2913c6
--- /dev/null
+++ b/dlls/mshtml_private.tlb/mshtml_private.tlb.spec
@@ -0,0 +1 @@
+# no exported entry points
diff --git a/dlls/mshtml_private.tlb/mshtml_private_tlb.idl b/dlls/mshtml_private.tlb/mshtml_private_tlb.idl
new file mode 100644
index 00000000000..11ee7509f74
--- /dev/null
+++ b/dlls/mshtml_private.tlb/mshtml_private_tlb.idl
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Paul Gofman for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma makedep regtypelib
+
+#include "wine/mshtml_private_iface.idl"
diff --git a/include/Makefile.in b/include/Makefile.in
index 61a74a210c9..d1333a458db 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -773,6 +773,7 @@ SOURCES = \
 	wine/exception.h \
 	wine/fil_data.idl \
 	wine/itss.idl \
+	wine/mshtml_private_iface.idl \
 	wine/orpc.idl \
 	wine/svcctl.idl \
 	wine/winedxgi.idl \
diff --git a/include/wine/mshtml_private_iface.idl b/include/wine/mshtml_private_iface.idl
new file mode 100644
index 00000000000..dddcda7b1d4
--- /dev/null
+++ b/include/wine/mshtml_private_iface.idl
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021      Paul Gofman for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma makedep header
+
+import "ocidl.idl";
+import "dimm.idl";
+import "shtypes.idl";
+import "dispex.idl";
+
+[
+    version(1.0),
+    uuid(90de541e-380b-4530-94a9-97367fe49d8d)
+]
+library MSHTML_private
+{
+} /* library MSHTML_private */
-- 
2.31.1




More information about the wine-devel mailing list