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
825baa23
Commit
825baa23
authored
Apr 02, 2008
by
Austin English
Committed by
Alexandre Julliard
Apr 03, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Spelling fixes.
parent
d6ba069d
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
22 additions
and
22 deletions
+22
-22
ddraw.c
dlls/ddraw/ddraw.c
+4
-4
device.c
dlls/ddraw/device.c
+2
-2
direct3d.c
dlls/ddraw/direct3d.c
+2
-2
light.c
dlls/ddraw/light.c
+1
-1
main.c
dlls/ddraw/main.c
+3
-3
palette.c
dlls/ddraw/palette.c
+1
-1
surface.c
dlls/ddraw/surface.c
+3
-3
d3d.c
dlls/ddraw/tests/d3d.c
+2
-2
dsurface.c
dlls/ddraw/tests/dsurface.c
+2
-2
visual.c
dlls/ddraw/tests/visual.c
+1
-1
viewport.c
dlls/ddraw/viewport.c
+1
-1
No files found.
dlls/ddraw/ddraw.c
View file @
825baa23
...
...
@@ -339,7 +339,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface)
*
* Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE
*
* These
seem not really imporant for wine
* These
don't seem very important for wine:
* DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX
*
* Returns:
...
...
@@ -2186,12 +2186,12 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This,
* the WineD3DSurface when the ddraw surface is destroyed.
*
* However, for all surfaces which can be in a container in WineD3D,
* we have to do this. These surfaces are usu
s
ally complex surfaces,
* we have to do this. These surfaces are usually complex surfaces,
* so this concerns primary surfaces with a front and a back buffer,
* and textures.
*
* |------------------------| |-----------------|
* | DDraw surface | | Contain
ter
|
* | DDraw surface | | Contain
er
|
* | | | |
* | Child |<------------->| Parent |
* | Texture |<------------->| |
...
...
@@ -2633,7 +2633,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
{
Pool
=
WINED3DPOOL_SYSTEMMEM
;
}
/* Should I forward the MAN
E
GED cap to the managed pool ? */
/* Should I forward the MAN
A
GED cap to the managed pool ? */
/* Get the format. It's set already by CreateNewSurface */
Format
=
PixelFormat_DD2WineD3D
(
&
object
->
surface_desc
.
u4
.
ddpfPixelFormat
);
...
...
dlls/ddraw/device.c
View file @
825baa23
...
...
@@ -502,7 +502,7 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
*
* Parameters:
* HWDesc: Structure to fill with the HW caps
* HelDesc: Structure to fill with the hardare emulation caps
* HelDesc: Structure to fill with the hard
w
are emulation caps
*
* Returns:
* D3D_OK on success
...
...
@@ -1067,7 +1067,7 @@ IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface,
* Params:
* Count: Pointer to a DWORD containing the numbers of pick records to
* retrieve
* D3DPickRec: Address to store the resulting D3DPICKRECORD arry.
* D3DPickRec: Address to store the resulting D3DPICKRECORD arr
a
y.
*
* Returns:
* D3D_OK, because it's a stub
...
...
dlls/ddraw/direct3d.c
View file @
825baa23
...
...
@@ -750,7 +750,7 @@ Thunk_IDirect3DImpl_1_FindDevice(IDirect3D *iface,
*
* Params:
* refiid: IID of the device to create
* Surface: Initi
ti
al rendertarget
* Surface: Initial rendertarget
* Device: Address to return the interface pointer
*
* Returns:
...
...
@@ -1293,7 +1293,7 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D,
WINED3DCAPS
WCaps
;
HRESULT
hr
;
/* Some
Variables to a
sign to the pointers in WCaps */
/* Some
variables to as
sign to the pointers in WCaps */
TRACE
(
"()->(%p,%p,%p
\n
"
,
WineD3D
,
Desc123
,
Desc7
);
memset
(
&
WCaps
,
0
,
sizeof
(
WCaps
));
...
...
dlls/ddraw/light.c
View file @
825baa23
...
...
@@ -149,7 +149,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
* Assigns a lighting value to this object
*
* Params:
* Light: Lighting paramete
s
to set
* Light: Lighting paramete
r
to set
*
* Returns:
* D3D_OK on success
...
...
dlls/ddraw/main.c
View file @
825baa23
...
...
@@ -649,7 +649,7 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
* What is this? Seems to create DirectDraw objects...
*
* Params
* The usu
s
al things???
* The usual things???
*
* RETURNS
* ???
...
...
@@ -931,7 +931,7 @@ DllMain(HINSTANCE hInstDLL,
struct
list
*
entry
,
*
entry2
;
WARN
(
"There are still existing DirectDraw interfaces. Wine bug or buggy application?
\n
"
);
/* We remove elemets from this loop */
/* We remove eleme
n
ts from this loop */
LIST_FOR_EACH_SAFE
(
entry
,
entry2
,
&
global_ddraw_list
)
{
HRESULT
hr
;
...
...
@@ -950,7 +950,7 @@ DllMain(HINSTANCE hInstDLL,
/* Does a D3D device exist? Destroy it
* TODO: Destroy all Vertex buffers, Lights, Materials
* and exec
tur
e buffers too
* and exec
ut
e buffers too
*/
if
(
ddraw
->
d3ddevice
)
{
...
...
dlls/ddraw/palette.c
View file @
825baa23
...
...
@@ -125,7 +125,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface)
* DDERR_ALREADYINITIALIZED
*
* Params:
* DD: DirectDraw interface this palette is asigned to
* DD: DirectDraw interface this palette is as
s
igned to
* Flags: Some flags, as usual
* ColorTable: The startup color table
*
...
...
dlls/ddraw/surface.c
View file @
825baa23
...
...
@@ -287,7 +287,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
IUnknown
*
ifaceToRelease
=
This
->
ifaceToRelease
;
int
i
;
/* Complex attached surfaces are destroyed implicit
e
ly when the root is released */
/* Complex attached surfaces are destroyed implicitly when the root is released */
EnterCriticalSection
(
&
ddraw_cs
);
if
(
!
This
->
is_complex_root
)
{
...
...
@@ -711,7 +711,7 @@ IDirectDrawSurfaceImpl_Flip(IDirectDrawSurface7 *iface,
* What about overlay surfaces, AFAIK they can flip too?
*/
if
(
!
(
This
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_FRONTBUFFER
)
)
return
DDERR_INVALIDOBJECT
;
/* Unc
k
ecked */
return
DDERR_INVALIDOBJECT
;
/* Unc
h
ecked */
EnterCriticalSection
(
&
ddraw_cs
);
...
...
@@ -1317,7 +1317,7 @@ IDirectDrawSurfaceImpl_PageLock(IDirectDrawSurface7 *iface,
* Allows a sysmem surface to be paged out
*
* Params:
* Flags: Not used, must be 0(unc
kech
ed)
* Flags: Not used, must be 0(unc
heck
ed)
*
* Returns:
* DD_OK, because it's a stub
...
...
dlls/ddraw/tests/d3d.c
View file @
825baa23
...
...
@@ -359,7 +359,7 @@ static void LightTest(void)
ok
(
rc
==
D3D_OK
,
"IDirect3DDevice7_GetCaps failed with %x
\n
"
,
rc
);
if
(
caps
.
dwMaxActiveLights
==
(
DWORD
)
-
1
)
{
/* Some cards without T&L Support return -1 (Examples: Vo
doo b
anshee, RivaTNT / NV4) */
/* Some cards without T&L Support return -1 (Examples: Vo
odoo B
anshee, RivaTNT / NV4) */
skip
(
"T&L not supported
\n
"
);
return
;
}
...
...
@@ -518,7 +518,7 @@ static void ProcessVerticesTest(void)
rc
=
IDirect3DVertexBuffer7_Lock
(
lpVBufDest2
,
0
,
(
void
**
)
&
out2
,
NULL
);
ok
(
rc
==
D3D_OK
,
"IDirect3DVertexBuffer::Lock returned: %x
\n
"
,
rc
);
if
(
!
out2
)
goto
out
;
/* Small thing without much practial meaning, but I stumbled upon it,
/* Small thing without much practi
c
al meaning, but I stumbled upon it,
* so let's check for it: If the output vertex buffer has to RHW value,
* The RHW value of the last vertex is written into the next vertex
*/
...
...
dlls/ddraw/tests/dsurface.c
View file @
825baa23
...
...
@@ -648,7 +648,7 @@ static void SrcColorKey32BlitTest(void)
rc
=
IDirectDrawSurface_Blt
(
lpDst
,
NULL
,
lpSrc
,
NULL
,
DDBLT_KEYDEST
,
&
fx
);
ok
(
rc
==
DD_OK
,
"IDirectDrawSurface_Blt returned %08x
\n
"
,
rc
);
/* With
k
orrectly passed override keys no key in the surface is needed.
/* With
c
orrectly passed override keys no key in the surface is needed.
* Again, the result was checked before, no need to do that again
*/
rc
=
IDirectDrawSurface_Blt
(
lpDst
,
NULL
,
lpSrc
,
NULL
,
DDBLT_KEYDESTOVERRIDE
,
&
fx
);
...
...
@@ -2253,7 +2253,7 @@ static void PrivateDataTest(void)
hr
=
IDirectDrawSurface7_GetPrivateData
(
surface7
,
&
IID_IDirectDrawSurface7
,
&
ptr
,
&
size
);
ok
(
hr
==
DD_OK
,
"IDirectDrawSurface7_GetPrivateData failed with %08x
\n
"
,
hr
);
ref2
=
getref
((
IUnknown
*
)
lpDD
);
/* Object is NOT be
ein
addrefed */
/* Object is NOT be
ing
addrefed */
ok
(
ptr
==
(
IUnknown
*
)
lpDD
,
"Returned interface pointer is %p, expected %p
\n
"
,
ptr
,
lpDD
);
ok
(
ref2
==
ref
+
1
,
"Object reference is %d, expected %d. ptr at %p, orig at %p
\n
"
,
ref2
,
ref
+
1
,
ptr
,
lpDD
);
...
...
dlls/ddraw/tests/visual.c
View file @
825baa23
...
...
@@ -554,7 +554,7 @@ static void offscreen_test(IDirect3DDevice7 *device)
hr
=
IDirect3DDevice7_Clear
(
device
,
0
,
NULL
,
D3DCLEAR_TARGET
,
0xffff00ff
,
0
.
0
,
0
);
ok
(
hr
==
D3D_OK
,
"Clear failed, hr = %08x
\n
"
,
hr
);
/* Draw without textures - Should resut in a white quad */
/* Draw without textures - Should resu
l
t in a white quad */
hr
=
IDirect3DDevice7_DrawPrimitive
(
device
,
D3DPT_TRIANGLESTRIP
,
D3DFVF_XYZ
|
D3DFVF_TEX1
,
quad
,
4
,
0
);
ok
(
hr
==
D3D_OK
,
"DrawPrimitive failed, hr = %08x
\n
"
,
hr
);
...
...
dlls/ddraw/viewport.c
View file @
825baa23
...
...
@@ -620,7 +620,7 @@ IDirect3DViewportImpl_SetBackgroundDepth(IDirect3DViewport3 *iface,
*
* Params:
* lplpDDSurface: Address to store the interface pointer
* lpValid: Set to TRUE if a depth is asigned, FALSE otherwise
* lpValid: Set to TRUE if a depth is as
s
igned, FALSE otherwise
*
* Returns:
* D3D_OK, because it's a stub
...
...
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