[PATCH 07/15] programs/[cw]script: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Fri Jan 28 10:58:18 CST 2022
---
programs/cscript/Makefile.in | 2 +-
programs/wscript/Makefile.in | 1 -
programs/wscript/arguments.c | 8 ++++----
programs/wscript/host.c | 10 +++++-----
programs/wscript/main.c | 6 +++---
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in
index 2795a66eeca..d87a28fcc54 100644
--- a/programs/cscript/Makefile.in
+++ b/programs/cscript/Makefile.in
@@ -1,6 +1,6 @@
MODULE = cscript.exe
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DCSCRIPT_BUILD
+EXTRADEFS = -DCSCRIPT_BUILD
PARENTSRC = ../wscript
EXTRADLLFLAGS = -mwindows -municode
diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in
index 77d276d6c01..33b2e66d9bc 100644
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wscript.exe
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32
diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c
index 7961948b6a5..a97752f8452 100644
--- a/programs/wscript/arguments.c
+++ b/programs/wscript/arguments.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pcti
static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LCID lcid,
ITypeInfo **ppTInfo)
{
- WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo);
+ WINE_TRACE("(%x %lx %p\n", iTInfo, lcid, ppTInfo);
ITypeInfo_AddRef(arguments_ti);
*ppTInfo = arguments_ti;
@@ -80,7 +80,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LC
static HRESULT WINAPI Arguments2_GetIDsOfNames(IArguments2 *iface, REFIID riid, LPOLESTR *rgszNames,
UINT cNames, LCID lcid, DISPID *rgDispId)
{
- WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames,
+ WINE_TRACE("(%s %p %d %lx %p)\n", wine_dbgstr_guid(riid), rgszNames,
cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(arguments_ti, rgszNames, cNames, rgDispId);
@@ -90,7 +90,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember,
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult);
+ WINE_TRACE("(%ld %p %p)\n", dispIdMember, pDispParams, pVarResult);
return ITypeInfo_Invoke(arguments_ti, iface, dispIdMember, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr);
@@ -98,7 +98,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember,
static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value)
{
- WINE_TRACE("(%d %p)\n", index, out_Value);
+ WINE_TRACE("(%ld %p)\n", index, out_Value);
if(index<0 || index >= numOfArgs)
return E_INVALIDARG;
diff --git a/programs/wscript/host.c b/programs/wscript/host.c
index 8765dd271f4..bd16b7b4cbe 100644
--- a/programs/wscript/host.c
+++ b/programs/wscript/host.c
@@ -126,7 +126,7 @@ static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo)
static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid,
ITypeInfo **ppTInfo)
{
- WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo);
+ WINE_TRACE("(%x %lx %p\n", iTInfo, lcid, ppTInfo);
ITypeInfo_AddRef(host_ti);
*ppTInfo = host_ti;
@@ -136,7 +136,7 @@ static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid,
static HRESULT WINAPI Host_GetIDsOfNames(IHost *iface, REFIID riid, LPOLESTR *rgszNames,
UINT cNames, LCID lcid, DISPID *rgDispId)
{
- WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames,
+ WINE_TRACE("(%s %p %d %lx %p)\n", wine_dbgstr_guid(riid), rgszNames,
cNames, lcid, rgDispId);
return ITypeInfo_GetIDsOfNames(host_ti, rgszNames, cNames, rgDispId);
@@ -146,7 +146,7 @@ static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult);
+ WINE_TRACE("(%ld %p %p)\n", dispIdMember, pDispParams, pVarResult);
return ITypeInfo_Invoke(host_ti, iface, dispIdMember, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr);
@@ -278,7 +278,7 @@ static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout)
static HRESULT WINAPI Host_put_Timeout(IHost *iface, LONG v)
{
- WINE_FIXME("(%d)\n", v);
+ WINE_FIXME("(%ld)\n", v);
return E_NOTIMPL;
}
@@ -396,7 +396,7 @@ static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object)
static HRESULT WINAPI Host_Sleep(IHost *iface, LONG Time)
{
- WINE_FIXME("(%d)\n", Time);
+ WINE_FIXME("(%ld)\n", Time);
return E_NOTIMPL;
}
diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index a7005a9289c..12571181491 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -81,7 +81,7 @@ static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *p
static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface,
LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppunkItem, ITypeInfo **ppti)
{
- WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti);
+ WINE_TRACE("(%s %lx %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti);
if(lstrcmpW(pstrName, L"WSH") && lstrcmpW(pstrName, L"WScript"))
return E_FAIL;
@@ -368,13 +368,13 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri
SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL);
SysFreeString(text);
if(FAILED(hres)) {
- WINE_FIXME("ParseScriptText failed: %08x\n", hres);
+ WINE_FIXME("ParseScriptText failed: %08lx\n", hres);
return;
}
hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED);
if(FAILED(hres))
- WINE_FIXME("SetScriptState failed: %08x\n", hres);
+ WINE_FIXME("SetScriptState failed: %08lx\n", hres);
}
static BOOL set_host_properties(const WCHAR *prop)
More information about the wine-devel
mailing list