Jacek Caban : widl: Don't use old typelib format in do_everything mode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a8fc62d1a269031b786f05b45ae9f57b4c365768
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a8fc62d1a269031b786f05b45ae9f57...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Apr  4 12:54:32 2024 +0200

widl: Don't use old typelib format in do_everything mode.

Fixes a regression from 0bffa3222611015a3b3596c679be53c557daae1b.

---

 tools/widl/register.c | 2 +-
 tools/widl/widl.c     | 5 ++---
 tools/widl/widl.h     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/widl/register.c b/tools/widl/register.c
index c4f81756352..66a07aeb5c4 100644
--- a/tools/widl/register.c
+++ b/tools/widl/register.c
@@ -317,7 +317,7 @@ void write_typelib_regscript( const statement_list_t *stmts )
             error( "Cannot store multiple typelibs into %s\n", typelib_name );
         else
         {
-            if (do_old_typelib)
+            if (old_typelib)
                 create_sltg_typelib( stmt->u.lib );
             else
                 create_msft_typelib( stmt->u.lib );
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 489e7c2f9a2..6d7dd46c33e 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -99,7 +99,6 @@ int do_everything = 1;
 static int preprocess_only = 0;
 int do_header = 0;
 int do_typelib = 0;
-int do_old_typelib = 0;
 int do_proxies = 0;
 int do_client = 0;
 int do_server = 0;
@@ -108,6 +107,7 @@ int do_idfile = 0;
 int do_dlldata = 0;
 static int no_preprocess = 0;
 int old_names = 0;
+int old_typelib = 0;
 int winrt_mode = 0;
 int interpreted_mode = 0;
 int use_abi_namespace = 0;
@@ -256,7 +256,6 @@ static void set_everything(int x)
 {
   do_header = x;
   do_typelib = x;
-  do_old_typelib = x;
   do_proxies = x;
   do_client = x;
   do_server = x;
@@ -618,7 +617,7 @@ static void option_callback( int optc, char *optarg )
       do_typelib = 1;
       break;
     case OLD_TYPELIB_OPTION:
-      do_old_typelib = 1;
+      old_typelib = 1;
       break;
     case 'T':
       typelib_name = xstrdup(optarg);
diff --git a/tools/widl/widl.h b/tools/widl/widl.h
index 33ecfa1f255..c5ccc140b36 100644
--- a/tools/widl/widl.h
+++ b/tools/widl/widl.h
@@ -39,7 +39,6 @@ extern int pedantic;
 extern int do_everything;
 extern int do_header;
 extern int do_typelib;
-extern int do_old_typelib;
 extern int do_proxies;
 extern int do_client;
 extern int do_server;
@@ -47,6 +46,7 @@ extern int do_regscript;
 extern int do_idfile;
 extern int do_dlldata;
 extern int old_names;
+extern int old_typelib;
 extern int winrt_mode;
 extern int interpreted_mode;
 extern int use_abi_namespace;