diff --git a/dlls/gameux/gameux_tlb.idl b/dlls/gameux/gameux_tlb.idl index 06157a1304f..c3d86de629e 100644 --- a/dlls/gameux/gameux_tlb.idl +++ b/dlls/gameux/gameux_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "gameux.idl" diff --git a/dlls/hhctrl.ocx/hhctrl_tlb.idl b/dlls/hhctrl.ocx/hhctrl_tlb.idl index 844a68c2899..58a4b1e80d1 100644 --- a/dlls/hhctrl.ocx/hhctrl_tlb.idl +++ b/dlls/hhctrl.ocx/hhctrl_tlb.idl @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "unknwn.idl"; import "objidl.idl"; diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl index 6fb06cb7b9f..33e8cc87ae0 100644 --- a/dlls/hnetcfg/hnetcfg_tlb.idl +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "netfw.idl" diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl index 62713abd60c..9b64a600043 100644 --- a/dlls/ieframe/ieframe_v1.idl +++ b/dlls/ieframe/ieframe_v1.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #pragma makedep register #include "exdisp.idl" diff --git a/dlls/jscript/jsglobal.idl b/dlls/jscript/jsglobal.idl index ac295684f50..b8604e99f27 100644 --- a/dlls/jscript/jsglobal.idl +++ b/dlls/jscript/jsglobal.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "jsglobal_dispid.h" diff --git a/dlls/mmcndmgr/mmcndmgr.idl b/dlls/mmcndmgr/mmcndmgr.idl index 3aa698fac2c..4b855fcfa29 100644 --- a/dlls/mmcndmgr/mmcndmgr.idl +++ b/dlls/mmcndmgr/mmcndmgr.idl @@ -17,6 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "mmc.idl" diff --git a/dlls/mshtml.tlb/mshtml_tlb.idl b/dlls/mshtml.tlb/mshtml_tlb.idl index faed415106d..a7df069c386 100644 --- a/dlls/mshtml.tlb/mshtml_tlb.idl +++ b/dlls/mshtml.tlb/mshtml_tlb.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "mshtml.idl" diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 3ef43cf3cea..f2850052faa 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -19,7 +19,7 @@ #pragma makedep ident #pragma makedep register -#pragma makedep typelib +#pragma makedep regtypelib #include "msiserver_dispids.h" import "unknwn.idl"; diff --git a/dlls/msxml/msxml_tlb.idl b/dlls/msxml/msxml_tlb.idl index 09ce4299514..3afa64c86e5 100644 --- a/dlls/msxml/msxml_tlb.idl +++ b/dlls/msxml/msxml_tlb.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "msxml.idl" diff --git a/dlls/msxml2/msxml2_tlb.idl b/dlls/msxml2/msxml2_tlb.idl index 07b80db28f5..c06a9379619 100644 --- a/dlls/msxml2/msxml2_tlb.idl +++ b/dlls/msxml2/msxml2_tlb.idl @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include #include diff --git a/dlls/msxml3/msxml3_v1.idl b/dlls/msxml3/msxml3_v1.idl index 534e11a3e2b..9987e545b4c 100644 --- a/dlls/msxml3/msxml3_v1.idl +++ b/dlls/msxml3/msxml3_v1.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "msxml2.idl" diff --git a/dlls/msxml4/msxml4_tlb.idl b/dlls/msxml4/msxml4_tlb.idl index 7da7774f09a..a2d3785e4c3 100644 --- a/dlls/msxml4/msxml4_tlb.idl +++ b/dlls/msxml4/msxml4_tlb.idl @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include #include diff --git a/dlls/msxml6/msxml6_tlb.idl b/dlls/msxml6/msxml6_tlb.idl index db4b3e99076..88c78babd28 100644 --- a/dlls/msxml6/msxml6_tlb.idl +++ b/dlls/msxml6/msxml6_tlb.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "msxml6.idl" diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl index 8896090de81..44b06935367 100644 --- a/dlls/oleacc/oleacc_classes.idl +++ b/dlls/oleacc/oleacc_classes.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "oleacc.idl" diff --git a/dlls/oledb32/oledb32_typelib.idl b/dlls/oledb32/oledb32_typelib.idl index 89063ef018c..b9d52826a60 100644 --- a/dlls/oledb32/oledb32_typelib.idl +++ b/dlls/oledb32/oledb32_typelib.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "msdasc.idl" diff --git a/dlls/pstorec/pstorec_tlb.idl b/dlls/pstorec/pstorec_tlb.idl index 22bf2831398..13d77501f71 100644 --- a/dlls/pstorec/pstorec_tlb.idl +++ b/dlls/pstorec/pstorec_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "pstore.idl" diff --git a/dlls/quartz/control_tlb.idl b/dlls/quartz/control_tlb.idl index 99924d3da73..b131a1ba3a8 100644 --- a/dlls/quartz/control_tlb.idl +++ b/dlls/quartz/control_tlb.idl @@ -14,6 +14,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "control.idl" diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 9042d2d0d81..98bd8b9d714 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "unknwn.idl"; import "objidl.idl"; diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index 0d439ae8fb2..8418be66f84 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "exdisp.idl" diff --git a/dlls/shell32/shell32_tlb.idl b/dlls/shell32/shell32_tlb.idl index f471899b6bd..4c34d427d9f 100644 --- a/dlls/shell32/shell32_tlb.idl +++ b/dlls/shell32/shell32_tlb.idl @@ -16,6 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "shldisp.idl" diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl index 9dbaf6d2e4d..649d1822889 100644 --- a/dlls/stdole2.tlb/std_ole_v2.idl +++ b/dlls/stdole2.tlb/std_ole_v2.idl @@ -18,6 +18,6 @@ * */ -#pragma makedep typelib +#pragma makedep regtypelib #include "stdole2.idl" diff --git a/dlls/stdole32.tlb/std_ole_v1.idl b/dlls/stdole32.tlb/std_ole_v1.idl index 11147503549..359a81062ae 100644 --- a/dlls/stdole32.tlb/std_ole_v1.idl +++ b/dlls/stdole32.tlb/std_ole_v1.idl @@ -18,7 +18,7 @@ * */ -#pragma makedep typelib +#pragma makedep regtypelib [ uuid(00020430-0000-0000-C000-000000000046), diff --git a/dlls/vbscript/vbsglobal.idl b/dlls/vbscript/vbsglobal.idl index e8d8718dbb1..c2c80d3dc9c 100644 --- a/dlls/vbscript/vbsglobal.idl +++ b/dlls/vbscript/vbsglobal.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "oaidl.idl"; diff --git a/dlls/vbscript/vbsregexp10.idl b/dlls/vbscript/vbsregexp10.idl index 78b2c4b8871..c0304b1ed13 100644 --- a/dlls/vbscript/vbsregexp10.idl +++ b/dlls/vbscript/vbsregexp10.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "oaidl.idl"; diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl index de2919d14fa..a5cbdf05314 100644 --- a/dlls/vbscript/vbsregexp55.idl +++ b/dlls/vbscript/vbsregexp55.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "oaidl.idl"; diff --git a/dlls/wbemdisp/wbemdisp_tlb.idl b/dlls/wbemdisp/wbemdisp_tlb.idl index 610aa34e7e1..9174a2ca6cc 100644 --- a/dlls/wbemdisp/wbemdisp_tlb.idl +++ b/dlls/wbemdisp/wbemdisp_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "wbemdisp.idl" diff --git a/dlls/winhttp/winhttp_tlb.idl b/dlls/winhttp/winhttp_tlb.idl index 1a7bba1e368..673ee63e330 100644 --- a/dlls/winhttp/winhttp_tlb.idl +++ b/dlls/winhttp/winhttp_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "httprequest.idl" diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index cc470e5af02..30fb2c2d943 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib import "oaidl.idl"; cpp_quote("#undef ExpandEnvironmentStrings") diff --git a/dlls/wuapi/wuapi_tlb.idl b/dlls/wuapi/wuapi_tlb.idl index 98f37908b25..1f2e0475ab9 100644 --- a/dlls/wuapi/wuapi_tlb.idl +++ b/dlls/wuapi/wuapi_tlb.idl @@ -18,6 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep typelib +#pragma makedep regtypelib #include "wuapi.idl" diff --git a/tools/makedep.c b/tools/makedep.c index 9dd1b8b77d3..c53b6c9c9a8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -50,16 +50,17 @@ struct incl_file struct incl_file *files[MAX_INCLUDES]; }; -#define FLAG_SYSTEM 0x0001 /* is it a system include (#include ) */ -#define FLAG_IDL_PROXY 0x0002 /* generates a proxy (_p.c) file */ -#define FLAG_IDL_CLIENT 0x0004 /* generates a client (_c.c) file */ -#define FLAG_IDL_SERVER 0x0008 /* generates a server (_s.c) file */ -#define FLAG_IDL_IDENT 0x0010 /* generates an ident (_i.c) file */ -#define FLAG_IDL_REGISTER 0x0020 /* generates a registration (_r.res) file */ -#define FLAG_IDL_TYPELIB 0x0040 /* generates a typelib (.tlb) file */ -#define FLAG_IDL_HEADER 0x0080 /* generates a header (.h) file */ -#define FLAG_RC_PO 0x0100 /* rc file contains translations */ -#define FLAG_C_IMPLIB 0x0200 /* file is part of an import library */ +#define FLAG_SYSTEM 0x0001 /* is it a system include (#include ) */ +#define FLAG_IDL_PROXY 0x0002 /* generates a proxy (_p.c) file */ +#define FLAG_IDL_CLIENT 0x0004 /* generates a client (_c.c) file */ +#define FLAG_IDL_SERVER 0x0008 /* generates a server (_s.c) file */ +#define FLAG_IDL_IDENT 0x0010 /* generates an ident (_i.c) file */ +#define FLAG_IDL_REGISTER 0x0020 /* generates a registration (_r.res) file */ +#define FLAG_IDL_TYPELIB 0x0040 /* generates a typelib (.tlb) file */ +#define FLAG_IDL_REGTYPELIB 0x0080 /* generates a registered typelib (_t.res) file */ +#define FLAG_IDL_HEADER 0x0100 /* generates a header (.h) file */ +#define FLAG_RC_PO 0x0200 /* rc file contains translations */ +#define FLAG_C_IMPLIB 0x0400 /* file is part of an import library */ static const struct { @@ -68,14 +69,14 @@ static const struct const char *widl_arg; } idl_outputs[] = { - { FLAG_IDL_TYPELIB, ".tlb", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, - { FLAG_IDL_TYPELIB, "_t.res", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, - { FLAG_IDL_CLIENT, "_c.c", "$(IDLFLAGS) -c" }, - { FLAG_IDL_IDENT, "_i.c", "$(IDLFLAGS) -u" }, - { FLAG_IDL_PROXY, "_p.c", "$(IDLFLAGS) -p" }, - { FLAG_IDL_SERVER, "_s.c", "$(IDLFLAGS) -s" }, - { FLAG_IDL_REGISTER, "_r.res", "$(IDLFLAGS) -r" }, - { FLAG_IDL_HEADER, ".h", "$(IDLFLAGS) -h" }, + { FLAG_IDL_TYPELIB, ".tlb", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, + { FLAG_IDL_REGTYPELIB, "_t.res", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, + { FLAG_IDL_CLIENT, "_c.c", "$(IDLFLAGS) -c" }, + { FLAG_IDL_IDENT, "_i.c", "$(IDLFLAGS) -u" }, + { FLAG_IDL_PROXY, "_p.c", "$(IDLFLAGS) -p" }, + { FLAG_IDL_SERVER, "_s.c", "$(IDLFLAGS) -s" }, + { FLAG_IDL_REGISTER, "_r.res", "$(IDLFLAGS) -r" }, + { FLAG_IDL_HEADER, ".h", "$(IDLFLAGS) -h" }, }; static struct list sources = LIST_INIT(sources); @@ -858,6 +859,7 @@ static void parse_pragma_directive( struct incl_file *source, char *str ) else if (!strcmp( flag, "ident" )) source->flags |= FLAG_IDL_IDENT; else if (!strcmp( flag, "typelib" )) source->flags |= FLAG_IDL_TYPELIB; else if (!strcmp( flag, "register" )) source->flags |= FLAG_IDL_REGISTER; + else if (!strcmp( flag, "regtypelib" )) source->flags |= FLAG_IDL_REGTYPELIB; } else if (strendswith( source->name, ".rc" )) {