Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
438b3794
Commit
438b3794
authored
Feb 16, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 16, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole2.dll16: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
95df81e0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
Makefile.in
dlls/ole2.dll16/Makefile.in
+0
-1
memlockbytes.c
dlls/ole2.dll16/memlockbytes.c
+3
-3
ole2.c
dlls/ole2.dll16/ole2.c
+6
-6
No files found.
dlls/ole2.dll16/Makefile.in
View file @
438b3794
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
ole2.dll16
MODULE
=
ole2.dll16
IMPORTS
=
uuid ole32 user32 gdi32
IMPORTS
=
uuid ole32 user32 gdi32
EXTRADLLFLAGS
=
-m16
-Wb
,--main-module,ole32.dll
EXTRADLLFLAGS
=
-m16
-Wb
,--main-module,ole32.dll
...
...
dlls/ole2.dll16/memlockbytes.c
View file @
438b3794
...
@@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt(
...
@@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt(
ULONG
bytesReadBuffer
=
0
;
ULONG
bytesReadBuffer
=
0
;
ULONG
bytesToReadFromBuffer
;
ULONG
bytesToReadFromBuffer
;
TRACE
(
"(%p,%
d,%p,%
d,%p)
\n
"
,
This
,
ulOffset
.
u
.
LowPart
,
pv
,
cb
,
pcbRead
);
TRACE
(
"(%p,%
ld,%p,%l
d,%p)
\n
"
,
This
,
ulOffset
.
u
.
LowPart
,
pv
,
cb
,
pcbRead
);
/*
/*
* If the caller is not interested in the number of bytes read,
* If the caller is not interested in the number of bytes read,
* we use another buffer to avoid "if" statements in the code.
* we use another buffer to avoid "if" statements in the code.
...
@@ -339,7 +339,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize(
...
@@ -339,7 +339,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize(
HGLOBALLockBytesImpl16
*
const
This
=
impl_from_ILockBytes16
(
iface
);
HGLOBALLockBytesImpl16
*
const
This
=
impl_from_ILockBytes16
(
iface
);
HGLOBAL16
supportHandle
;
HGLOBAL16
supportHandle
;
TRACE
(
"(%p,%d)
\n
"
,
This
,
libNewSize
.
u
.
LowPart
);
TRACE
(
"(%p,%
l
d)
\n
"
,
This
,
libNewSize
.
u
.
LowPart
);
/*
/*
* As documented.
* As documented.
*/
*/
...
@@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt(
...
@@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt(
ULARGE_INTEGER
newSize
;
ULARGE_INTEGER
newSize
;
ULONG
bytesWritten
=
0
;
ULONG
bytesWritten
=
0
;
TRACE
(
"(%p,%
d,%p,%
d,%p)
\n
"
,
This
,
ulOffset
.
u
.
LowPart
,
pv
,
cb
,
pcbWritten
);
TRACE
(
"(%p,%
ld,%p,%l
d,%p)
\n
"
,
This
,
ulOffset
.
u
.
LowPart
,
pv
,
cb
,
pcbWritten
);
/*
/*
* If the caller is not interested in the number of bytes written,
* If the caller is not interested in the number of bytes written,
* we use another buffer to avoid "if" statements in the code.
* we use another buffer to avoid "if" statements in the code.
...
...
dlls/ole2.dll16/ole2.c
View file @
438b3794
...
@@ -95,7 +95,7 @@ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
...
@@ -95,7 +95,7 @@ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*/
*/
HRESULT
WINAPI
GetRunningObjectTable16
(
DWORD
reserved
,
LPRUNNINGOBJECTTABLE
*
pprot
)
HRESULT
WINAPI
GetRunningObjectTable16
(
DWORD
reserved
,
LPRUNNINGOBJECTTABLE
*
pprot
)
{
{
FIXME
(
"(%d,%p),stub!
\n
"
,
reserved
,
pprot
);
FIXME
(
"(%
l
d,%p),stub!
\n
"
,
reserved
,
pprot
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
...
@@ -232,7 +232,7 @@ HRESULT WINAPI OleLoad16(
...
@@ -232,7 +232,7 @@ HRESULT WINAPI OleLoad16(
SEGPTR
pClientSite
,
SEGPTR
pClientSite
,
LPVOID
*
ppvObj
)
LPVOID
*
ppvObj
)
{
{
FIXME
(
"(%
x,%s,%
x,%p), stub!
\n
"
,
pStg
,
debugstr_guid
(
riid
),
pClientSite
,
ppvObj
);
FIXME
(
"(%
lx,%s,%l
x,%p), stub!
\n
"
,
pStg
,
debugstr_guid
(
riid
),
pClientSite
,
ppvObj
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
...
@@ -305,7 +305,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
...
@@ -305,7 +305,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
HRESULT
hres
;
HRESULT
hres
;
DWORD
args
[
3
];
DWORD
args
[
3
];
TRACE
(
"(%x, %p)
\n
"
,
pstg
,
pclsid
);
TRACE
(
"(%
l
x, %p)
\n
"
,
pstg
,
pclsid
);
if
(
!
pclsid
)
if
(
!
pclsid
)
return
E_INVALIDARG16
;
return
E_INVALIDARG16
;
...
@@ -330,7 +330,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
...
@@ -330,7 +330,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
(
LPDWORD
)
&
hres
(
LPDWORD
)
&
hres
))
{
))
{
WOWGlobalUnlockFree16
(
args
[
1
]);
WOWGlobalUnlockFree16
(
args
[
1
]);
ERR
(
"CallTo16 IStorage16::Stat() failed, hres %x
\n
"
,
hres
);
ERR
(
"CallTo16 IStorage16::Stat() failed, hres %
l
x
\n
"
,
hres
);
return
hres
;
return
hres
;
}
}
memcpy
(
&
statstg
,
MapSL
(
args
[
1
]),
sizeof
(
STATSTG16
));
memcpy
(
&
statstg
,
MapSL
(
args
[
1
]),
sizeof
(
STATSTG16
));
...
@@ -352,7 +352,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
...
@@ -352,7 +352,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
HRESULT
hres
;
HRESULT
hres
;
DWORD
args
[
4
];
DWORD
args
[
4
];
TRACE
(
"(0x%x, %p)
\n
"
,
stream
,
clsid
);
TRACE
(
"(0x%
l
x, %p)
\n
"
,
stream
,
clsid
);
if
(
!
clsid
)
if
(
!
clsid
)
return
E_INVALIDARG16
;
return
E_INVALIDARG16
;
...
@@ -386,7 +386,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
...
@@ -386,7 +386,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid)
}
}
else
else
{
{
ERR
(
"CallTo16 IStream16::Read() failed, hres %x
\n
"
,
hres
);
ERR
(
"CallTo16 IStream16::Read() failed, hres %
l
x
\n
"
,
hres
);
hres
=
E_FAIL
;
hres
=
E_FAIL
;
}
}
WOWGlobalUnlockFree16
(
args
[
1
]);
WOWGlobalUnlockFree16
(
args
[
1
]);
...
...
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