*.idl: Use correct type for BSTR strings in the defaultvalue() statements.
Dmitry Timoshkov
dmitry at baikal.ru
Fri Nov 6 02:37:19 CST 2015
This matches midl/PSDK syntax, and allows to use Wine headers for compiling
applications with a C++ win32/win64 compiler. In order to be usable by C++
unix compilers widl needs to emit appropriate statically initialized WCHAR
strings, but that's a different problem, currently the generated Wine headers
with default(BSTR) statements can't be used with C++ at all.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
dlls/msi/msiserver.idl | 2 +-
dlls/msxml2/msxml2_tlb.idl | 4 +--
dlls/msxml4/msxml4_tlb.idl | 4 +--
dlls/oleaut32/tests/tmarshal.idl | 2 +-
dlls/scrrun/scrrun.idl | 2 +-
dlls/scrrun/tests/scrrun.idl | 2 +-
dlls/wshom.ocx/tests/wshom.idl | 4 +--
dlls/wshom.ocx/wshom.idl | 4 +--
include/iextag.idl | 4 +--
include/mshtml.idl | 76 ++++++++++++++++++++--------------------
10 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index 5052602..e968ba0 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -277,7 +277,7 @@ library WindowsInstaller
[id(DISPID_INSTALLER_INSTALLPRODUCT)]
void InstallProduct(
[in] BSTR PackagePath,
- [in, defaultvalue("0")] BSTR PropertyValues);
+ [in, defaultvalue(L"0")] BSTR PropertyValues);
[id(DISPID_INSTALLER_VERSION)]
BSTR Version();
[id(DISPID_INSTALLER_LASTERRORRECORD)]
diff --git a/dlls/msxml2/msxml2_tlb.idl b/dlls/msxml2/msxml2_tlb.idl
index c06a937..b7e6d58 100644
--- a/dlls/msxml2/msxml2_tlb.idl
+++ b/dlls/msxml2/msxml2_tlb.idl
@@ -917,7 +917,7 @@ interface IXSLProcessor : IDispatch
[id(DISPID_XMLDOM_PROCESSOR_SETSTARTMODE)]
HRESULT setStartMode(
[in] BSTR p,
- [in, defaultvalue("")] BSTR uri);
+ [in, defaultvalue(L"")] BSTR uri);
[propget, id(DISPID_XMLDOM_PROCESSOR_STARTMODE)]
HRESULT startMode([retval, out] BSTR *p);
@@ -945,7 +945,7 @@ interface IXSLProcessor : IDispatch
HRESULT addParameter(
[in] BSTR p,
[in] VARIANT var,
- [in, defaultvalue("")] BSTR uri);
+ [in, defaultvalue(L"")] BSTR uri);
[id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)]
HRESULT addObject(
diff --git a/dlls/msxml4/msxml4_tlb.idl b/dlls/msxml4/msxml4_tlb.idl
index a2d3785..91964ac 100644
--- a/dlls/msxml4/msxml4_tlb.idl
+++ b/dlls/msxml4/msxml4_tlb.idl
@@ -1141,7 +1141,7 @@ interface IXSLProcessor : IDispatch
[id(DISPID_XMLDOM_PROCESSOR_SETSTARTMODE)]
HRESULT setStartMode(
[in] BSTR p,
- [in, defaultvalue("")] BSTR uri);
+ [in, defaultvalue(L"")] BSTR uri);
[propget, id(DISPID_XMLDOM_PROCESSOR_STARTMODE)]
HRESULT startMode([retval, out] BSTR *p);
@@ -1169,7 +1169,7 @@ interface IXSLProcessor : IDispatch
HRESULT addParameter(
[in] BSTR p,
[in] VARIANT var,
- [in, defaultvalue("")] BSTR uri);
+ [in, defaultvalue(L"")] BSTR uri);
[id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)]
HRESULT addObject(
diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl
index 680f4b4..de06e87 100644
--- a/dlls/oleaut32/tests/tmarshal.idl
+++ b/dlls/oleaut32/tests/tmarshal.idl
@@ -101,7 +101,7 @@ library TestTypelib
HRESULT Name([out, retval] BSTR *name);
[id(DISPID_TM_DOSOMETHING)]
- HRESULT DoSomething([in] double number, [out] BSTR *str1, [in, defaultvalue("")] BSTR str2, [in, optional] VARIANT *opt);
+ HRESULT DoSomething([in] double number, [out] BSTR *str1, [in, defaultvalue(L"")] BSTR str2, [in, optional] VARIANT *opt);
[propget, id(DISPID_TM_STATE)]
HRESULT State([out, retval] STATE *state);
diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl
index 061d924d..cf6f6fc 100644
--- a/dlls/scrrun/scrrun.idl
+++ b/dlls/scrrun/scrrun.idl
@@ -260,7 +260,7 @@ library Scripting
HRESULT Write([in] BSTR Text);
[id(0x00002718)]
- HRESULT WriteLine([in, defaultvalue("")] BSTR Text);
+ HRESULT WriteLine([in, defaultvalue(L"")] BSTR Text);
[id(0x00002719)]
HRESULT WriteBlankLines([in] long Lines);
diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl
index 86ac9e3..928159f 100644
--- a/dlls/scrrun/tests/scrrun.idl
+++ b/dlls/scrrun/tests/scrrun.idl
@@ -260,7 +260,7 @@ library Scripting
HRESULT Write([in] BSTR Text);
[id(0x00002718)]
- HRESULT WriteLine([in, defaultvalue("")] BSTR Text);
+ HRESULT WriteLine([in, defaultvalue(L"")] BSTR Text);
[id(0x00002719)]
HRESULT WriteBlankLines([in] long Lines);
diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl
index c2bc416..0aaaae4 100644
--- a/dlls/wshom.ocx/tests/wshom.idl
+++ b/dlls/wshom.ocx/tests/wshom.idl
@@ -107,7 +107,7 @@ library IWshRuntimeLibrary
HRESULT Write([in] BSTR Text);
[id(0x2718)]
- HRESULT WriteLine([in, defaultvalue("")] BSTR Text);
+ HRESULT WriteLine([in, defaultvalue(L"")] BSTR Text);
[id(0x2719)]
HRESULT WriteBlankLines([in] long Lines);
@@ -575,7 +575,7 @@ library IWshRuntimeLibrary
HRESULT LogEvent(
[in] VARIANT* Type,
[in] BSTR Message,
- [in, defaultvalue("")] BSTR Target,
+ [in, defaultvalue(L"")] BSTR Target,
[out, retval] VARIANT_BOOL* out_Success);
[id(0x0bc2)]
diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl
index 83f3c7e..99def98 100644
--- a/dlls/wshom.ocx/wshom.idl
+++ b/dlls/wshom.ocx/wshom.idl
@@ -107,7 +107,7 @@ library IWshRuntimeLibrary
HRESULT Write([in] BSTR Text);
[id(0x2718)]
- HRESULT WriteLine([in, defaultvalue("")] BSTR Text);
+ HRESULT WriteLine([in, defaultvalue(L"")] BSTR Text);
[id(0x2719)]
HRESULT WriteBlankLines([in] long Lines);
@@ -575,7 +575,7 @@ library IWshRuntimeLibrary
HRESULT LogEvent(
[in] VARIANT* Type,
[in] BSTR Message,
- [in, defaultvalue("")] BSTR Target,
+ [in, defaultvalue(L"")] BSTR Target,
[out, retval] VARIANT_BOOL* out_Success);
[id(0x0bc2)]
diff --git a/include/iextag.idl b/include/iextag.idl
index 6b25af5..287c059 100644
--- a/include/iextag.idl
+++ b/include/iextag.idl
@@ -76,7 +76,7 @@ interface IClientCaps : IDispatch
HRESULT isComponentInstalled(
[in] BSTR bstrName,
[in] BSTR bstrType,
- [in, defaultvalue("")] BSTR bStrVer,
+ [in, defaultvalue(L"")] BSTR bStrVer,
[out, retval] VARIANT_BOOL *p);
[id(19)]
@@ -95,7 +95,7 @@ interface IClientCaps : IDispatch
HRESULT addComponentRequest(
[in] BSTR bstrName,
[in] BSTR bstrType,
- [in, defaultvalue("")] BSTR bstrVer);
+ [in, defaultvalue(L"")] BSTR bstrVer);
[id(22)]
HRESULT doComponentRequest([out, retval] VARIANT_BOOL *p);
diff --git a/include/mshtml.idl b/include/mshtml.idl
index 05f79ef..684039e 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -871,7 +871,7 @@ interface IHTMLStyle2 : IDispatch
HRESULT setExpression(
[in] BSTR propname,
[in] BSTR expression,
- [in, defaultvalue("")] BSTR language);
+ [in, defaultvalue(L"")] BSTR language);
[id(DISPID_IHTMLSTYLE2_GETEXPRESSION)]
HRESULT getExpression(
@@ -2127,7 +2127,7 @@ methods:
void setExpression(
[in] BSTR propname,
[in] BSTR expression,
- [in, defaultvalue("")] BSTR language);
+ [in, defaultvalue(L"")] BSTR language);
[id(DISPID_IHTMLSTYLE2_GETEXPRESSION)]
VARIANT getExpression([in] BSTR propname);
@@ -5225,7 +5225,7 @@ interface IHTMLElement2 : IDispatch
HRESULT setExpression(
[in] BSTR propname,
[in] BSTR expression,
- [defaultvalue(""), in] BSTR language);
+ [defaultvalue(L""), in] BSTR language);
[id(DISPID_IHTMLELEMENT2_GETEXPRESSION)]
HRESULT getExpression(
@@ -5551,7 +5551,7 @@ interface IHTMLElement2 : IDispatch
void setExpression( \
[in] BSTR propname, \
[in] BSTR expr, \
- [defaultvalue(""), in] BSTR lang); \
+ [defaultvalue(L""), in] BSTR lang); \
\
[id(DISPID_IHTMLELEMENT2_GETEXPRESSION)] \
VARIANT getExpression([in] BSTR propname); \
@@ -11987,17 +11987,17 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
HRESULT clearTimeout([in] LONG timerID);
[id(DISPID_IHTMLWINDOW2_ALERT)]
- HRESULT alert([defaultvalue(""), in] BSTR message);
+ HRESULT alert([defaultvalue(L""), in] BSTR message);
[id(DISPID_IHTMLWINDOW2_CONFIRM)]
HRESULT confirm(
- [defaultvalue(""), in] BSTR message,
+ [defaultvalue(L""), in] BSTR message,
[retval, out] VARIANT_BOOL *confirmed);
[id(DISPID_IHTMLWINDOW2_PROMPT)]
HRESULT prompt(
- [defaultvalue(""), in] BSTR message,
- [defaultvalue("undefined"), in] BSTR defstr,
+ [defaultvalue(L""), in] BSTR message,
+ [defaultvalue(L"undefined"), in] BSTR defstr,
[retval, out] VARIANT *textdata);
[propget, id(DISPID_IHTMLWINDOW2_IMAGE)]
@@ -12032,9 +12032,9 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
[id(DISPID_IHTMLWINDOW2_OPEN)]
HRESULT open(
- [defaultvalue(""), in] BSTR url,
- [defaultvalue(""), in] BSTR name,
- [defaultvalue(""), in] BSTR features,
+ [defaultvalue(L""), in] BSTR url,
+ [defaultvalue(L""), in] BSTR name,
+ [defaultvalue(L""), in] BSTR features,
[defaultvalue(0), in] VARIANT_BOOL replace,
[retval, out] IHTMLWindow2 **pomWindowResult);
@@ -12124,7 +12124,7 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
HRESULT showHelp(
[in] BSTR helpURL,
[optional, in] VARIANT helpArg,
- [defaultvalue(""), in] BSTR features);
+ [defaultvalue(L""), in] BSTR features);
[propget, id(DISPID_IHTMLWINDOW2_SCREEN)]
HRESULT screen([retval, out] IHTMLScreen **p);
@@ -12166,7 +12166,7 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
[id(DISPID_IHTMLWINDOW2_EXECSCRIPT)]
HRESULT execScript(
[in] BSTR scode,
- [defaultvalue("JScript"), in] BSTR language,
+ [defaultvalue(L"JScript"), in] BSTR language,
[retval, out] VARIANT *pvarRet);
[id(DISPID_IHTMLWINDOW2_TOSTRING)]
@@ -12256,7 +12256,7 @@ interface IHTMLWindow3 : IDispatch
[id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)]
HRESULT showModelessDialog(
- [in, defaultvalue("")] BSTR url,
+ [in, defaultvalue(L"")] BSTR url,
[in, optional] VARIANT *varArgIn,
[in, optional] VARIANT *options,
[out, retval] IHTMLWindow2 **pDialog);
@@ -12450,15 +12450,15 @@ methods:
void clearTimeout([in] LONG timerID);
[id(DISPID_IHTMLWINDOW2_ALERT)]
- void alert([in, defaultvalue("")] BSTR message);
+ void alert([in, defaultvalue(L"")] BSTR message);
[id(DISPID_IHTMLWINDOW2_CONFIRM)]
- VARIANT_BOOL confirm([in, defaultvalue("")] BSTR message);
+ VARIANT_BOOL confirm([in, defaultvalue(L"")] BSTR message);
[id(DISPID_IHTMLWINDOW2_PROMPT)]
VARIANT prompt(
- [in, defaultvalue("")] BSTR message,
- [in, defaultvalue("undefined")] BSTR defstr);
+ [in, defaultvalue(L"")] BSTR message,
+ [in, defaultvalue(L"undefined")] BSTR defstr);
[propget, id(DISPID_IHTMLWINDOW2_IMAGE)]
IHTMLImageElementFactory *Image();
@@ -12492,9 +12492,9 @@ methods:
[id(DISPID_IHTMLWINDOW2_OPEN)]
IHTMLWindow2 *open(
- [in, defaultvalue("")] BSTR url,
- [in, defaultvalue("")] BSTR name,
- [in, defaultvalue("")] BSTR features,
+ [in, defaultvalue(L"")] BSTR url,
+ [in, defaultvalue(L"")] BSTR name,
+ [in, defaultvalue(L"")] BSTR features,
[in, defaultvalue(0)] VARIANT_BOOL replace);
[propget, id(DISPID_IHTMLWINDOW2_SELF)]
@@ -12579,7 +12579,7 @@ methods:
void showHelp(
[in] BSTR helpURL,
[in, optional] VARIANT helpArg,
- [in, defaultvalue("")] BSTR features);
+ [in, defaultvalue(L"")] BSTR features);
[propget, id(DISPID_IHTMLWINDOW2_SCREEN)]
IHTMLScreen *screen();
@@ -12614,7 +12614,7 @@ methods:
[id(DISPID_IHTMLWINDOW2_EXECSCRIPT)]
VARIANT execScript(
[in] BSTR _code,
- [in, defaultvalue("JScript")] BSTR language);
+ [in, defaultvalue(L"JScript")] BSTR language);
[id(DISPID_IHTMLWINDOW2_TOSTRING)]
BSTR toString();
@@ -12688,7 +12688,7 @@ methods:
[id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)]
IHTMLWindow2 *showModelessDialog(
- [in, defaultvalue("")] BSTR url,
+ [in, defaultvalue(L"")] BSTR url,
[in, optional] VARIANT *varArgIn,
[in, optional] VARIANT *options);
@@ -12769,14 +12769,14 @@ methods:
void clearTimeout([in] LONG timerID);
[id(DISPID_IHTMLWINDOW2_ALERT)]
- void alert([defaultvalue(""), in] BSTR message);
+ void alert([defaultvalue(L""), in] BSTR message);
[id(DISPID_IHTMLWINDOW2_CONFIRM)]
- VARIANT_BOOL confirm([defaultvalue(""), in] BSTR message);
+ VARIANT_BOOL confirm([defaultvalue(L""), in] BSTR message);
[id(DISPID_IHTMLWINDOW2_PROMPT)]
- VARIANT prompt([defaultvalue(""), in] BSTR message,
- [defaultvalue("undefined"), in] BSTR defstr);
+ VARIANT prompt([defaultvalue(L""), in] BSTR message,
+ [defaultvalue(L"undefined"), in] BSTR defstr);
[propget, id(DISPID_IHTMLWINDOW2_IMAGE)]
IHTMLImageElementFactory* Image();
@@ -12809,9 +12809,9 @@ methods:
IHTMLWindow2* parent();
[id(DISPID_IHTMLWINDOW2_OPEN)]
- IHTMLWindow2* open([defaultvalue(""), in] BSTR url,
- [defaultvalue(""), in] BSTR name,
- [defaultvalue(""), in] BSTR features,
+ IHTMLWindow2* open([defaultvalue(L""), in] BSTR url,
+ [defaultvalue(L""), in] BSTR name,
+ [defaultvalue(L""), in] BSTR features,
[defaultvalue(0), in] VARIANT_BOOL replace);
[propget, id(DISPID_IHTMLWINDOW2_SELF)]
@@ -12897,7 +12897,7 @@ methods:
[id(DISPID_IHTMLWINDOW2_SHOWHELP)]
void showHelp([in] BSTR helpURL,
[optional, in] VARIANT helpArg,
- [defaultvalue(""), in] BSTR features);
+ [defaultvalue(L""), in] BSTR features);
[propget, id(DISPID_IHTMLWINDOW2_SCREEN)]
IHTMLScreen* screen();
@@ -12932,7 +12932,7 @@ methods:
[id(DISPID_IHTMLWINDOW2_EXECSCRIPT)]
VARIANT execScript([in] BSTR code,
- [defaultvalue("JScript"), in] BSTR language);
+ [defaultvalue(L"JScript"), in] BSTR language);
[id(DISPID_IHTMLWINDOW2_TOSTRING)]
BSTR toString();
@@ -13007,7 +13007,7 @@ methods:
IHTMLDataTransfer* clipboardData();
[id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)]
- IHTMLWindow2* showModelessDialog([defaultvalue(""), in] BSTR url,
+ IHTMLWindow2* showModelessDialog([defaultvalue(L""), in] BSTR url,
[optional, in] VARIANT* varArgIn,
[optional, in] VARIANT* options);
@@ -14041,7 +14041,7 @@ interface IHTMLDocument2 : IHTMLDocument
[id(DISPID_IHTMLDOCUMENT2_OPEN)]
HRESULT open(
- [defaultvalue("text/html"), in] BSTR url,
+ [defaultvalue(L"text/html"), in] BSTR url,
[optional, in] VARIANT name,
[optional, in] VARIANT features,
[optional, in] VARIANT replace,
@@ -14231,7 +14231,7 @@ interface IHTMLDocument2 : IHTMLDocument
[id(DISPID_IHTMLDOCUMENT2_CREATESTYLESHEET)]
HRESULT createStyleSheet(
- [defaultvalue(""), in] BSTR bstrHref,
+ [defaultvalue(L""), in] BSTR bstrHref,
[defaultvalue(-1), in] LONG lIndex,
[retval, out] IHTMLStyleSheet **ppnewStyleSheet);
}
@@ -15083,7 +15083,7 @@ methods:
[id(DISPID_IHTMLDOCUMENT2_OPEN)]
IDispatch *open(
- [defaultvalue("text/html"), in] BSTR url,
+ [defaultvalue(L"text/html"), in] BSTR url,
[optional, in] VARIANT name,
[optional, in] VARIANT features,
[optional, in] VARIANT replace);
@@ -15254,7 +15254,7 @@ methods:
[id(DISPID_IHTMLDOCUMENT2_CREATESTYLESHEET)]
IHTMLStyleSheet *createStyleSheet(
- [defaultvalue(""), in] BSTR bstrHref,
+ [defaultvalue(L""), in] BSTR bstrHref,
[defaultvalue(-1), in] LONG lIndex);
[id(DISPID_IHTMLDOCUMENT3_RELEASECAPTURE)]
--
2.6.2
More information about the wine-patches
mailing list