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
9365e6f6
Commit
9365e6f6
authored
Nov 04, 2023
by
Alex Henrie
Committed by
Alexandre Julliard
Nov 07, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddrawex: Use CRT allocation functions.
parent
38d6ffdb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
12 deletions
+10
-12
ddraw.c
dlls/ddrawex/ddraw.c
+3
-3
ddrawex_private.h
dlls/ddrawex/ddrawex_private.h
+0
-2
main.c
dlls/ddrawex/main.c
+5
-5
surface.c
dlls/ddrawex/surface.c
+2
-2
No files found.
dlls/ddrawex/ddraw.c
View file @
9365e6f6
...
@@ -165,7 +165,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
...
@@ -165,7 +165,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
if
(
!
refcount
)
if
(
!
refcount
)
{
{
IDirectDraw4_Release
(
ddrawex
->
parent
);
IDirectDraw4_Release
(
ddrawex
->
parent
);
heap_
free
(
ddrawex
);
free
(
ddrawex
);
}
}
return
refcount
;
return
refcount
;
...
@@ -1425,7 +1425,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
...
@@ -1425,7 +1425,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
if
(
outer_unknown
)
if
(
outer_unknown
)
FIXME
(
"Implement aggregation in ddrawex's IDirectDraw interface.
\n
"
);
FIXME
(
"Implement aggregation in ddrawex's IDirectDraw interface.
\n
"
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
object
->
ref
=
1
;
object
->
ref
=
1
;
...
@@ -1450,7 +1450,7 @@ err:
...
@@ -1450,7 +1450,7 @@ err:
IDirectDraw4_Release
(
object
->
parent
);
IDirectDraw4_Release
(
object
->
parent
);
if
(
parent
)
if
(
parent
)
IDirectDraw_Release
(
parent
);
IDirectDraw_Release
(
parent
);
heap_
free
(
object
);
free
(
object
);
*
ddraw
=
NULL
;
*
ddraw
=
NULL
;
return
hr
;
return
hr
;
}
}
...
...
dlls/ddrawex/ddrawex_private.h
View file @
9365e6f6
...
@@ -19,8 +19,6 @@
...
@@ -19,8 +19,6 @@
#ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
#include "wine/heap.h"
DEFINE_GUID
(
CLSID_DirectDrawFactory
,
0x4fd2a832
,
0x86c8
,
0x11d0
,
0x8f
,
0xca
,
0x0
,
0xc0
,
0x4f
,
0xd9
,
0x18
,
0x9d
);
DEFINE_GUID
(
CLSID_DirectDrawFactory
,
0x4fd2a832
,
0x86c8
,
0x11d0
,
0x8f
,
0xca
,
0x0
,
0xc0
,
0x4f
,
0xd9
,
0x18
,
0x9d
);
DEFINE_GUID
(
IID_IDirectDrawFactory
,
0x4fd2a833
,
0x86c8
,
0x11d0
,
0x8f
,
0xca
,
0x0
,
0xc0
,
0x4f
,
0xd9
,
0x18
,
0x9d
);
DEFINE_GUID
(
IID_IDirectDrawFactory
,
0x4fd2a833
,
0x86c8
,
0x11d0
,
0x8f
,
0xca
,
0x0
,
0xc0
,
0x4f
,
0xd9
,
0x18
,
0x9d
);
...
...
dlls/ddrawex/main.c
View file @
9365e6f6
...
@@ -82,7 +82,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
...
@@ -82,7 +82,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
TRACE
(
"%p decreasing refcount to %lu.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %lu.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
heap_
free
(
factory
);
free
(
factory
);
return
refcount
;
return
refcount
;
}
}
...
@@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
...
@@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
TRACE
(
"%p decreasing refcount to %lu.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %lu.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
heap_
free
(
factory
);
free
(
factory
);
return
refcount
;
return
refcount
;
}
}
...
@@ -193,13 +193,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
...
@@ -193,13 +193,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
if
(
outer_unknown
)
if
(
outer_unknown
)
return
CLASS_E_NOAGGREGATION
;
return
CLASS_E_NOAGGREGATION
;
if
(
!
(
factory
=
heap_alloc_zero
(
sizeof
(
*
factory
))))
if
(
!
(
factory
=
calloc
(
1
,
sizeof
(
*
factory
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
factory
->
IDirectDrawFactory_iface
.
lpVtbl
=
&
ddrawex_factory_vtbl
;
factory
->
IDirectDrawFactory_iface
.
lpVtbl
=
&
ddrawex_factory_vtbl
;
if
(
FAILED
(
hr
=
ddrawex_factory_QueryInterface
(
&
factory
->
IDirectDrawFactory_iface
,
riid
,
out
)))
if
(
FAILED
(
hr
=
ddrawex_factory_QueryInterface
(
&
factory
->
IDirectDrawFactory_iface
,
riid
,
out
)))
heap_
free
(
factory
);
free
(
factory
);
return
hr
;
return
hr
;
}
}
...
@@ -223,7 +223,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
...
@@ -223,7 +223,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
return
CLASS_E_CLASSNOTAVAILABLE
;
return
CLASS_E_CLASSNOTAVAILABLE
;
}
}
if
(
!
(
factory
=
heap_alloc_zero
(
sizeof
(
*
factory
))))
if
(
!
(
factory
=
calloc
(
1
,
sizeof
(
*
factory
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
factory
->
IClassFactory_iface
.
lpVtbl
=
&
ddrawex_class_factory_vtbl
;
factory
->
IClassFactory_iface
.
lpVtbl
=
&
ddrawex_class_factory_vtbl
;
...
...
dlls/ddrawex/surface.c
View file @
9365e6f6
...
@@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface)
...
@@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface)
{
{
IDirectDrawSurface4_FreePrivateData
(
surface
->
parent
,
&
IID_DDrawexPriv
);
IDirectDrawSurface4_FreePrivateData
(
surface
->
parent
,
&
IID_DDrawexPriv
);
IDirectDrawSurface4_Release
(
surface
->
parent
);
IDirectDrawSurface4_Release
(
surface
->
parent
);
heap_
free
(
surface
);
free
(
surface
);
}
}
return
refcount
;
return
refcount
;
...
@@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner)
...
@@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner)
struct
ddrawex_surface
*
impl
;
struct
ddrawex_surface
*
impl
;
TRACE
(
"Creating new ddrawex surface wrapper for surface %p
\n
"
,
inner
);
TRACE
(
"Creating new ddrawex surface wrapper for surface %p
\n
"
,
inner
);
impl
=
heap_alloc_zero
(
sizeof
(
*
impl
));
impl
=
calloc
(
1
,
sizeof
(
*
impl
));
impl
->
ref
=
1
;
impl
->
ref
=
1
;
impl
->
IDirectDrawSurface3_iface
.
lpVtbl
=
&
ddrawex_surface3_vtbl
;
impl
->
IDirectDrawSurface3_iface
.
lpVtbl
=
&
ddrawex_surface3_vtbl
;
impl
->
IDirectDrawSurface4_iface
.
lpVtbl
=
&
ddrawex_surface4_vtbl
;
impl
->
IDirectDrawSurface4_iface
.
lpVtbl
=
&
ddrawex_surface4_vtbl
;
...
...
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