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
f461b39b
Commit
f461b39b
authored
Jul 19, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 19, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Get rid of the useless "ddraw_owner" fields.
parent
16b3f17f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
14 deletions
+6
-14
clipper.c
dlls/ddraw/clipper.c
+2
-4
ddraw.c
dlls/ddraw/ddraw.c
+0
-1
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-2
surface.c
dlls/ddraw/surface.c
+3
-7
No files found.
dlls/ddraw/clipper.c
View file @
f461b39b
...
...
@@ -254,19 +254,17 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd(
static
HRESULT
WINAPI
IDirectDrawClipperImpl_Initialize
(
LPDIRECTDRAWCLIPPER
iface
,
LPDIRECTDRAW
lpDD
,
DWORD
dwFlags
)
{
IDirectDrawImpl
*
pOwner
;
IDirectDrawClipperImpl
*
This
=
(
IDirectDrawClipperImpl
*
)
iface
;
TRACE
(
"(%p)->(%p,0x%08x)
\n
"
,
This
,
lpDD
,
dwFlags
);
EnterCriticalSection
(
&
ddraw_cs
);
if
(
This
->
ddraw_owner
!=
NULL
)
if
(
This
->
initialized
)
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_ALREADYINITIALIZED
;
}
pOwner
=
lpDD
?
ddraw_from_ddraw1
(
lpDD
)
:
NULL
;
This
->
ddraw_owner
=
pOwner
;
This
->
initialized
=
TRUE
;
LeaveCriticalSection
(
&
ddraw_cs
);
return
DD_OK
;
...
...
dlls/ddraw/ddraw.c
View file @
f461b39b
...
...
@@ -3041,7 +3041,6 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface,
object
->
lpVtbl
=
&
IDirectDrawPalette_Vtbl
;
object
->
ref
=
1
;
object
->
ddraw_owner
=
This
;
hr
=
IWineD3DDevice_CreatePalette
(
This
->
wineD3DDevice
,
Flags
,
ColorTable
,
&
object
->
wineD3DPalette
,
(
IUnknown
*
)
object
);
...
...
dlls/ddraw/ddraw_private.h
View file @
f461b39b
...
...
@@ -469,7 +469,7 @@ struct IDirectDrawClipperImpl
LONG
ref
;
IWineD3DClipper
*
wineD3DClipper
;
IDirectDrawImpl
*
ddraw_owner
;
BOOL
initialized
;
};
extern
const
IDirectDrawClipperVtbl
IDirectDrawClipper_Vtbl
DECLSPEC_HIDDEN
;
...
...
@@ -489,7 +489,6 @@ struct IDirectDrawPaletteImpl
IWineD3DPalette
*
wineD3DPalette
;
/* IDirectDrawPalette fields */
IDirectDrawImpl
*
ddraw_owner
;
IUnknown
*
ifaceToRelease
;
};
extern
const
IDirectDrawPaletteVtbl
IDirectDrawPalette_Vtbl
DECLSPEC_HIDDEN
;
...
...
dlls/ddraw/surface.c
View file @
f461b39b
...
...
@@ -1676,14 +1676,10 @@ IDirectDrawSurfaceImpl_GetSurfaceDesc(IDirectDrawSurface7 *iface,
* DDERR_ALREADYINITIALIZED
*
*****************************************************************************/
static
HRESULT
WINAPI
IDirectDrawSurfaceImpl_Initialize
(
IDirectDrawSurface7
*
iface
,
IDirectDraw
*
DD
,
DDSURFACEDESC2
*
DDSD
)
static
HRESULT
WINAPI
IDirectDrawSurfaceImpl_Initialize
(
IDirectDrawSurface7
*
iface
,
IDirectDraw
*
ddraw
,
DDSURFACEDESC2
*
surface_desc
)
{
IDirectDrawSurfaceImpl
*
This
=
(
IDirectDrawSurfaceImpl
*
)
iface
;
IDirectDrawImpl
*
ddimpl
=
DD
?
ddraw_from_ddraw1
(
DD
)
:
NULL
;
TRACE
(
"(%p)->(%p,%p)
\n
"
,
This
,
ddimpl
,
DDSD
);
TRACE
(
"iface %p, ddraw %p, surface_desc %p.
\n
"
,
iface
,
ddraw
,
surface_desc
);
return
DDERR_ALREADYINITIALIZED
;
}
...
...
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