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
9bfbfcbe
Commit
9bfbfcbe
authored
Jun 23, 2006
by
Francois Gouget
Committed by
Alexandre Julliard
Jun 26, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assorted spelling, case and grammar fixes.
parent
9607151e
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
95 additions
and
95 deletions
+95
-95
clipper.c
dlls/ddraw/clipper.c
+2
-2
ddraw.c
dlls/ddraw/ddraw.c
+0
-0
ddraw_private.h
dlls/ddraw/ddraw_private.h
+4
-4
device.c
dlls/ddraw/device.c
+35
-35
direct3d.c
dlls/ddraw/direct3d.c
+11
-11
executebuffer.c
dlls/ddraw/executebuffer.c
+1
-1
gamma.c
dlls/ddraw/gamma.c
+1
-1
main.c
dlls/ddraw/main.c
+4
-4
surface.c
dlls/ddraw/surface.c
+22
-22
d3d.c
dlls/ddraw/tests/d3d.c
+1
-1
utils.c
dlls/ddraw/utils.c
+5
-5
vertexbuffer.c
dlls/ddraw/vertexbuffer.c
+2
-2
viewport.c
dlls/ddraw/viewport.c
+1
-1
shlfolder.c
dlls/shell32/shlfolder.c
+1
-1
device.c
dlls/wined3d/device.c
+1
-1
stateblock.c
dlls/wined3d/stateblock.c
+1
-1
surface_gdi.c
dlls/wined3d/surface_gdi.c
+1
-1
utils.c
dlls/wined3d/utils.c
+1
-1
resource.h
programs/winefile/resource.h
+1
-1
No files found.
dlls/ddraw/clipper.c
View file @
9bfbfcbe
...
@@ -212,7 +212,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList(
...
@@ -212,7 +212,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList(
*
*
* Sets or deletes (if lprgn is NULL) the clip list
* Sets or deletes (if lprgn is NULL) the clip list
*
*
* This implementation is a stu
p
and returns DD_OK always to make the app
* This implementation is a stu
b
and returns DD_OK always to make the app
* happy.
* happy.
*
*
* PARAMS
* PARAMS
...
@@ -265,7 +265,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd(
...
@@ -265,7 +265,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd(
*
*
* Return values:
* Return values:
* DD_OK on success
* DD_OK on success
* DDERR_ALREADYINITIALIZED if this interface isn't initialized al
l
ready
* DDERR_ALREADYINITIALIZED if this interface isn't initialized already
*****************************************************************************/
*****************************************************************************/
static
HRESULT
WINAPI
IDirectDrawClipperImpl_Initialize
(
static
HRESULT
WINAPI
IDirectDrawClipperImpl_Initialize
(
LPDIRECTDRAWCLIPPER
iface
,
LPDIRECTDRAW
lpDD
,
DWORD
dwFlags
LPDIRECTDRAWCLIPPER
iface
,
LPDIRECTDRAW
lpDD
,
DWORD
dwFlags
...
...
dlls/ddraw/ddraw.c
View file @
9bfbfcbe
This diff is collapsed.
Click to expand it.
dlls/ddraw/ddraw_private.h
View file @
9bfbfcbe
...
@@ -98,7 +98,7 @@ struct IDirectDrawImpl
...
@@ -98,7 +98,7 @@ struct IDirectDrawImpl
IDirectDrawSurfaceImpl
*
DepthStencilBuffer
;
IDirectDrawSurfaceImpl
*
DepthStencilBuffer
;
BOOL
d3d_initialized
;
BOOL
d3d_initialized
;
/*
m
isc ddraw fields */
/*
M
isc ddraw fields */
UINT
total_vidmem
;
UINT
total_vidmem
;
DWORD
cur_scanline
;
DWORD
cur_scanline
;
BOOL
fake_vblank
;
BOOL
fake_vblank
;
...
@@ -121,7 +121,7 @@ struct IDirectDrawImpl
...
@@ -121,7 +121,7 @@ struct IDirectDrawImpl
IDirect3DDeviceImpl
*
d3ddevice
;
IDirect3DDeviceImpl
*
d3ddevice
;
int
d3dversion
;
int
d3dversion
;
/* Varios HWNDs */
/* Vario
u
s HWNDs */
HWND
focuswindow
;
HWND
focuswindow
;
HWND
devicewindow
;
HWND
devicewindow
;
...
@@ -396,7 +396,7 @@ struct IDirectDrawPaletteImpl
...
@@ -396,7 +396,7 @@ struct IDirectDrawPaletteImpl
const
IDirectDrawPaletteVtbl
IDirectDrawPalette_Vtbl
;
const
IDirectDrawPaletteVtbl
IDirectDrawPalette_Vtbl
;
/******************************************************************************
/******************************************************************************
* DirectDraw ClassFactory
I
mplementation - incomplete
* DirectDraw ClassFactory
i
mplementation - incomplete
******************************************************************************/
******************************************************************************/
typedef
struct
typedef
struct
{
{
...
@@ -470,7 +470,7 @@ struct IDirect3DMaterialImpl
...
@@ -470,7 +470,7 @@ struct IDirect3DMaterialImpl
void
(
*
activate
)(
IDirect3DMaterialImpl
*
this
);
void
(
*
activate
)(
IDirect3DMaterialImpl
*
this
);
};
};
/* VTables in varios versions */
/* VTables in vario
u
s versions */
const
IDirect3DMaterialVtbl
IDirect3DMaterial_Vtbl
;
const
IDirect3DMaterialVtbl
IDirect3DMaterial_Vtbl
;
const
IDirect3DMaterial2Vtbl
IDirect3DMaterial2_Vtbl
;
const
IDirect3DMaterial2Vtbl
IDirect3DMaterial2_Vtbl
;
const
IDirect3DMaterial3Vtbl
IDirect3DMaterial3_Vtbl
;
const
IDirect3DMaterial3Vtbl
IDirect3DMaterial3_Vtbl
;
...
...
dlls/ddraw/device.c
View file @
9bfbfcbe
This diff is collapsed.
Click to expand it.
dlls/ddraw/direct3d.c
View file @
9bfbfcbe
...
@@ -243,7 +243,7 @@ IDirect3DImpl_7_EnumDevices(IDirect3D7 *iface,
...
@@ -243,7 +243,7 @@ IDirect3DImpl_7_EnumDevices(IDirect3D7 *iface,
* IDirect3D3::EnumDevices
* IDirect3D3::EnumDevices
*
*
* Enumerates all supported Direct3DDevice interfaces. This is the
* Enumerates all supported Direct3DDevice interfaces. This is the
* implementation for Direct3D 1 to Direc3D 3, Version 7 has it
'
s own.
* implementation for Direct3D 1 to Direc3D 3, Version 7 has its own.
*
*
* Version 1, 2 and 3
* Version 1, 2 and 3
*
*
...
@@ -425,7 +425,7 @@ Thunk_IDirect3DImpl_1_CreateLight(IDirect3D *iface,
...
@@ -425,7 +425,7 @@ Thunk_IDirect3DImpl_1_CreateLight(IDirect3D *iface,
* IDirect3D3::CreateMaterial
* IDirect3D3::CreateMaterial
*
*
* Creates an IDirect3DMaterial interface. This interface is used by Direct3D3
* Creates an IDirect3DMaterial interface. This interface is used by Direct3D3
* and older versions. The IDirect3DMaterial implementation wraps it
'
s
* and older versions. The IDirect3DMaterial implementation wraps its
* functionality to IDirect3DDevice7::SetMaterial and friends.
* functionality to IDirect3DDevice7::SetMaterial and friends.
*
*
* Version 1, 2 and 3
* Version 1, 2 and 3
...
@@ -521,7 +521,7 @@ Thunk_IDirect3DImpl_1_CreateMaterial(IDirect3D *iface,
...
@@ -521,7 +521,7 @@ Thunk_IDirect3DImpl_1_CreateMaterial(IDirect3D *iface,
* by Direct3D and earlier versions for Viewport management. In Direct3D7
* by Direct3D and earlier versions for Viewport management. In Direct3D7
* it has been replaced by a viewport structure and
* it has been replaced by a viewport structure and
* IDirect3DDevice7::*Viewport. Wine's IDirect3DViewport implementation
* IDirect3DDevice7::*Viewport. Wine's IDirect3DViewport implementation
* uses the IDirect3DDevice7 methods for it
'
s functionality
* uses the IDirect3DDevice7 methods for its functionality
*
*
* Params:
* Params:
* Viewport: Address to store the new interface pointer
* Viewport: Address to store the new interface pointer
...
@@ -600,7 +600,7 @@ Thunk_IDirect3DImpl_1_CreateViewport(IDirect3D *iface,
...
@@ -600,7 +600,7 @@ Thunk_IDirect3DImpl_1_CreateViewport(IDirect3D *iface,
*
*
* Verion 1, 2 and 3
* Verion 1, 2 and 3
* Params:
* Params:
* D3DDFS: Describes the requested device chara
k
teristics
* D3DDFS: Describes the requested device chara
c
teristics
* D3DFDR: Returns the device description
* D3DFDR: Returns the device description
*
*
* Returns:
* Returns:
...
@@ -767,12 +767,12 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
...
@@ -767,12 +767,12 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
IndexBufferParent
->
ref
=
1
;
IndexBufferParent
->
ref
=
1
;
/* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives
/* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives
* Create a (hopefully) long enough
t
buffer, and copy the indices into it
* Create a (hopefully) long enough buffer, and copy the indices into it
* Ideally, a IWineD3DIndexBuffer::SetData method could be created, which
* Ideally, a IWineD3DIndexBuffer::SetData method could be created, which
* takes the pointer and avoids the memcpy
* takes the pointer and avoids the memcpy
*/
*/
hr
=
IWineD3DDevice_CreateIndexBuffer
(
This
->
wineD3DDevice
,
hr
=
IWineD3DDevice_CreateIndexBuffer
(
This
->
wineD3DDevice
,
0x40000
,
/* Leng
ht
. Don't know how long it should be */
0x40000
,
/* Leng
th
. Don't know how long it should be */
0
,
/* Usage */
0
,
/* Usage */
WINED3DFMT_INDEX16
,
/* Format. D3D7 uses WORDS */
WINED3DFMT_INDEX16
,
/* Format. D3D7 uses WORDS */
WINED3DPOOL_DEFAULT
,
WINED3DPOOL_DEFAULT
,
...
@@ -832,7 +832,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
...
@@ -832,7 +832,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
}
}
/* AddRef the render target. Also AddRef the render target from ddraw,
/* AddRef the render target. Also AddRef the render target from ddraw,
* because if it
released before the app releases the D3D device, the D3D capatib
lities
* because if it
is released before the app releases the D3D device, the D3D capabi
lities
* of WineD3D will be uninitialized, which has bad effects.
* of WineD3D will be uninitialized, which has bad effects.
*
*
* In most cases, those surfaces are the surfaces are the same anyway, but this will simply
* In most cases, those surfaces are the surfaces are the same anyway, but this will simply
...
@@ -919,7 +919,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
...
@@ -919,7 +919,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"(%p)->(%p,%p,%08lx)
\n
"
,
This
,
Desc
,
VertexBuffer
,
Flags
);
TRACE
(
"(%p)->(%p,%p,%08lx)
\n
"
,
This
,
Desc
,
VertexBuffer
,
Flags
);
TRACE
(
"(%p) Vertex buffer description:
\n
"
,
This
);
TRACE
(
"(%p) Vertex buffer description:
\n
"
,
This
);
TRACE
(
"(%p) dwSize=%ld
\n
"
,
This
,
Desc
->
dwSize
);
TRACE
(
"(%p) dwSize=%ld
\n
"
,
This
,
Desc
->
dwSize
);
TRACE
(
"(%p) dwCaps=%08lx
\n
"
,
This
,
Desc
->
dwCaps
);
TRACE
(
"(%p) dwCaps=%08lx
\n
"
,
This
,
Desc
->
dwCaps
);
TRACE
(
"(%p) FVF=%08lx
\n
"
,
This
,
Desc
->
dwFVF
);
TRACE
(
"(%p) FVF=%08lx
\n
"
,
This
,
Desc
->
dwFVF
);
...
@@ -1081,7 +1081,7 @@ Thunk_IDirect3DImpl_3_EnumZBufferFormats(IDirect3D3 *iface,
...
@@ -1081,7 +1081,7 @@ Thunk_IDirect3DImpl_3_EnumZBufferFormats(IDirect3D3 *iface,
/*****************************************************************************
/*****************************************************************************
* IDirect3D7::EvictManagedTextures
* IDirect3D7::EvictManagedTextures
*
*
* Removes all managed textures(=surfaces with DDSCAPS2_TEXTUREMANAGE or
* Removes all managed textures
(=surfaces with DDSCAPS2_TEXTUREMANAGE or
* DDSCAPS2_D3DTEXTUREMANAGE caps) to be removed from video memory.
* DDSCAPS2_D3DTEXTUREMANAGE caps) to be removed from video memory.
*
*
* Version 3 and 7
* Version 3 and 7
...
@@ -1121,8 +1121,8 @@ Thunk_IDirect3DImpl_3_EvictManagedTextures(IDirect3D3 *iface)
...
@@ -1121,8 +1121,8 @@ Thunk_IDirect3DImpl_3_EvictManagedTextures(IDirect3D3 *iface)
*
*
* Params:
* Params:
* WineD3D: The interface to get the caps from
* WineD3D: The interface to get the caps from
* Desc123: Old D3D <3 structure to fill(needed)
* Desc123: Old D3D <3 structure to fill
(needed)
* Desc7: D3D7 device desc structure to fill(needed)
* Desc7: D3D7 device desc structure to fill
(needed)
*
*
* Returns
* Returns
* D3D_OK on success, or the return value of IWineD3D::GetCaps
* D3D_OK on success, or the return value of IWineD3D::GetCaps
...
...
dlls/ddraw/executebuffer.c
View file @
9bfbfcbe
...
@@ -78,7 +78,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) {
...
@@ -78,7 +78,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) {
* for drawing the vertices. It is called from
* for drawing the vertices. It is called from
* IDirect3DDevice::Execute
* IDirect3DDevice::Execute
*
*
* TODO: Perhaps some comments about the varios opcodes wouldn't hurt
* TODO: Perhaps some comments about the vario
u
s opcodes wouldn't hurt
*
*
* Don't declare this static, as it's called from device.c,
* Don't declare this static, as it's called from device.c,
* IDirect3DDevice::Execute
* IDirect3DDevice::Execute
...
...
dlls/ddraw/gamma.c
View file @
9bfbfcbe
...
@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
...
@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL
(
ddraw_thunk
);
WINE_DECLARE_DEBUG_CHANNEL
(
ddraw_thunk
);
/**********************************************************
/**********************************************************
* IUnkown parts follow
* IUnk
n
own parts follow
**********************************************************/
**********************************************************/
/**********************************************************
/**********************************************************
...
...
dlls/ddraw/main.c
View file @
9bfbfcbe
...
@@ -71,7 +71,7 @@ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN;
...
@@ -71,7 +71,7 @@ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN;
* iid: requested version ID.
* iid: requested version ID.
*
*
* Returns:
* Returns:
* DD_OK if the Interface was created sucessfully
* DD_OK if the Interface was created suc
c
essfully
* CLASS_E_NOAGGREGATION if UnkOuter is not NULL
* CLASS_E_NOAGGREGATION if UnkOuter is not NULL
* E_OUTOFMEMORY if some allocation failed
* E_OUTOFMEMORY if some allocation failed
*
*
...
@@ -111,7 +111,7 @@ DDRAW_Create(GUID *guid,
...
@@ -111,7 +111,7 @@ DDRAW_Create(GUID *guid,
devicetype
=
0
;
devicetype
=
0
;
}
}
/* DDraw doesn't support aggreation, according to msdn */
/* DDraw doesn't support aggre
g
ation, according to msdn */
if
(
UnkOuter
!=
NULL
)
if
(
UnkOuter
!=
NULL
)
return
CLASS_E_NOAGGREGATION
;
return
CLASS_E_NOAGGREGATION
;
...
@@ -169,7 +169,7 @@ DDRAW_Create(GUID *guid,
...
@@ -169,7 +169,7 @@ DDRAW_Create(GUID *guid,
/* Initialized member...
/* Initialized member...
*
*
* It is set to false at creation time, and set to true in
* It is set to false at creation time, and set to true in
* IDirectDraw7::Initialize. It
'
s sole purpose is to return DD_OK on
* IDirectDraw7::Initialize. Its sole purpose is to return DD_OK on
* initialize only once
* initialize only once
*/
*/
This
->
initialized
=
FALSE
;
This
->
initialized
=
FALSE
;
...
@@ -177,7 +177,7 @@ DDRAW_Create(GUID *guid,
...
@@ -177,7 +177,7 @@ DDRAW_Create(GUID *guid,
/* Initialize WineD3DDevice
/* Initialize WineD3DDevice
*
*
* It is used for screen setup, surface and palette creation
* It is used for screen setup, surface and palette creation
* When a Direct3DDevice7 is created, the D3D capa
tib
lities of WineD3D are
* When a Direct3DDevice7 is created, the D3D capa
bi
lities of WineD3D are
* initialized
* initialized
*/
*/
hr
=
IWineD3D_CreateDevice
(
wineD3D
,
hr
=
IWineD3D_CreateDevice
(
wineD3D
,
...
...
dlls/ddraw/surface.c
View file @
9bfbfcbe
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
ddraw
);
WINE_DEFAULT_DEBUG_CHANNEL
(
ddraw
);
/*****************************************************************************
/*****************************************************************************
* IUnkown parts follow
* IUnk
n
own parts follow
*****************************************************************************/
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
...
@@ -172,7 +172,7 @@ IDirectDrawSurfaceImpl_AddRef(IDirectDrawSurface7 *iface)
...
@@ -172,7 +172,7 @@ IDirectDrawSurfaceImpl_AddRef(IDirectDrawSurface7 *iface)
*
*
* A helper function for IDirectDrawSurface7::Release
* A helper function for IDirectDrawSurface7::Release
*
*
* Frees the surface, regardless of it
'
s refcount.
* Frees the surface, regardless of its refcount.
* See IDirectDrawSurface7::Release for more information
* See IDirectDrawSurface7::Release for more information
*
*
* Params:
* Params:
...
@@ -196,10 +196,10 @@ static void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This)
...
@@ -196,10 +196,10 @@ static void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This)
/* Check for attached surfaces and detach them */
/* Check for attached surfaces and detach them */
if
(
This
->
first_attached
!=
This
)
if
(
This
->
first_attached
!=
This
)
{
{
/* Well, this shouldn't happen: The surface be
e
ing attached is addref()ed
/* Well, this shouldn't happen: The surface being attached is addref()ed
* in AddAttachedSurface, so it shouldn't be released until DeleteAttachedSurface
* in AddAttachedSurface, so it shouldn't be released until DeleteAttachedSurface
* is called, because the refcount is h
o
ld. It looks like the app released()
* is called, because the refcount is h
e
ld. It looks like the app released()
* it often enough
t
to force this
* it often enough to force this
*/
*/
IDirectDrawSurface7
*
root
=
ICOM_INTERFACE
(
This
->
first_attached
,
IDirectDrawSurface7
);
IDirectDrawSurface7
*
root
=
ICOM_INTERFACE
(
This
->
first_attached
,
IDirectDrawSurface7
);
IDirectDrawSurface7
*
detach
=
ICOM_INTERFACE
(
This
,
IDirectDrawSurface7
);
IDirectDrawSurface7
*
detach
=
ICOM_INTERFACE
(
This
,
IDirectDrawSurface7
);
...
@@ -262,16 +262,16 @@ static void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This)
...
@@ -262,16 +262,16 @@ static void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This)
* It has a nice graph explaining the connection.
* It has a nice graph explaining the connection.
*
*
* What happens here is basically this:
* What happens here is basically this:
* When a surface is destroyed, it
'
s WineD3DSurface is released,
* When a surface is destroyed, its WineD3DSurface is released,
* and the refcount of the DirectDraw interface is reduced by 1. If it has
* and the refcount of the DirectDraw interface is reduced by 1. If it has
* complex surfaces attached to it, then these surfaces are destroyed too,
* complex surfaces attached to it, then these surfaces are destroyed too,
* regardless of their refcount. If any surface be
e
ing destroyed has another
* regardless of their refcount. If any surface being destroyed has another
* surface attached to it(with a "soft" attachment, not complex), then
* surface attached to it
(with a "soft" attachment, not complex), then
* this surface is detached with DeleteAttachedSurface.
* this surface is detached with DeleteAttachedSurface.
*
*
* When the surface is a texture, the WineD3DTexture is released.
* When the surface is a texture, the WineD3DTexture is released.
* If the surface is the Direct3D render target, then the D3D
* If the surface is the Direct3D render target, then the D3D
* capa
tib
lities of the WineD3DDevice are uninitialized, which causes the
* capa
bi
lities of the WineD3DDevice are uninitialized, which causes the
* swapchain to be released.
* swapchain to be released.
*
*
* Returns:
* Returns:
...
@@ -394,7 +394,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
...
@@ -394,7 +394,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
/*****************************************************************************
/*****************************************************************************
* IDirectDrawSurface7::GetAttachedSurface
* IDirectDrawSurface7::GetAttachedSurface
*
*
* Returns an attached surface with the requested caps. Surface attchment
* Returns an attached surface with the requested caps. Surface att
a
chment
* and complex surfaces are not clearly described by the MSDN or sdk,
* and complex surfaces are not clearly described by the MSDN or sdk,
* so this method is tricky and likely to contain problems.
* so this method is tricky and likely to contain problems.
* This implementation searches the complex chain first, then the
* This implementation searches the complex chain first, then the
...
@@ -405,7 +405,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
...
@@ -405,7 +405,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
* returned. The MSDN says that this method fails if more than one surface
* returned. The MSDN says that this method fails if more than one surface
* matches the caps, but apparently this is incorrect.
* matches the caps, but apparently this is incorrect.
*
*
* The found surface is AddRef
ed before it'
s returned.
* The found surface is AddRef
-ed before it i
s returned.
*
*
* Params:
* Params:
* Caps: Pointer to a DDCAPS2 structure describing the caps asked for
* Caps: Pointer to a DDCAPS2 structure describing the caps asked for
...
@@ -461,7 +461,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
...
@@ -461,7 +461,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
* that matches the capabilities requested."
* that matches the capabilities requested."
*
*
* The mipmap demo of the DirectX7 sdk shows what to do here:
* The mipmap demo of the DirectX7 sdk shows what to do here:
* aparently apps expect the first found surface to be returned.
* ap
p
arently apps expect the first found surface to be returned.
*/
*/
TRACE
(
"(%p): Returning surface %p
\n
"
,
This
,
surf
);
TRACE
(
"(%p): Returning surface %p
\n
"
,
This
,
surf
);
...
@@ -493,7 +493,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
...
@@ -493,7 +493,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
* that matches the capabilities requested."
* that matches the capabilities requested."
*
*
* The mipmap demo of the DirectX7 sdk shows what to do here:
* The mipmap demo of the DirectX7 sdk shows what to do here:
* aparently apps expect the first found surface to be returned.
* ap
p
arently apps expect the first found surface to be returned.
*/
*/
TRACE
(
"(%p): Returning surface %p
\n
"
,
This
,
surf
);
TRACE
(
"(%p): Returning surface %p
\n
"
,
This
,
surf
);
...
@@ -526,7 +526,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
...
@@ -526,7 +526,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface,
/*****************************************************************************
/*****************************************************************************
* IDirectDrawSurface7::Lock
* IDirectDrawSurface7::Lock
*
*
* Locks the surface and return
e
s a pointer to the surface's memory
* Locks the surface and returns a pointer to the surface's memory
*
*
* Params:
* Params:
* Rect: Rectangle to lock. If NULL, the whole surface is locked
* Rect: Rectangle to lock. If NULL, the whole surface is locked
...
@@ -716,18 +716,18 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSurface7 *iface,
...
@@ -716,18 +716,18 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSurface7 *iface,
/*****************************************************************************
/*****************************************************************************
* IDirectDrawSurface7::AddAttachedSurface
* IDirectDrawSurface7::AddAttachedSurface
*
*
* Attaches a
n
surface to another surface. Surface attachments are
* Attaches a surface to another surface. Surface attachments are
* incorrectly described in the SDK and the MSDN, and this method
* incorrectly described in the SDK and the MSDN, and this method
* is prone to bugs. The surface that is attached is AddRefed.
* is prone to bugs. The surface that is attached is AddRef
-
ed.
*
*
* The attachment list consists of a first surface(first_attached) and
* The attachment list consists of a first surface
(first_attached) and
* for each surface a pointer to the next attached surface (next_attached).
* for each surface a pointer to the next attached surface (next_attached).
* For the first surface, and a surface that has no attachments
* For the first surface, and a surface that has no attachments
* first_attached points to the surface itself. A surface that has
* first_attached points to the surface itself. A surface that has
* no successors in the chain has next_attached set to NULL.
* no successors in the chain has next_attached set to NULL.
*
*
* Newly attached surfaces are attached right after the root surface. The
* Newly attached surfaces are attached right after the root surface. The
* complex chains are handled sep
erately in a sim
milar chain, with
* complex chains are handled sep
arately in a si
milar chain, with
* first_complex and next_complex. If a surface is attached to a complex
* first_complex and next_complex. If a surface is attached to a complex
* surface compound, it's attached to the surface that the app requested,
* surface compound, it's attached to the surface that the app requested,
* not the complex root. See GetAttachedSurface for a description
* not the complex root. See GetAttachedSurface for a description
...
@@ -833,7 +833,7 @@ IDirectDrawSurfaceImpl_DeleteAttachedSurface(IDirectDrawSurface7 *iface,
...
@@ -833,7 +833,7 @@ IDirectDrawSurfaceImpl_DeleteAttachedSurface(IDirectDrawSurface7 *iface,
* and all parent surfaces */
* and all parent surfaces */
}
}
/* Find the
Pr
ecessor of the detached surface */
/* Find the
pred
ecessor of the detached surface */
while
(
Prev
)
while
(
Prev
)
{
{
if
(
Prev
->
next_attached
==
Surf
)
break
;
if
(
Prev
->
next_attached
==
Surf
)
break
;
...
@@ -1046,7 +1046,7 @@ IDirectDrawSurfaceImpl_SetPrivateData(IDirectDrawSurface7 *iface,
...
@@ -1046,7 +1046,7 @@ IDirectDrawSurfaceImpl_SetPrivateData(IDirectDrawSurface7 *iface,
/*****************************************************************************
/*****************************************************************************
* IDirectDrawSurface7::GetPrivateData
* IDirectDrawSurface7::GetPrivateData
*
*
* Return
e
s the private data set with IDirectDrawSurface7::SetPrivateData
* Returns the private data set with IDirectDrawSurface7::SetPrivateData
*
*
* Params:
* Params:
* tag: GUID of the data to return
* tag: GUID of the data to return
...
@@ -1080,7 +1080,7 @@ IDirectDrawSurfaceImpl_GetPrivateData(IDirectDrawSurface7 *iface,
...
@@ -1080,7 +1080,7 @@ IDirectDrawSurfaceImpl_GetPrivateData(IDirectDrawSurface7 *iface,
/*****************************************************************************
/*****************************************************************************
* IDirectDrawSurface7::FreePrivateData
* IDirectDrawSurface7::FreePrivateData
*
*
* Frees private stored in the surface
* Frees private
data
stored in the surface
*
*
* Params:
* Params:
* tag: Tag of the data to free
* tag: Tag of the data to free
...
@@ -1645,7 +1645,7 @@ static HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSu
...
@@ -1645,7 +1645,7 @@ static HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSu
volatile
IDirectDrawSurfaceImpl
*
vThis
=
This
;
volatile
IDirectDrawSurfaceImpl
*
vThis
=
This
;
TRACE
(
"(%p)
\n
"
,
This
);
TRACE
(
"(%p)
\n
"
,
This
);
/* A uniquness value of 0 is apparently special.
/* A uniqu
e
ness value of 0 is apparently special.
* This needs to be checked. */
* This needs to be checked. */
while
(
1
)
{
while
(
1
)
{
DWORD
old_uniqueness_value
=
vThis
->
uniqueness_value
;
DWORD
old_uniqueness_value
=
vThis
->
uniqueness_value
;
...
...
dlls/ddraw/tests/d3d.c
View file @
9bfbfcbe
...
@@ -33,7 +33,7 @@ static LPDIRECT3DVERTEXBUFFER7 lpVBufDest1 = NULL;
...
@@ -33,7 +33,7 @@ static LPDIRECT3DVERTEXBUFFER7 lpVBufDest1 = NULL;
static
LPDIRECT3DVERTEXBUFFER7
lpVBufDest2
=
NULL
;
static
LPDIRECT3DVERTEXBUFFER7
lpVBufDest2
=
NULL
;
/* To compare bad floating point numbers. Not the ideal way to do it,
/* To compare bad floating point numbers. Not the ideal way to do it,
* but it should be enough
t
for here */
* but it should be enough for here */
#define comparefloat(a, b) ( ((a - b) < 0.0001) && ((a-b) > -0.0001) )
#define comparefloat(a, b) ( ((a - b) < 0.0001) && ((a-b) > -0.0001) )
static
HRESULT
(
WINAPI
*
pDirectDrawCreateEx
)(
LPGUID
,
LPVOID
*
,
REFIID
,
LPUNKNOWN
);
static
HRESULT
(
WINAPI
*
pDirectDrawCreateEx
)(
LPGUID
,
LPVOID
*
,
REFIID
,
LPUNKNOWN
);
...
...
dlls/ddraw/utils.c
View file @
9bfbfcbe
...
@@ -467,7 +467,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
...
@@ -467,7 +467,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
case
8
:
case
8
:
if
(
DDPixelFormat
->
u1
.
dwAlphaBitDepth
==
8
)
if
(
DDPixelFormat
->
u1
.
dwAlphaBitDepth
==
8
)
return
WINED3DFMT_A8L8
;
return
WINED3DFMT_A8L8
;
ERR
(
"Unkown Alpha / Lumincase bit depth combination
\n
"
);
ERR
(
"Unk
n
own Alpha / Lumincase bit depth combination
\n
"
);
return
WINED3DFMT_UNKNOWN
;
return
WINED3DFMT_UNKNOWN
;
}
}
}
}
...
@@ -484,7 +484,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
...
@@ -484,7 +484,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
return
WINED3DFMT_L8
;
return
WINED3DFMT_L8
;
default:
default:
ERR
(
"Unkown luminance-only bit depth 0x%lx
\n
"
,
DDPixelFormat
->
u1
.
dwLuminanceBitCount
);
ERR
(
"Unk
n
own luminance-only bit depth 0x%lx
\n
"
,
DDPixelFormat
->
u1
.
dwLuminanceBitCount
);
return
WINED3DFMT_UNKNOWN
;
return
WINED3DFMT_UNKNOWN
;
}
}
}
}
...
@@ -497,7 +497,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
...
@@ -497,7 +497,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
switch
(
DDPixelFormat
->
u1
.
dwZBufferBitDepth
)
switch
(
DDPixelFormat
->
u1
.
dwZBufferBitDepth
)
{
{
case
8
:
case
8
:
ERR
(
"8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNKOWN
\n
"
);
ERR
(
"8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNK
N
OWN
\n
"
);
return
WINED3DFMT_UNKNOWN
;
return
WINED3DFMT_UNKNOWN
;
case
15
:
case
15
:
...
@@ -519,7 +519,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
...
@@ -519,7 +519,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
return
WINED3DFMT_D24X4S4
;
return
WINED3DFMT_D24X4S4
;
default:
default:
ERR
(
"Unkown Z buffer depth %ld
\n
"
,
DDPixelFormat
->
u1
.
dwZBufferBitDepth
);
ERR
(
"Unk
n
own Z buffer depth %ld
\n
"
,
DDPixelFormat
->
u1
.
dwZBufferBitDepth
);
return
WINED3DFMT_UNKNOWN
;
return
WINED3DFMT_UNKNOWN
;
}
}
}
}
...
@@ -1123,7 +1123,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
...
@@ -1123,7 +1123,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
* Params:
* Params:
* dest: Pointer to the destination matrix
* dest: Pointer to the destination matrix
* src1: Pointer to the first source matrix
* src1: Pointer to the first source matrix
* src2: Pointer to the seco
u
nd source matrix
* src2: Pointer to the second source matrix
*
*
*****************************************************************************/
*****************************************************************************/
void
void
...
...
dlls/ddraw/vertexbuffer.c
View file @
9bfbfcbe
...
@@ -188,8 +188,8 @@ Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
...
@@ -188,8 +188,8 @@ Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
* IDirect3DVertexBuffer7::Lock
* IDirect3DVertexBuffer7::Lock
*
*
* Locks the vertex buffer and returns a pointer to the vertex data
* Locks the vertex buffer and returns a pointer to the vertex data
* Locking vertex buffers is sim
m
ilar to locking surfaces, because Windows
* Locking vertex buffers is similar to locking surfaces, because Windows
* uses surfaces to store vertex data internally(According to the DX sdk)
* uses surfaces to store vertex data internally
(According to the DX sdk)
*
*
* Params:
* Params:
* Flags: Locking flags. Relevant here are DDLOCK_READONLY, DDLOCK_WRITEONLY,
* Flags: Locking flags. Relevant here are DDLOCK_READONLY, DDLOCK_WRITEONLY,
...
...
dlls/ddraw/viewport.c
View file @
9bfbfcbe
...
@@ -676,7 +676,7 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface,
...
@@ -676,7 +676,7 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface,
* IDirect3DViewport3::GetViewport2
* IDirect3DViewport3::GetViewport2
*
*
* Returns the currently set viewport in a D3DVIEWPORT2 structure.
* Returns the currently set viewport in a D3DVIEWPORT2 structure.
* Sim
m
ilar to IDirect3DViewport3::GetViewport
* Similar to IDirect3DViewport3::GetViewport
*
*
* Params:
* Params:
* lpData: Pointer to the structure to fill
* lpData: Pointer to the structure to fill
...
...
dlls/shell32/shlfolder.c
View file @
9bfbfcbe
...
@@ -189,7 +189,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
...
@@ -189,7 +189,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
* via IPersistFolder3 or IPersistFolder.
* via IPersistFolder3 or IPersistFolder.
*
*
* NOTES
* NOTES
* pathRoot can be NULL for Folders be
e
ing a drive.
* pathRoot can be NULL for Folders being a drive.
* In this case the absolute path is built from pidlChild (eg. C:)
* In this case the absolute path is built from pidlChild (eg. C:)
*/
*/
static
HRESULT
SHELL32_CoCreateInitSF
(
LPCITEMIDLIST
pidlRoot
,
LPCWSTR
pathRoot
,
static
HRESULT
SHELL32_CoCreateInitSF
(
LPCITEMIDLIST
pidlRoot
,
LPCWSTR
pathRoot
,
...
...
dlls/wined3d/device.c
View file @
9bfbfcbe
...
@@ -5184,7 +5184,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo
...
@@ -5184,7 +5184,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo
x
/=
2
;
x
/=
2
;
y
/=
2
;
y
/=
2
;
/* Msdn mention
e
s that Direct3D9 keeps a list of clipped vertices
/* Msdn mentions that Direct3D9 keeps a list of clipped vertices
* outside of the main vertex buffer memory. That needs some more
* outside of the main vertex buffer memory. That needs some more
* investigation...
* investigation...
*/
*/
...
...
dlls/wined3d/stateblock.c
View file @
9bfbfcbe
...
@@ -89,7 +89,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
...
@@ -89,7 +89,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
IWineD3DVertexDeclaration_Release
(
This
->
vertexDecl
);
IWineD3DVertexDeclaration_Release
(
This
->
vertexDecl
);
}
}
/* NOTE: according to MSDN: The applicaion is responsible for making sure the texture references are cleared down */
/* NOTE: according to MSDN: The applica
t
ion is responsible for making sure the texture references are cleared down */
for
(
counter
=
0
;
counter
<
GL_LIMITS
(
textures
);
counter
++
)
{
for
(
counter
=
0
;
counter
<
GL_LIMITS
(
textures
);
counter
++
)
{
if
(
This
->
textures
[
counter
])
{
if
(
This
->
textures
[
counter
])
{
/* release our 'internal' hold on the texture */
/* release our 'internal' hold on the texture */
...
...
dlls/wined3d/surface_gdi.c
View file @
9bfbfcbe
...
@@ -438,7 +438,7 @@ _Blt_ColorFill(BYTE *buf,
...
@@ -438,7 +438,7 @@ _Blt_ColorFill(BYTE *buf,
/*****************************************************************************
/*****************************************************************************
* IWineD3DSurface::Blt, GDI version
* IWineD3DSurface::Blt, GDI version
*
*
* Performs blits to a surface, eigh
t
er from a source of source-less blts
* Performs blits to a surface, eigher from a source of source-less blts
* This is the main functionality of DirectDraw
* This is the main functionality of DirectDraw
*
*
* Params:
* Params:
...
...
dlls/wined3d/utils.c
View file @
9bfbfcbe
...
@@ -2086,7 +2086,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
...
@@ -2086,7 +2086,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
Rect
->
top
-=
This
->
glRect
.
top
;
Rect
->
top
-=
This
->
glRect
.
top
;
Rect
->
bottom
-=
This
->
glRect
.
top
;
Rect
->
bottom
-=
This
->
glRect
.
top
;
/* Get the gl coordinates. The gl rectangle is a power of 2, eigh
t
er the max size,
/* Get the gl coordinates. The gl rectangle is a power of 2, eigher the max size,
* or the pow2Width / pow2Height of the surface
* or the pow2Width / pow2Height of the surface
*/
*/
glTexCoord
[
0
]
=
(
float
)
Rect
->
left
/
(
float
)
(
This
->
glRect
.
right
-
This
->
glRect
.
left
);
glTexCoord
[
0
]
=
(
float
)
Rect
->
left
/
(
float
)
(
This
->
glRect
.
right
-
This
->
glRect
.
left
);
...
...
programs/winefile/resource.h
View file @
9bfbfcbe
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#define IDI_WINEFILE 100
#define IDI_WINEFILE 100
/* accel
l
erators and menus */
/* accelerators and menus */
#define IDA_WINEFILE 101
#define IDA_WINEFILE 101
#define IDM_WINEFILE 102
#define IDM_WINEFILE 102
...
...
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