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
ee60e5fd
Commit
ee60e5fd
authored
Sep 01, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 01, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Remove trailing spaces.
parent
ab852393
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
20 deletions
+14
-20
ddraw.c
dlls/ddraw/ddraw.c
+4
-3
device.c
dlls/ddraw/device.c
+0
-0
executebuffer.c
dlls/ddraw/executebuffer.c
+0
-0
light.c
dlls/ddraw/light.c
+0
-0
parent.c
dlls/ddraw/parent.c
+1
-2
surface.c
dlls/ddraw/surface.c
+0
-3
ddrawmodes.c
dlls/ddraw/tests/ddrawmodes.c
+0
-1
utils.c
dlls/ddraw/utils.c
+0
-0
viewport.c
dlls/ddraw/viewport.c
+9
-11
No files found.
dlls/ddraw/ddraw.c
View file @
ee60e5fd
...
...
@@ -816,7 +816,7 @@ IDirectDrawImpl_GetDisplayMode(IDirectDraw7 *iface,
EnterCriticalSection
(
&
ddraw_cs
);
/* This seems sane */
if
(
!
DDSD
)
if
(
!
DDSD
)
{
LeaveCriticalSection
(
&
ddraw_cs
);
return
DDERR_INVALIDPARAMS
;
...
...
@@ -1886,8 +1886,9 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
}
else
{
if
((
pDDSD
->
ddsCaps
.
dwCaps
&
DDSCAPS_3DDEVICE
)
&&
(
This
->
ImplType
!=
SURFACE_OPENGL
)
&&
DefaultSurfaceType
==
SURFACE_UNKNOWN
)
if
((
pDDSD
->
ddsCaps
.
dwCaps
&
DDSCAPS_3DDEVICE
)
&&
(
This
->
ImplType
!=
SURFACE_OPENGL
)
&&
DefaultSurfaceType
==
SURFACE_UNKNOWN
)
{
/* We have to change to OpenGL,
* and re-create all WineD3DSurfaces
...
...
dlls/ddraw/device.c
View file @
ee60e5fd
dlls/ddraw/executebuffer.c
View file @
ee60e5fd
dlls/ddraw/light.c
View file @
ee60e5fd
dlls/ddraw/parent.c
View file @
ee60e5fd
...
...
@@ -117,8 +117,7 @@ IParentImpl_AddRef(IParent *iface)
* The new refcount
*
*****************************************************************************/
static
ULONG
WINAPI
IParentImpl_Release
(
IParent
*
iface
)
static
ULONG
WINAPI
IParentImpl_Release
(
IParent
*
iface
)
{
IParentImpl
*
This
=
(
IParentImpl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
...
...
dlls/ddraw/surface.c
View file @
ee60e5fd
...
...
@@ -920,9 +920,6 @@ IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This,
IDirect3DDeviceImpl_UpdateDepthStencil
(
This
->
ddraw
->
d3ddevice
);
}
/* MSDN:
* "This method increments the reference count of the surface being attached."
*/
IDirectDrawSurface7_AddRef
((
IDirectDrawSurface7
*
)
Surf
);
LeaveCriticalSection
(
&
ddraw_cs
);
return
DD_OK
;
...
...
dlls/ddraw/tests/ddrawmodes.c
View file @
ee60e5fd
...
...
@@ -63,7 +63,6 @@ static void createwindow(void)
ShowWindow
(
hwnd
,
SW_HIDE
);
UpdateWindow
(
hwnd
);
SetFocus
(
hwnd
);
}
static
BOOL
createdirectdraw
(
void
)
...
...
dlls/ddraw/utils.c
View file @
ee60e5fd
dlls/ddraw/viewport.c
View file @
ee60e5fd
...
...
@@ -657,11 +657,8 @@ IDirect3DViewportImpl_GetBackgroundDepth(IDirect3DViewport3 *iface,
* The return value of IDirect3DDevice7::Clear
*
*****************************************************************************/
static
HRESULT
WINAPI
IDirect3DViewportImpl_Clear
(
IDirect3DViewport3
*
iface
,
DWORD
dwCount
,
D3DRECT
*
lpRects
,
DWORD
dwFlags
)
static
HRESULT
WINAPI
IDirect3DViewportImpl_Clear
(
IDirect3DViewport3
*
iface
,
DWORD
dwCount
,
D3DRECT
*
lpRects
,
DWORD
dwFlags
)
{
IDirect3DViewportImpl
*
This
=
(
IDirect3DViewportImpl
*
)
iface
;
DWORD
color
=
0x00000000
;
...
...
@@ -680,12 +677,13 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface,
if
(
dwFlags
&
D3DCLEAR_TARGET
)
{
if
(
This
->
background
==
NULL
)
{
ERR
(
" Trying to clear the color buffer without background material !
\n
"
);
}
else
{
color
=
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u1
.
r
)
*
255
)
<<
16
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u2
.
g
)
*
255
)
<<
8
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u3
.
b
)
*
255
)
<<
0
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u4
.
a
)
*
255
)
<<
24
);
}
else
{
color
=
((
int
)((
This
->
background
->
mat
.
u
.
diffuse
.
u1
.
r
)
*
255
)
<<
16
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u2
.
g
)
*
255
)
<<
8
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u3
.
b
)
*
255
)
<<
0
)
|
((
int
)
((
This
->
background
->
mat
.
u
.
diffuse
.
u4
.
a
)
*
255
)
<<
24
);
}
}
...
...
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