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
3f046913
Commit
3f046913
authored
Feb 09, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compobj.dll16: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1216170b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
15 deletions
+14
-15
Makefile.in
dlls/compobj.dll16/Makefile.in
+0
-1
compobj.c
dlls/compobj.dll16/compobj.c
+14
-14
No files found.
dlls/compobj.dll16/Makefile.in
View file @
3f046913
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
compobj.dll16
MODULE
=
compobj.dll16
IMPORTS
=
uuid ole32 advapi32
IMPORTS
=
uuid ole32 advapi32
EXTRADLLFLAGS
=
-m16
-Wb
,--main-module,ole32.dll
EXTRADLLFLAGS
=
-m16
-Wb
,--main-module,ole32.dll
...
...
dlls/compobj.dll16/compobj.c
View file @
3f046913
...
@@ -143,7 +143,7 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface)
...
@@ -143,7 +143,7 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface)
{
{
IMalloc16Impl
*
malloc
=
impl_from_IMalloc16
(
iface
);
IMalloc16Impl
*
malloc
=
impl_from_IMalloc16
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
malloc
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
malloc
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
malloc
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
malloc
,
refcount
);
return
refcount
;
return
refcount
;
}
}
...
@@ -154,7 +154,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
...
@@ -154,7 +154,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
{
{
IMalloc16Impl
*
malloc
=
impl_from_IMalloc16
(
MapSL
(
iface
));
IMalloc16Impl
*
malloc
=
impl_from_IMalloc16
(
MapSL
(
iface
));
ULONG
refcount
=
InterlockedDecrement
(
&
malloc
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
malloc
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
malloc
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
malloc
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
UnMapLS
(
iface
);
UnMapLS
(
iface
);
...
@@ -169,7 +169,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
...
@@ -169,7 +169,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface)
SEGPTR
CDECL
IMalloc16_fnAlloc
(
IMalloc16
*
iface
,
DWORD
cb
)
{
SEGPTR
CDECL
IMalloc16_fnAlloc
(
IMalloc16
*
iface
,
DWORD
cb
)
{
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
TRACE
(
"(%p)->Alloc(%d)
\n
"
,
This
,
cb
);
TRACE
(
"(%p)->Alloc(%
l
d)
\n
"
,
This
,
cb
);
return
MapLS
(
HeapAlloc
(
GetProcessHeap
(),
0
,
cb
)
);
return
MapLS
(
HeapAlloc
(
GetProcessHeap
(),
0
,
cb
)
);
}
}
...
@@ -180,7 +180,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
...
@@ -180,7 +180,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
{
{
void
*
ptr
=
MapSL
(
pv
);
void
*
ptr
=
MapSL
(
pv
);
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
TRACE
(
"(%p)->Free(%08x)
\n
"
,
This
,
pv
);
TRACE
(
"(%p)->Free(%08
l
x)
\n
"
,
This
,
pv
);
UnMapLS
(
pv
);
UnMapLS
(
pv
);
HeapFree
(
GetProcessHeap
(),
0
,
ptr
);
HeapFree
(
GetProcessHeap
(),
0
,
ptr
);
}
}
...
@@ -193,7 +193,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
...
@@ -193,7 +193,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
SEGPTR
ret
;
SEGPTR
ret
;
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
TRACE
(
"(%p)->Realloc(%08
x,%
d)
\n
"
,
This
,
pv
,
cb
);
TRACE
(
"(%p)->Realloc(%08
lx,%l
d)
\n
"
,
This
,
pv
,
cb
);
if
(
!
pv
)
if
(
!
pv
)
ret
=
IMalloc16_fnAlloc
(
iface
,
cb
);
ret
=
IMalloc16_fnAlloc
(
iface
,
cb
);
else
if
(
cb
)
{
else
if
(
cb
)
{
...
@@ -213,7 +213,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
...
@@ -213,7 +213,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
{
{
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
IMalloc16Impl
*
This
=
impl_from_IMalloc16
(
iface
);
TRACE
(
"(%p)->GetSize(%08x)
\n
"
,
This
,
pv
);
TRACE
(
"(%p)->GetSize(%08
l
x)
\n
"
,
This
,
pv
);
return
HeapSize
(
GetProcessHeap
(),
0
,
MapSL
(
pv
)
);
return
HeapSize
(
GetProcessHeap
(),
0
,
MapSL
(
pv
)
);
}
}
...
@@ -301,11 +301,11 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc)
...
@@ -301,11 +301,11 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc)
*/
*/
SEGPTR
WINAPI
CoMemAlloc
(
DWORD
size
,
MEMCTX
context
,
DWORD
unknown
)
SEGPTR
WINAPI
CoMemAlloc
(
DWORD
size
,
MEMCTX
context
,
DWORD
unknown
)
{
{
TRACE
(
"size %
u, context %d, unknown %#
x.
\n
"
,
size
,
context
,
unknown
);
TRACE
(
"size %
lu, context %d, unknown %#l
x.
\n
"
,
size
,
context
,
unknown
);
if
(
context
!=
MEMCTX_TASK
)
if
(
context
!=
MEMCTX_TASK
)
FIXME
(
"Ignoring context %d.
\n
"
,
context
);
FIXME
(
"Ignoring context %d.
\n
"
,
context
);
if
(
unknown
)
if
(
unknown
)
FIXME
(
"Ignoring unknown parameter %#x.
\n
"
,
unknown
);
FIXME
(
"Ignoring unknown parameter %#
l
x.
\n
"
,
unknown
);
return
call_IMalloc_Alloc
(
compobj_malloc
,
size
);
return
call_IMalloc_Alloc
(
compobj_malloc
,
size
);
}
}
...
@@ -504,7 +504,7 @@ HRESULT WINAPI CoRegisterClassObject16(
...
@@ -504,7 +504,7 @@ HRESULT WINAPI CoRegisterClassObject16(
DWORD
flags
,
/* [in] REGCLS flags indicating how connections are made */
DWORD
flags
,
/* [in] REGCLS flags indicating how connections are made */
LPDWORD
lpdwRegister
LPDWORD
lpdwRegister
)
{
)
{
FIXME
(
"(%s,%p,0x%08
x,0x%08
x,%p),stub
\n
"
,
FIXME
(
"(%s,%p,0x%08
lx,0x%08l
x,%p),stub
\n
"
,
debugstr_guid
(
rclsid
),
pUnk
,
dwClsContext
,
flags
,
lpdwRegister
debugstr_guid
(
rclsid
),
pUnk
,
dwClsContext
,
flags
,
lpdwRegister
);
);
return
0
;
return
0
;
...
@@ -516,7 +516,7 @@ HRESULT WINAPI CoRegisterClassObject16(
...
@@ -516,7 +516,7 @@ HRESULT WINAPI CoRegisterClassObject16(
*/
*/
HRESULT
WINAPI
CoRevokeClassObject16
(
DWORD
dwRegister
)
/* [in] token on class obj */
HRESULT
WINAPI
CoRevokeClassObject16
(
DWORD
dwRegister
)
/* [in] token on class obj */
{
{
FIXME
(
"(0x%08x),stub!
\n
"
,
dwRegister
);
FIXME
(
"(0x%08
l
x),stub!
\n
"
,
dwRegister
);
return
0
;
return
0
;
}
}
...
@@ -613,7 +613,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state)
...
@@ -613,7 +613,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state)
*/
*/
BOOL
WINAPI
COMPOBJ_DllEntryPoint
(
DWORD
Reason
,
HINSTANCE16
hInst
,
WORD
ds
,
WORD
HeapSize
,
DWORD
res1
,
WORD
res2
)
BOOL
WINAPI
COMPOBJ_DllEntryPoint
(
DWORD
Reason
,
HINSTANCE16
hInst
,
WORD
ds
,
WORD
HeapSize
,
DWORD
res1
,
WORD
res2
)
{
{
TRACE
(
"(%08
x, %04x, %04x, %04x, %08
x, %04x)
\n
"
,
Reason
,
hInst
,
ds
,
HeapSize
,
res1
,
res2
);
TRACE
(
"(%08
lx, %04x, %04x, %04x, %08l
x, %04x)
\n
"
,
Reason
,
hInst
,
ds
,
HeapSize
,
res1
,
res2
);
return
TRUE
;
return
TRUE
;
}
}
...
@@ -738,7 +738,7 @@ HRESULT WINAPI CoGetClassObject16(
...
@@ -738,7 +738,7 @@ HRESULT WINAPI CoGetClassObject16(
WOWCallback16Ex
((
DWORD
)
DllGetClassObject
,
WCB16_PASCAL
,
sizeof
(
args
),
args
,
&
dwRet
);
WOWCallback16Ex
((
DWORD
)
DllGetClassObject
,
WCB16_PASCAL
,
sizeof
(
args
),
args
,
&
dwRet
);
if
(
dwRet
!=
S_OK
)
if
(
dwRet
!=
S_OK
)
{
{
ERR
(
"DllGetClassObject returned error 0x%08x
\n
"
,
dwRet
);
ERR
(
"DllGetClassObject returned error 0x%08
l
x
\n
"
,
dwRet
);
FreeLibrary16
(
dll
);
FreeLibrary16
(
dll
);
return
dwRet
;
return
dwRet
;
}
}
...
@@ -768,7 +768,7 @@ HRESULT WINAPI CoCreateInstance16(
...
@@ -768,7 +768,7 @@ HRESULT WINAPI CoCreateInstance16(
REFIID
iid
,
REFIID
iid
,
LPVOID
*
ppv
)
LPVOID
*
ppv
)
{
{
FIXME
(
"(%s, %p, %x, %s, %p), stub!
\n
"
,
FIXME
(
"(%s, %p, %
l
x, %s, %p), stub!
\n
"
,
debugstr_guid
(
rclsid
),
pUnkOuter
,
dwClsContext
,
debugstr_guid
(
iid
),
debugstr_guid
(
rclsid
),
pUnkOuter
,
dwClsContext
,
debugstr_guid
(
iid
),
ppv
ppv
);
);
...
@@ -780,6 +780,6 @@ HRESULT WINAPI CoCreateInstance16(
...
@@ -780,6 +780,6 @@ HRESULT WINAPI CoCreateInstance16(
*/
*/
HRESULT
WINAPI
CoDisconnectObject16
(
LPUNKNOWN
lpUnk
,
DWORD
reserved
)
HRESULT
WINAPI
CoDisconnectObject16
(
LPUNKNOWN
lpUnk
,
DWORD
reserved
)
{
{
FIXME
(
"(%p, 0x%08x): stub!
\n
"
,
lpUnk
,
reserved
);
FIXME
(
"(%p, 0x%08
l
x): stub!
\n
"
,
lpUnk
,
reserved
);
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
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