Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
8008c7d7
Commit
8008c7d7
authored
Feb 04, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[cw]script: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
620305d9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
14 deletions
+13
-14
Makefile.in
programs/cscript/Makefile.in
+1
-1
Makefile.in
programs/wscript/Makefile.in
+0
-1
arguments.c
programs/wscript/arguments.c
+4
-4
host.c
programs/wscript/host.c
+5
-5
main.c
programs/wscript/main.c
+3
-3
No files found.
programs/cscript/Makefile.in
View file @
8008c7d7
MODULE
=
cscript.exe
MODULE
=
cscript.exe
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
EXTRADEFS
=
-D
WINE_NO_LONG_TYPES
-D
CSCRIPT_BUILD
EXTRADEFS
=
-DCSCRIPT_BUILD
PARENTSRC
=
../wscript
PARENTSRC
=
../wscript
EXTRADLLFLAGS
=
-mwindows
-municode
EXTRADLLFLAGS
=
-mwindows
-municode
...
...
programs/wscript/Makefile.in
View file @
8008c7d7
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
wscript.exe
MODULE
=
wscript.exe
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
...
...
programs/wscript/arguments.c
View file @
8008c7d7
...
@@ -70,7 +70,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pcti
...
@@ -70,7 +70,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pcti
static
HRESULT
WINAPI
Arguments2_GetTypeInfo
(
IArguments2
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
static
HRESULT
WINAPI
Arguments2_GetTypeInfo
(
IArguments2
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
ITypeInfo
**
ppTInfo
)
{
{
WINE_TRACE
(
"(%x %x %p
\n
"
,
iTInfo
,
lcid
,
ppTInfo
);
WINE_TRACE
(
"(%x %
l
x %p
\n
"
,
iTInfo
,
lcid
,
ppTInfo
);
ITypeInfo_AddRef
(
arguments_ti
);
ITypeInfo_AddRef
(
arguments_ti
);
*
ppTInfo
=
arguments_ti
;
*
ppTInfo
=
arguments_ti
;
...
@@ -80,7 +80,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LC
...
@@ -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
,
static
HRESULT
WINAPI
Arguments2_GetIDsOfNames
(
IArguments2
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
{
WINE_TRACE
(
"(%s %p %d %x %p)
\n
"
,
wine_dbgstr_guid
(
riid
),
rgszNames
,
WINE_TRACE
(
"(%s %p %d %
l
x %p)
\n
"
,
wine_dbgstr_guid
(
riid
),
rgszNames
,
cNames
,
lcid
,
rgDispId
);
cNames
,
lcid
,
rgDispId
);
return
ITypeInfo_GetIDsOfNames
(
arguments_ti
,
rgszNames
,
cNames
,
rgDispId
);
return
ITypeInfo_GetIDsOfNames
(
arguments_ti
,
rgszNames
,
cNames
,
rgDispId
);
...
@@ -90,7 +90,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember,
...
@@ -90,7 +90,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
{
WINE_TRACE
(
"(%d %p %p)
\n
"
,
dispIdMember
,
pDispParams
,
pVarResult
);
WINE_TRACE
(
"(%
l
d %p %p)
\n
"
,
dispIdMember
,
pDispParams
,
pVarResult
);
return
ITypeInfo_Invoke
(
arguments_ti
,
iface
,
dispIdMember
,
wFlags
,
pDispParams
,
return
ITypeInfo_Invoke
(
arguments_ti
,
iface
,
dispIdMember
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
pVarResult
,
pExcepInfo
,
puArgErr
);
...
@@ -98,7 +98,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember,
...
@@ -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
)
static
HRESULT
WINAPI
Arguments2_Item
(
IArguments2
*
iface
,
LONG
index
,
BSTR
*
out_Value
)
{
{
WINE_TRACE
(
"(%d %p)
\n
"
,
index
,
out_Value
);
WINE_TRACE
(
"(%
l
d %p)
\n
"
,
index
,
out_Value
);
if
(
index
<
0
||
index
>=
numOfArgs
)
if
(
index
<
0
||
index
>=
numOfArgs
)
return
E_INVALIDARG
;
return
E_INVALIDARG
;
...
...
programs/wscript/host.c
View file @
8008c7d7
...
@@ -126,7 +126,7 @@ static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo)
...
@@ -126,7 +126,7 @@ static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo)
static
HRESULT
WINAPI
Host_GetTypeInfo
(
IHost
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
static
HRESULT
WINAPI
Host_GetTypeInfo
(
IHost
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
ITypeInfo
**
ppTInfo
)
{
{
WINE_TRACE
(
"(%x %x %p
\n
"
,
iTInfo
,
lcid
,
ppTInfo
);
WINE_TRACE
(
"(%x %
l
x %p
\n
"
,
iTInfo
,
lcid
,
ppTInfo
);
ITypeInfo_AddRef
(
host_ti
);
ITypeInfo_AddRef
(
host_ti
);
*
ppTInfo
=
host_ti
;
*
ppTInfo
=
host_ti
;
...
@@ -136,7 +136,7 @@ static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid,
...
@@ -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
,
static
HRESULT
WINAPI
Host_GetIDsOfNames
(
IHost
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
{
WINE_TRACE
(
"(%s %p %d %x %p)
\n
"
,
wine_dbgstr_guid
(
riid
),
rgszNames
,
WINE_TRACE
(
"(%s %p %d %
l
x %p)
\n
"
,
wine_dbgstr_guid
(
riid
),
rgszNames
,
cNames
,
lcid
,
rgDispId
);
cNames
,
lcid
,
rgDispId
);
return
ITypeInfo_GetIDsOfNames
(
host_ti
,
rgszNames
,
cNames
,
rgDispId
);
return
ITypeInfo_GetIDsOfNames
(
host_ti
,
rgszNames
,
cNames
,
rgDispId
);
...
@@ -146,7 +146,7 @@ static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid
...
@@ -146,7 +146,7 @@ static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
{
WINE_TRACE
(
"(%d %p %p)
\n
"
,
dispIdMember
,
pDispParams
,
pVarResult
);
WINE_TRACE
(
"(%
l
d %p %p)
\n
"
,
dispIdMember
,
pDispParams
,
pVarResult
);
return
ITypeInfo_Invoke
(
host_ti
,
iface
,
dispIdMember
,
wFlags
,
pDispParams
,
return
ITypeInfo_Invoke
(
host_ti
,
iface
,
dispIdMember
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
pVarResult
,
pExcepInfo
,
puArgErr
);
...
@@ -278,7 +278,7 @@ static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout)
...
@@ -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
)
static
HRESULT
WINAPI
Host_put_Timeout
(
IHost
*
iface
,
LONG
v
)
{
{
WINE_FIXME
(
"(%d)
\n
"
,
v
);
WINE_FIXME
(
"(%
l
d)
\n
"
,
v
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
...
@@ -396,7 +396,7 @@ static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object)
...
@@ -396,7 +396,7 @@ static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object)
static
HRESULT
WINAPI
Host_Sleep
(
IHost
*
iface
,
LONG
Time
)
static
HRESULT
WINAPI
Host_Sleep
(
IHost
*
iface
,
LONG
Time
)
{
{
WINE_FIXME
(
"(%d)
\n
"
,
Time
);
WINE_FIXME
(
"(%
l
d)
\n
"
,
Time
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
...
...
programs/wscript/main.c
View file @
8008c7d7
...
@@ -81,7 +81,7 @@ static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *p
...
@@ -81,7 +81,7 @@ static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *p
static
HRESULT
WINAPI
ActiveScriptSite_GetItemInfo
(
IActiveScriptSite
*
iface
,
static
HRESULT
WINAPI
ActiveScriptSite_GetItemInfo
(
IActiveScriptSite
*
iface
,
LPCOLESTR
pstrName
,
DWORD
dwReturnMask
,
IUnknown
**
ppunkItem
,
ITypeInfo
**
ppti
)
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 %
l
x %p %p)
\n
"
,
wine_dbgstr_w
(
pstrName
),
dwReturnMask
,
ppunkItem
,
ppti
);
if
(
lstrcmpW
(
pstrName
,
L"WSH"
)
&&
lstrcmpW
(
pstrName
,
L"WScript"
))
if
(
lstrcmpW
(
pstrName
,
L"WSH"
)
&&
lstrcmpW
(
pstrName
,
L"WScript"
))
return
E_FAIL
;
return
E_FAIL
;
...
@@ -368,13 +368,13 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri
...
@@ -368,13 +368,13 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri
SCRIPTTEXT_HOSTMANAGESSOURCE
|
SCRIPTITEM_ISVISIBLE
,
NULL
,
NULL
);
SCRIPTTEXT_HOSTMANAGESSOURCE
|
SCRIPTITEM_ISVISIBLE
,
NULL
,
NULL
);
SysFreeString
(
text
);
SysFreeString
(
text
);
if
(
FAILED
(
hres
))
{
if
(
FAILED
(
hres
))
{
WINE_FIXME
(
"ParseScriptText failed: %08x
\n
"
,
hres
);
WINE_FIXME
(
"ParseScriptText failed: %08
l
x
\n
"
,
hres
);
return
;
return
;
}
}
hres
=
IActiveScript_SetScriptState
(
script
,
SCRIPTSTATE_STARTED
);
hres
=
IActiveScript_SetScriptState
(
script
,
SCRIPTSTATE_STARTED
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
WINE_FIXME
(
"SetScriptState failed: %08x
\n
"
,
hres
);
WINE_FIXME
(
"SetScriptState failed: %08
l
x
\n
"
,
hres
);
}
}
static
BOOL
set_host_properties
(
const
WCHAR
*
prop
)
static
BOOL
set_host_properties
(
const
WCHAR
*
prop
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment