[PATCH v2 0/2] MR5531: stdole32.tlb: Generate typelib in SLTG format.

[Dmitry Timoshkov (＠dmitry)]

--
  v2: stdole32.tlb: Generate typelib in SLTG format.
      widl: Fix calculation of the SLTG library block size.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5531

[PATCH v2 1/2] widl: Fix calculation of the SLTG library block size.

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

This patch fixes a regression in comparison with SLTG generator in wine-staging,
and allows oleview.exe from PSDK correctly load SLTG typelib generated by widl.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 tools/widl/write_sltg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c
index 1f9976f3fa8..d09fdb37c5c 100644
--- a/tools/widl/write_sltg.c
+++ b/tools/widl/write_sltg.c
@@ -767,7 +767,6 @@ static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data
             size_instance = NULL; /* don't account for element size */
         }
 
-
         append_data(data, array, size);
 
         desc_offset = data->size;
@@ -1618,8 +1617,10 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star
 
     /* library block length includes helpstrings and name table */
     entry.length = sltg->blocks[sltg->block_count - 1].length + 0x40 /* pad after library block */ +
-                   sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block offset */ + 6 /* dummy help strings */ +
-                   12 /* name table header */ + 0x200 /* name table hash */ + sltg->name_table.size;
+                   sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block size */ + 6 /* dummy help strings */ +
+                   12 /* name table header */ + 0x200 /* name table hash */ +
+                   sizeof(sltg->name_table.size) + sltg->name_table.size +
+                   4 /* 0x01ffff01 */ + 4 /* 0 */;
     entry.index_string = sltg->blocks[sltg->block_count - 1].index_string;
     entry.next = 0;
     chat("sltg_write_header: writing library block entry %d: length %#x, index_string %#x, next %#x\n",
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/5531

[PATCH v2 2/2] stdole32.tlb: Generate typelib in SLTG format.

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/stdole32.tlb/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in
index 8ae404a4711..4e5497f0525 100644
--- a/dlls/stdole32.tlb/Makefile.in
+++ b/dlls/stdole32.tlb/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = stdole32.tlb
 
+EXTRAIDLFLAGS = --oldtlb --win32
 EXTRADLLFLAGS = -Wb,--data-only
 
 SOURCES = \
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5531