Assorted spelling, case and grammar fixes
Francois Gouget
fgouget at free.fr
Fri Jun 23 11:18:02 CDT 2006
Changelog:
* dlls/ddraw/clipper.c
dlls/ddraw/ddraw.c
dlls/ddraw/ddraw_private.h
dlls/ddraw/device.c
dlls/ddraw/direct3d.c
dlls/ddraw/executebuffer.c
dlls/ddraw/gamma.c
dlls/ddraw/main.c
dlls/ddraw/surface.c
dlls/ddraw/utils.c
dlls/ddraw/vertexbuffer.c
dlls/ddraw/viewport.c
dlls/ddraw/tests/d3d.c
dlls/shell32/shlfolder.c
dlls/wined3d/device.c
dlls/wined3d/stateblock.c
dlls/wined3d/surface_gdi.c
dlls/wined3d/utils.c
programs/winefile/resource.h
Francois Gouget <fgouget at free.fr>
Assorted spelling, case and grammar fixes
--
Francois Gouget <fgouget at free.fr> http://fgouget.free.fr/
Advice is what we ask for when we already know the answer but wish we didn't
-- Eric Jong
-------------- next part --------------
Index: dlls/ddraw/clipper.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/clipper.c,v
retrieving revision 1.5
diff -u -p -r1.5 clipper.c
--- dlls/ddraw/clipper.c 15 Jun 2006 16:07:41 -0000 1.5
+++ dlls/ddraw/clipper.c 23 Jun 2006 15:55:54 -0000
@@ -212,7 +212,7 @@ static HRESULT WINAPI IDirectDrawClipper
*
* Sets or deletes (if lprgn is NULL) the clip list
*
- * This implementation is a stup and returns DD_OK always to make the app
+ * This implementation is a stub and returns DD_OK always to make the app
* happy.
*
* PARAMS
@@ -265,7 +265,7 @@ static HRESULT WINAPI IDirectDrawClipper
*
* Return values:
* DD_OK on success
- * DDERR_ALREADYINITIALIZED if this interface isn't initialized allready
+ * DDERR_ALREADYINITIALIZED if this interface isn't initialized already
*****************************************************************************/
static HRESULT WINAPI IDirectDrawClipperImpl_Initialize(
LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags
Index: dlls/ddraw/ddraw.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/ddraw.c,v
retrieving revision 1.3
diff -u -p -r1.3 ddraw.c
--- dlls/ddraw/ddraw.c 19 Jun 2006 08:37:01 -0000 1.3
+++ dlls/ddraw/ddraw.c 23 Jun 2006 15:55:54 -0000
@@ -66,7 +66,7 @@ static const DDDEVICEIDENTIFIER2 devicei
IDirectDrawImpl *ddraw_list;
/*****************************************************************************
- * IUnkown Methods
+ * IUnknown Methods
*****************************************************************************/
/*****************************************************************************
@@ -76,7 +76,7 @@ IDirectDrawImpl *ddraw_list;
* IDirectDraw interfaces in version 1, 2, 4 and 7, and IDirect3D interfaces
* in version 1, 2, 3 and 7. An IDirect3DDevice can be created with this
* method.
- * The returned interface is AddRef() before it's returned
+ * The returned interface is AddRef()-ed before it's returned
*
* Rules for QueryInterface:
* http://msdn.microsoft.com/library/default.asp? \
@@ -193,7 +193,7 @@ IDirectDrawImpl_QueryInterface(IDirectDr
/*****************************************************************************
* IDirectDraw7::AddRef
*
- * Increses the interfaces refcount. Used for version 1, 2, 4 and 7
+ * Increases the interfaces refcount. Used for version 1, 2, 4 and 7
*
* Returns: The new refcount
*****************************************************************************/
@@ -263,7 +263,7 @@ IDirectDrawImpl_Destroy(IDirectDrawImpl
/*****************************************************************************
* IDirectDraw7::Release
*
- * Decreses the refcount. If the refcount falls to 0, the object is destroyed
+ * Decreases the refcount. If the refcount falls to 0, the object is destroyed
*
* Returns: The new refcount
*****************************************************************************/
@@ -346,7 +346,7 @@ IDirectDrawImpl_SetupFullscreenWindow(ID
* TODO: Should I move it to 0/0 too?
*/
SetWindowPos(window, 0 /* InsertAfter, ignored */,
- 0, 0, 0, 0, /* Pos, Size, igored */
+ 0, 0, 0, 0, /* Pos, Size, ignored */
SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER);
}
@@ -384,14 +384,14 @@ IDirectDrawImpl_RestoreWindow(IDirectDra
/* Inform the window about the update */
SetWindowPos(window, 0 /* InsertAfter, ignored */,
- 0, 0, 0, 0, /* Pos, Size, igored */
+ 0, 0, 0, 0, /* Pos, Size, ignored */
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
}
/*****************************************************************************
* IDirectDraw7::SetCooperativeLevel
*
- * Sets the cooerative level for the DirectDraw object, and the window
+ * Sets the cooperative level for the DirectDraw object, and the window
* assigned to it. The cooperative level determines the general behavior
* of the DirectDraw application
*
@@ -403,7 +403,7 @@ IDirectDrawImpl_RestoreWindow(IDirectDra
* If you think that this function caused the failure because it writes a
* fixme, be sure to run again with a +ddraw trace.
*
- * What is known about cooperative levels(See the ddraw modes test):
+ * What is known about cooperative levels (See the ddraw modes test):
* DDSCL_EXCLUSIVE and DDSCL_FULLSCREEN must be used with each other
* DDSCL_NORMAL is not compatible with DDSCL_EXCLUSIVE or DDSCL_FULLSCREEN
* DDSCL_SETFOCUSWINDOW can be passed only in DDSCL_NORMAL mode, but after that
@@ -411,13 +411,13 @@ IDirectDrawImpl_RestoreWindow(IDirectDra
* DDSCL_SETFOCUSWINDOW may only be used with DDSCL_NOWINDOWCHANGES
*
* Handled flags: DDSCL_NORMAL, DDSCL_FULLSCREEN, DDSCL_EXCLUSIVE,
- * DDSCL_SETFOCUSWINDOW(partially)
+ * DDSCL_SETFOCUSWINDOW (partially)
*
* Unhandled flags, which should be implemented
- * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering(I don't
+ * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't
* expect any difference to a normal window for wine)
- * DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create it's own window for
- * rendering(Possible test case: Half-life)
+ * DDSCL_CREATEDEVICEWINDOW: Tells ddraw to create its own window for
+ * rendering (Possible test case: Half-life)
*
* Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE
*
@@ -428,8 +428,8 @@ IDirectDrawImpl_RestoreWindow(IDirectDra
* Returns:
* DD_OK if the cooperative level was set successfully
* DDERR_INVALIDPARAMS if the passed cooperative level combination is invalid
- * DDERR_HWNDALLREADYSET if DDSCL_SETFOCUSWINDOW is passed in exclusive mode
- * (Propably others too, have to investigate)
+ * DDERR_HWNDALREADYSET if DDSCL_SETFOCUSWINDOW is passed in exclusive mode
+ * (Probably others too, have to investigate)
*
*****************************************************************************/
static HRESULT WINAPI
@@ -461,7 +461,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDir
return DDERR_INVALIDPARAMS;
}
- /* Handle those levels first which set varios hwnds */
+ /* Handle those levels first which set various hwnds */
if(cooplevel & DDSCL_SETFOCUSWINDOW)
{
/* This isn't compatible with a lot of flags */
@@ -616,7 +616,7 @@ IDirectDrawImpl_SetCooperativeLevel(IDir
* IDirectDraw7::SetDisplayMode
*
* Sets the display screen resolution, color depth and refresh frequency
- * when in fullscreen mode(in theory).
+ * when in fullscreen mode (in theory).
* Possible return values listed in the SDK suggest that this method fails
* when not in fullscreen mode, but this is wrong. Windows 2000 happily sets
* the display mode in DDSCL_NORMAL mode without an hwnd specified.
@@ -649,7 +649,7 @@ IDirectDrawImpl_SetDisplayMode(IDirectDr
if( !Width || !Height )
{
ERR("Width=%ld, Height=%ld, what to do?\n", Width, Height);
- /* It looks like Need for speed Posche Unleashed expects DD_OK here */
+ /* It looks like Need for Speed Porsche Unleashed expects DD_OK here */
return DD_OK;
}
@@ -657,8 +657,8 @@ IDirectDrawImpl_SetDisplayMode(IDirectDr
if(!(This->cooperative_level & DDSCL_EXCLUSIVE))
return DDERR_NOEXCLUSIVEMODE;
* This is WRONG. Don't know if the SDK is completely
- * wrong and if there are any coditions when DDERR_NOEXCLUSIVE
- * is returned, but Half-Life 1.1.1.1(Steam version)
+ * wrong and if there are any conditions when DDERR_NOEXCLUSIVE
+ * is returned, but Half-Life 1.1.1.1 (Steam version)
* depends on this
*/
@@ -724,16 +724,16 @@ IDirectDrawImpl_RestoreDisplayMode(IDire
/*****************************************************************************
* IDirectDraw7::GetCaps
*
- * Returns the drives capatiblities
+ * Returns the drives capabilities
*
* Used for version 1, 2, 4 and 7
*
* Params:
- * DriverCaps: Structure to write the Hardware accellerated caps to
+ * DriverCaps: Structure to write the Hardware accelerated caps to
* HelCaps: Structure to write the emulation caps to
*
* Returns
- * This implementation returnd DD_OK only
+ * This implementation returns DD_OK only
*
*****************************************************************************/
static HRESULT WINAPI
@@ -866,7 +866,7 @@ IDirectDrawImpl_GetDisplayMode(IDirectDr
* Params:
* NumCodes: Contains the number of Codes that Codes can carry. Returns the number
* of enumerated codes
- * Codes: Pointer to an array of DWORDs where the supported codes are wriiten
+ * Codes: Pointer to an array of DWORDs where the supported codes are written
* to
*
* Returns
@@ -906,7 +906,7 @@ IDirectDrawImpl_GetMonitorFrequency(IDir
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
TRACE("(%p)->(%p)\n", This, Freq);
- /* Ideally this should be in WineD3D, as it concernes the screen setup,
+ /* Ideally this should be in WineD3D, as it concerns the screen setup,
* but for now this should make the games happy
*/
*Freq = 60;
@@ -971,7 +971,7 @@ IDirectDrawImpl_GetAvailableVidMem(IDire
}
/* Todo: System memory vs local video memory vs non-local video memory
- * The MSDN also mentiones differences between texture memory and other
+ * The MSDN also mentions differences between texture memory and other
* resources, but that's not important
*/
@@ -1071,7 +1071,7 @@ IDirectDrawImpl_WaitForVerticalBlank(IDi
/*****************************************************************************
* IDirectDraw7::GetScanLine
*
- * Returns the scan line that is beeing drawn on the monitor
+ * Returns the scan line that is being drawn on the monitor
*
* Parameters:
* Scanline: Address to write the scan line value to
@@ -1129,7 +1129,7 @@ IDirectDrawImpl_TestCooperativeLevel(IDi
/* Description from MSDN:
* For fullscreen apps return DDERR_NOEXCLUSIVEMODE if the user switched
* away from the app with e.g. alt-tab. Windowed apps receive
- * DDERR_EXCLUSIVEMODEALREADYSET if another application created an
+ * DDERR_EXCLUSIVEMODEALREADYSET if another application created a
* DirectDraw object in exclusive mode. DDERR_WRONGMODE is returned,
* when the video mode has changed
*/
@@ -1191,7 +1191,7 @@ IDirectDrawImpl_GetGDISurface(IDirectDra
DDSCAPS2 ddsCaps;
TRACE("(%p)->(%p)\n", This, GDISurface);
- /* Get the back buffer from the wineD3DDevice and search it's
+ /* Get the back buffer from the wineD3DDevice and search its
* attached surfaces for the front buffer
*/
hr = IWineD3DDevice_GetBackBuffer(This->wineD3DDevice,
@@ -1276,7 +1276,7 @@ IDirectDrawImpl_EnumDisplayModesCB(IUnkn
* IDirectDraw7::EnumDisplayModes
*
* Enumerates the supported Display modes. The modes can be filtered with
- * the DDSD paramter.
+ * the DDSD parameter.
*
* Params:
* Flags: can be DDEDM_REFRESHRATES and DDEDM_STANDARDVGAMODES
@@ -1336,7 +1336,7 @@ IDirectDrawImpl_EnumDisplayModes(IDirect
*
* Params:
* Flags: DDEM_MODEPASSED or DDEM_MODEFAILED
- * Timeout: Returns the amount of secounds left before the mode would have
+ * Timeout: Returns the amount of seconds left before the mode would have
* been failed automatically
*
* Returns:
@@ -1368,7 +1368,7 @@ IDirectDrawImpl_EvaluateMode(IDirectDraw
*
* Returns:
* On success it returns DD_OK
- * DDERR_INVALIDPARAMS if DDDI is NULL;
+ * DDERR_INVALIDPARAMS if DDDI is NULL
*
*****************************************************************************/
static HRESULT WINAPI
@@ -1377,7 +1377,7 @@ IDirectDrawImpl_GetDeviceIdentifier(IDir
DWORD Flags)
{
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
- TRACE("(%p)->(%p,%08lx) \n", This, DDDI, Flags);
+ TRACE("(%p)->(%p,%08lx)\n", This, DDDI, Flags);
if(!DDDI)
return DDERR_INVALIDPARAMS;
@@ -1449,10 +1449,10 @@ IDirectDrawImpl_RestoreAllSurfaces(IDire
* Tests the specified video modes to update the system registry with
* refresh rate information. StartModeTest starts the mode test,
* EvaluateMode is used to fail or pass a mode. If EvaluateMode
- * isn't called withhin 15 secounds, the mode is failed automatically
+ * isn't called within 15 seconds, the mode is failed automatically
*
* As refresh rates are handled by the X server, I don't think this
- * Methos is important
+ * Method is important
*
* Params:
* Modes: An array of mode specifications
@@ -1462,7 +1462,7 @@ IDirectDrawImpl_RestoreAllSurfaces(IDire
* Returns:
* Returns DDERR_TESTFINISHED if flags contains DDSMT_ISTESTREQUIRED,
* if no modes are passed, DDERR_INVALIDPARAMS is returned,
- * otherwise DD_OK;
+ * otherwise DD_OK
*
*****************************************************************************/
static HRESULT WINAPI
@@ -1492,7 +1492,7 @@ IDirectDrawImpl_StartModeTest(IDirectDra
* IDirectDrawImpl_RecreateSurfacesCallback
*
* Enumeration callback for IDirectDrawImpl_RecreateAllSurfaces.
- * It re-recreates the WineD3DSurface. It's pretty steightforward
+ * It re-recreates the WineD3DSurface. It's pretty straightforward
*
*****************************************************************************/
HRESULT WINAPI
@@ -1588,7 +1588,7 @@ IDirectDrawImpl_RecreateSurfacesCallback
/* TODO: Copy the surface content, except for render targets */
if(IWineD3DSurface_Release(wineD3DSurface) == 0)
- TRACE("Surface released successfull, next surface\n");
+ TRACE("Surface released successful, next surface\n");
else
ERR("Something's still holding the old WineD3DSurface\n");
@@ -1602,7 +1602,7 @@ IDirectDrawImpl_RecreateSurfacesCallback
*
* A function, that converts all wineD3DSurfaces to the new implementation type
* It enumerates all surfaces with IWineD3DDevice::EnumSurfaces, creates a
- * new WineD3DSurface, copys the content and releases the old surface
+ * new WineD3DSurface, copies the content and releases the old surface
*
*****************************************************************************/
static HRESULT
@@ -1662,7 +1662,7 @@ D3D7CB_CreateSurface(IUnknown *device,
int i;
TRACE("(%p) call back. surf=%p\n", device, surf);
- /* Find the wanted mipmap. There are enought mipmaps in the chain */
+ /* Find the wanted mipmap. There are enough mipmaps in the chain */
for(i = 0; i < level; i++)
surf = surf->next_complex;
@@ -1736,12 +1736,12 @@ IDirectDrawImpl_CreateNewSurface(IDirect
/* Policy if all surface implementations are available:
* First, check if a default type was set with winecfg. If not,
* try Xrender surfaces, and use them if they work. Next, check if
- * accellerated OpenGL is available, and use GL surfaces in this
- * case. If all fails, use GDI surfaces. If a 3DDEVICE surface
+ * accelerated OpenGL is available, and use GL surfaces in this
+ * case. If all else fails, use GDI surfaces. If a 3DDEVICE surface
* was created, always use OpenGL surfaces.
*
- * (Note: Xrender surfaces are not implemented by now, the
- * unaccellerated implementation uses GDI to render in Software)
+ * (Note: Xrender surfaces are not implemented for now, the
+ * unaccelerated implementation uses GDI to render in Software)
*/
/* Store the type. If it needs to be changed, all WineD3DSurfaces have to
@@ -1891,7 +1891,7 @@ IDirectDrawImpl_CreateNewSurface(IDirect
{
parImpl->child = (IUnknown *) (*ppSurf)->WineD3DSurface;
/* The IParent releases the WineD3DSurface, and
- * the ddraw surface does that too. Hold an reference
+ * the ddraw surface does that too. Hold a reference
*/
IWineD3DSurface_AddRef((*ppSurf)->WineD3DSurface);
}
@@ -1906,7 +1906,7 @@ IDirectDrawImpl_CreateNewSurface(IDirect
This->surface_list = *ppSurf;
/* Here we could store all created surfaces in the DirectDrawImpl structure,
- * But this could also be delegated to WineDDraw, as it keeps track of all it's
+ * But this could also be delegated to WineDDraw, as it keeps track of all its
* resources. Not implemented for now, as there are more important things ;)
*/
@@ -1978,7 +1978,7 @@ IDirectDrawImpl_CreateNewSurface(IDirect
/*****************************************************************************
* IDirectDraw7::CreateSurface
*
- * Creates a new IDirectDrawSurface object and returns it's interface.
+ * Creates a new IDirectDrawSurface object and returns its interface.
*
* The surface connections with wined3d are a bit tricky. Basically it works
* like this:
@@ -1994,9 +1994,9 @@ IDirectDrawImpl_CreateNewSurface(IDirect
* 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 ususally compley surfaces,
- * so this concernes primary surfaces with a front and a back buffer,
- * and textures textures.
+ * we have to do this. These surfaces are ususally complex surfaces,
+ * so this concerns primary surfaces with a front and a back buffer,
+ * and textures.
*
* |------------------------| |-----------------|
* | DDraw surface | | Containter |
@@ -2113,7 +2113,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
/* Modify some flags */
memset(&desc2, 0, sizeof(desc2));
- desc2.dwSize = sizeof(desc2); /*For the struct copy */
+ desc2.dwSize = sizeof(desc2); /* For the struct copy */
DD_STRUCT_COPY_BYSIZE(&desc2, DDSD);
desc2.dwSize = sizeof(desc2); /* To override a possibly smaller size */
desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */
@@ -2160,7 +2160,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
/* Wait: It could be a Z buffer */
if(desc2.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
{
- switch(desc2.u2.dwMipMapCount) /* Who had this glourious idea? */
+ switch(desc2.u2.dwMipMapCount) /* Who had this glorious idea? */
{
case 15:
PixelFormat_WineD3DtoDD(&desc2.u4.ddpfPixelFormat, WINED3DFMT_D15S1);
@@ -2235,7 +2235,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
else
{
/* Undocumented feature: Create sublevels until
- * eighter the width or the height is 1
+ * either the width or the height is 1
*/
DWORD min = desc2.dwWidth < desc2.dwHeight ?
desc2.dwWidth : desc2.dwHeight;
@@ -2293,7 +2293,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
IDirectDrawSurfaceImpl *iterator;
/* increase the mipmap level, but only if a mipmap is created
- * In this case, also half the size
+ * In this case, also halve the size
*/
if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP)
{
@@ -2332,7 +2332,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
/* If the implementation is OpenGL and there's no d3ddevice, attach a d3ddevice
* But attach the d3ddevice only if the currently created surface was
- * a primary surface(2D app in 3D mode) or a 3DDEVICE surface(3D app)
+ * a primary surface (2D app in 3D mode) or a 3DDEVICE surface (3D app)
* The only case I can think of where this doesn't apply is when a
* 2D app was configured by the user to run with OpenGL and it didn't create
* the render target as first surface. In this case the render target creation
@@ -2379,7 +2379,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra
if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
{
- /* a mipmap is created, create enought levels */
+ /* a mipmap is created, create enough levels */
levels = desc2.u2.dwMipMapCount;
}
else
@@ -2599,7 +2599,7 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw
*
* Params
* device: The WineD3DDevice's parent
- * Width, Height, Format: Dimesions and pixelformat of the render target
+ * Width, Height, Format: Dimensions and pixelformat of the render target
* Ignored, because the surface already exists
* MultiSample, MultisampleQuality, Lockable: Ignored for the same reason
* Lockable: ignored
@@ -2699,7 +2699,7 @@ D3D7CB_CreateDepthStencilSurface(IUnknow
* D3D7CB_CreateAdditionalSwapChain
*
* Callback function for WineD3D which creates a new WineD3DSwapchain
- * interface. It also creates a IParent interface to store that pointer,
+ * interface. It also creates an IParent interface to store that pointer,
* so the WineD3DSwapchain has a parent and can be released when the D3D
* device is destroyed
*****************************************************************************/
@@ -2749,7 +2749,7 @@ D3D7CB_CreateAdditionalSwapChain(IUnknow
/*****************************************************************************
* IDirectDrawImpl_AttachD3DDevice
*
- * Initializes the D3D capatiblities of WineD3D
+ * Initializes the D3D capabilities of WineD3D
*
* Params:
* primary: The primary surface for D3D
@@ -2827,7 +2827,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectD
SwapEffect = WINED3DSWAPEFFECT_COPY;
Flags = 0;
MultiSampleQuality = 0;
- FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; /* Default rate: It's allready set */
+ FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; /* Default rate: It's already set */
PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT;
TRACE("Passing mode %d\n", Mode.Format);
@@ -2847,7 +2847,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectD
localParameters.FullScreen_RefreshRateInHz = &FullScreen_RefreshRateInHz;
localParameters.PresentationInterval = &PresentationInterval;
- /* Set this NOW, otherwise creating the depth stencil surface will cause an
+ /* Set this NOW, otherwise creating the depth stencil surface will cause a
* recursive loop until ram or emulated video memory is full
*/
This->d3d_initialized = TRUE;
@@ -2990,8 +2990,8 @@ IDirectDrawImpl_CreatePalette(IDirectDra
* IDirectDraw7::DuplicateSurface
*
* Duplicates a surface. The surface memory points to the same memory as
- * the original surface, and it's released when the last surface referring
- * it is released. I guess that's beyond Wines surface management right now
+ * the original surface, and it's released when the last surface referencing
+ * it is released. I guess that's beyond Wine's surface management right now
* (Idea: create a new DDraw surface with the same WineD3DSurface. I need a
* test application to implement this)
*
@@ -3025,7 +3025,7 @@ IDirectDrawImpl_DuplicateSurface(IDirect
*****************************************************************************/
const IDirectDraw7Vtbl IDirectDraw7_Vtbl =
{
- /*** IUnkown ***/
+ /*** IUnknown ***/
IDirectDrawImpl_QueryInterface,
IDirectDrawImpl_AddRef,
IDirectDrawImpl_Release,
Index: dlls/ddraw/ddraw_private.h
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/ddraw_private.h,v
retrieving revision 1.56
diff -u -p -r1.56 ddraw_private.h
--- dlls/ddraw/ddraw_private.h 22 Jun 2006 11:19:22 -0000 1.56
+++ dlls/ddraw/ddraw_private.h 23 Jun 2006 15:55:54 -0000
@@ -98,7 +98,7 @@ struct IDirectDrawImpl
IDirectDrawSurfaceImpl *DepthStencilBuffer;
BOOL d3d_initialized;
- /* misc ddraw fields */
+ /* Misc ddraw fields */
UINT total_vidmem;
DWORD cur_scanline;
BOOL fake_vblank;
@@ -120,7 +120,7 @@ struct IDirectDrawImpl
HWND d3d_window;
IDirect3DDeviceImpl *d3ddevice;
- /* Varios HWNDs */
+ /* Various HWNDs */
HWND focuswindow;
HWND devicewindow;
@@ -395,7 +395,7 @@ struct IDirectDrawPaletteImpl
const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl;
/******************************************************************************
- * DirectDraw ClassFactory Implementation - incomplete
+ * DirectDraw ClassFactory implementation - incomplete
******************************************************************************/
typedef struct
{
@@ -469,7 +469,7 @@ struct IDirect3DMaterialImpl
void (*activate)(IDirect3DMaterialImpl* this);
};
-/* VTables in varios versions */
+/* VTables in various versions */
const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl;
const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl;
const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl;
Index: dlls/ddraw/device.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/device.c,v
retrieving revision 1.3
diff -u -p -r1.3 device.c
--- dlls/ddraw/device.c 22 Jun 2006 11:19:22 -0000 1.3
+++ dlls/ddraw/device.c 23 Jun 2006 15:55:54 -0000
@@ -70,7 +70,7 @@ const GUID IID_D3DDEVICE_WineD3D = {
*
* Used to query other interfaces from a Direct3DDevice interface.
* It can return interface pointers to all Direct3DDevice versions as well
- * as IDirectDraw and IDirect3D. For a link for QueryInterface
+ * as IDirectDraw and IDirect3D. For a link to QueryInterface
* rules see ddraw.c, IDirectDraw7::QueryInterface
*
* Exists in Version 1, 2, 3 and 7
@@ -217,7 +217,7 @@ Thunk_IDirect3DDeviceImpl_1_QueryInterfa
* IDirect3DDevice7::AddRef
*
* Increases the refcount....
- * The most exciting Method, definitly
+ * The most exciting Method, definitely
*
* Exists in Version 1, 2, 3 and 7
*
@@ -435,7 +435,7 @@ IDirect3DDeviceImpl_1_Initialize(IDirect
/*****************************************************************************
* IDirect3DDevice7::GetCaps
*
- * Retrieves the device's capatiblities
+ * Retrieves the device's capabilities
*
* This implementation is used for Version 7 only, the older versions have
* their own implementation.
@@ -463,8 +463,8 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DD
/*****************************************************************************
* IDirect3DDevice3::GetCaps
*
- * Retrieves the capatiblities of the hardware device and the emulation
- * device. For Wine, hardware and emulation are the same(it's all HW).
+ * Retrieves the capabilities of the hardware device and the emulation
+ * device. For Wine, hardware and emulation are the same (it's all HW).
*
* This implementation is used for Version 1, 2, and 3. Version 7 has its own
*
@@ -634,7 +634,7 @@ Thunk_IDirect3DDeviceImpl_1_GetStats(IDi
* Params:
* Desc: Buffer description
* ExecuteBuffer: Address to return the Interface pointer at
- * UnkOuter: Must be NULL. Basically for aggreation, which ddraw doesn't
+ * UnkOuter: Must be NULL. Basically for aggregation, which ddraw doesn't
* support
*
* Returns:
@@ -874,7 +874,7 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo
/*****************************************************************************
* IDirect3DDevice3::NextViewport
*
- * Returns an viewport from the viewport list, depending on the
+ * Returns a viewport from the viewport list, depending on the
* passed viewport and the flags.
*
* Exists in Version 1, 2 and 3. Note that all Viewport interface versions
@@ -886,7 +886,7 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewpo
*
* Returns:
* D3D_OK on success
- * DDERR_INVALIDPARAMS if the flags were wrong, ir Viewport was NULL
+ * DDERR_INVALIDPARAMS if the flags were wrong, or Viewport was NULL
*
*****************************************************************************/
static HRESULT WINAPI
@@ -1093,7 +1093,7 @@ EnumTextureFormatsCB(IUnknown *Device,
( fmt == WINED3DFMT_V8U8) ||
( fmt == WINED3DFMT_L6V5U5) )
{
- /* These formats exist exist in D3D3 and D3D7 only,
+ /* These formats exist in D3D3 and D3D7 only,
* so do not call the older callback
*/
if(cbs->cbv7) return cbs->cbv7(pformat, cbs->Context);
@@ -1115,7 +1115,7 @@ EnumTextureFormatsCB(IUnknown *Device,
* and a EnumTextureFormatsCB translated the WineD3DFormats to DDraw
* formats and calls the application callback.
*
- * This is for Version 7 and 3, the older versions have a different
+ * This is for Version 7 and 3, older versions have a different
* callback function and their own implementation
*
* Params:
@@ -1385,7 +1385,7 @@ IDirect3DDeviceImpl_1_DeleteMatrix(IDire
* Version 1, 2, 3 and 7
*
* Returns:
- * D3D_OK on sucess, for details see IWineD3DDevice::BeginScene
+ * D3D_OK on success, for details see IWineD3DDevice::BeginScene
*
*****************************************************************************/
static HRESULT WINAPI
@@ -1784,7 +1784,7 @@ Thunk_IDirect3DDeviceImpl_2_GetRenderTar
/*****************************************************************************
* IDirect3DDevice3::Begin
*
- * Begins a description block of vertices. This is simmilar to glBegin()
+ * Begins a description block of vertices. This is similar to glBegin()
* and glEnd(). After a call to IDirect3DDevice3::End, the vertices
* described with IDirect3DDevice::Vertex are drawn.
*
@@ -1853,7 +1853,7 @@ Thunk_IDirect3DDeviceImpl_2_Begin(IDirec
* Params:
* PrimitiveType: Primitive type to draw
* VertexType: A FVF description of the vertex format
- * Vertices: pointer to an array containg the vertices
+ * Vertices: pointer to an array containing the vertices
* NumVertices: The number of vertices in the vertex array
* Flags: Some flags ...
*
@@ -1908,7 +1908,7 @@ Thunk_IDirect3DDeviceImpl_2_BeginIndexed
* IDirect3DDevice3::Vertex
*
* Draws a vertex as described by IDirect3DDevice3::Begin. It places all
- * drawn vertices in an vertex buffer. If the buffer is to small, its
+ * drawn vertices in a vertex buffer. If the buffer is too small, its
* size is increased.
*
* Version 2 and 3
@@ -1962,7 +1962,7 @@ Thunk_IDirect3DDeviceImpl_2_Vertex(IDire
/*****************************************************************************
* IDirect3DDevice3::Index
*
- * Specifies an index to an vertex to be drawn. The vertex array has to
+ * Specifies an index to a vertex to be drawn. The vertex array has to
* be specified with BeginIndexed first.
*
* Parameters:
@@ -2256,7 +2256,7 @@ Thunk_IDirect3DDeviceImpl_2_SetRenderSta
*
* Returns:
* D3D_OK on success
- * DDERR_INVALIDPARAMS if the paramters were incorrect
+ * DDERR_INVALIDPARAMS if the parameters were incorrect
* Also check IDirect3DDevice7::SetRenderState
*
*****************************************************************************/
@@ -2449,11 +2449,11 @@ Thunk_IDirect3DDeviceImpl_2_GetLightStat
/*****************************************************************************
* IDirect3DDevice7::SetTransform
*
- * Assignes a D3DMATRIX to a transform type. The transform types are defined
+ * Assigns a D3DMATRIX to a transform type. The transform types are defined
* in include/d3dtypes.h.
* The D3DTRANSFORMSTATE_WORLD (=1) is translated to D3DTS_WORLDMATRIX(0)
* (=255) for wined3d, because the 1 transform state was removed in d3d8
- * and WineD3D allready understands the replacement D3DTS_WORLDMATRIX(0)
+ * and WineD3D already understands the replacement D3DTS_WORLDMATRIX(0)
*
* Version 2, 3 and 7
*
@@ -2643,7 +2643,7 @@ Thunk_IDirect3DDeviceImpl_2_MultiplyTran
/*****************************************************************************
* IDirect3DDevice7::DrawPrimitive
*
- * Draws primitves based on vertices in an application-provided pointer
+ * Draws primitives based on vertices in an application-provided pointer
*
* Version 2, 3 and 7. The IDirect3DDevice2 thunk converts the fixed vertex type into
* an FVF format for D3D7
@@ -3014,7 +3014,7 @@ Thunk_IDirect3DDeviceImpl_2_GetClipStatu
*
* Params:
* PrimitiveType: The primitive type to draw
- * VertexType: The FVF description of the vertices to draw(for the stride??)
+ * VertexType: The FVF description of the vertices to draw (for the stride??)
* D3DDrawPrimStrideData: A D3DDRAWPRIMITIVESTRIDEDDATA structure describing
* the vertex data locations
* VertexCount: The number of vertices to draw
@@ -3044,8 +3044,8 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrid
/* Get the strided data right. the wined3d structure is a bit bigger
* Watch out: The contents of the strided data are determined by the fvf,
* not by the members set in D3DDrawPrimStrideData. So it's valid
- * to have diffuse.lpvData set to 0xdeadbeef and not setting the diffuse
- * flag in the fvf.
+ * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is
+ * not set in the fvf.
*/
if(VertexType & D3DFVF_POSITION_MASK)
{
@@ -3300,7 +3300,7 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(ID
return hr;
}
- /* Set the vertex stream souce */
+ /* Set the vertex stream source */
hr = IWineD3DDevice_SetStreamSource(This->wineD3DDevice,
0 /* StreamNumber */,
vb->wineD3DVertexBuffer,
@@ -3462,7 +3462,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimiti
This->indexbuffer,
0);
- /* Set the vertex stream souce */
+ /* Set the vertex stream source */
hr = IWineD3DDevice_SetStreamSource(This->wineD3DDevice,
0 /* StreamNumber */,
vb->wineD3DVertexBuffer,
@@ -3513,19 +3513,19 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedP
*
* Calculates the visibility of spheres in the current viewport. The spheres
* are passed in the Centers and Radii arrays, the results are passed back
- * in the ReturnValues array. Return values are eighter completely visible,
+ * in the ReturnValues array. Return values are either completely visible,
* partially visible or completely invisible.
* The return value consist of a combination of D3DCLIP_* flags, or it's
* 0 if the sphere is completely visible(according to the SDK, not checked)
*
- * Sounds like an overdose math ;)
+ * Sounds like an overdose of math ;)
*
* Version 3 and 7
*
* Params:
* Centers: Array containing the sphere centers
- * Radii: Array containing the sphere radis
- * NumSpheres: The number of centers and radiis in the arrays
+ * Radii: Array containing the sphere radii
+ * NumSpheres: The number of centers and radii in the arrays
* Flags: Some flags
* ReturnValues: Array to write the results to
*
@@ -3564,7 +3564,7 @@ IDirect3DDeviceImpl_7_ComputeSphereVisib
* Not visible
* ->Some intersections: Partially visible
*
- * Implement this call in WineD3D. Eighter implement the
+ * Implement this call in WineD3D. Either implement the
* matrix and vector stuff in WineD3D, or use some external
* math library.
*/
@@ -3663,7 +3663,7 @@ Thunk_IDirect3DDeviceImpl_3_GetTexture(I
/*****************************************************************************
* IDirect3DDevice7::SetTexture
*
- * Assignes a texture to a texture stage. Is the texture AddRefed?
+ * Assigns a texture to a texture stage. Is the texture AddRef-ed?
*
* Version 3 and 7
*
@@ -3848,7 +3848,7 @@ Thunk_IDirect3DDeviceImpl_3_SetTextureSt
* Version 3 and 7
*
* Params:
- * NumPasses: Address to write the number of neccessary passes for the
+ * NumPasses: Address to write the number of necessary passes for the
* desired effect to.
*
* Returns:
@@ -4012,7 +4012,7 @@ IDirect3DDeviceImpl_7_SetMaterial(IDirec
* Version 7
*
* Params:
- * Mat: D3DMATERIAL7 structure to write the material paramters to
+ * Mat: D3DMATERIAL7 structure to write the material parameters to
*
* Returns:
* D3D_OK on success
@@ -4313,7 +4313,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(I
/*****************************************************************************
* IDirect3DDevice7::Load
*
- * Loads an rectangular area from the source into the destination texture.
+ * Loads a rectangular area from the source into the destination texture.
* It can also copy the source to the faces of a cubic environment map
*
* Version 7
@@ -4385,7 +4385,7 @@ IDirect3DDeviceImpl_7_LightEnable(IDirec
/*****************************************************************************
* IDirect3DDevice7::GetLightEnable
*
- * Retrieves if the light with the given index is enables or not
+ * Retrieves if the light with the given index is enabled or not
*
* Version 7
*
@@ -4479,7 +4479,7 @@ IDirect3DDeviceImpl_7_GetClipPlane(IDire
* IDirect3DDevice7::GetInfo
*
* Retrieves some information about the device. The DirectX sdk says that
- * this version returnes S_FALSE for all retail build of DirectX, that's
+ * this version returns S_FALSE for all retail builds of DirectX, that's what
* this implementation does.
*
* Params:
Index: dlls/ddraw/direct3d.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/direct3d.c,v
retrieving revision 1.2
diff -u -p -r1.2 direct3d.c
--- dlls/ddraw/direct3d.c 19 Jun 2006 10:44:41 -0000 1.2
+++ dlls/ddraw/direct3d.c 23 Jun 2006 15:55:54 -0000
@@ -243,7 +243,7 @@ IDirect3DImpl_7_EnumDevices(IDirect3D7 *
* IDirect3D3::EnumDevices
*
* 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
*
@@ -405,7 +405,7 @@ Thunk_IDirect3DImpl_1_CreateLight(IDirec
* IDirect3D3::CreateMaterial
*
* 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.
*
* Version 1, 2 and 3
@@ -501,7 +501,7 @@ Thunk_IDirect3DImpl_1_CreateMaterial(IDi
* by Direct3D and earlier versions for Viewport management. In Direct3D7
* it has been replaced by a viewport structure and
* IDirect3DDevice7::*Viewport. Wine's IDirect3DViewport implementation
- * uses the IDirect3DDevice7 methods for it's functionality
+ * uses the IDirect3DDevice7 methods for its functionality
*
* Params:
* Viewport: Address to store the new interface pointer
@@ -580,7 +580,7 @@ Thunk_IDirect3DImpl_1_CreateViewport(IDi
*
* Verion 1, 2 and 3
* Params:
- * D3DDFS: Describes the requested device charakteristics
+ * D3DDFS: Describes the requested device characteristics
* D3DFDR: Returns the device description
*
* Returns:
@@ -747,12 +747,12 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7
IndexBufferParent->ref = 1;
/* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives
- * Create a (hopefully) long enought 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
* takes the pointer and avoids the memcpy
*/
hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice,
- 0x40000, /* Lenght. Don't know how long it should be */
+ 0x40000, /* Length. Don't know how long it should be */
0, /* Usage */
WINED3DFMT_INDEX16, /* Format. D3D7 uses WORDS */
WINED3DPOOL_DEFAULT,
@@ -812,7 +812,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7
}
/* AddRef the render target. Also AddRef the render target from ddraw,
- * because if it released before the app releases the D3D device, the D3D capatiblities
+ * because if it is released before the app releases the D3D device, the D3D capabilities
* 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
@@ -899,7 +899,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDire
HRESULT hr;
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) dwCaps=%08lx\n", This, Desc->dwCaps);
TRACE("(%p) FVF=%08lx\n", This, Desc->dwFVF);
@@ -1061,7 +1061,7 @@ Thunk_IDirect3DImpl_3_EnumZBufferFormats
/*****************************************************************************
* 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.
*
* Version 3 and 7
@@ -1101,8 +1101,8 @@ Thunk_IDirect3DImpl_3_EvictManagedTextur
*
* Params:
* WineD3D: The interface to get the caps from
- * Desc123: Old D3D <3 structure to fill(needed)
- * Desc7: D3D7 device desc structure to fill(needed)
+ * Desc123: Old D3D <3 structure to fill (needed)
+ * Desc7: D3D7 device desc structure to fill (needed)
*
* Returns
* D3D_OK on success, or the return value of IWineD3D::GetCaps
Index: dlls/ddraw/executebuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/executebuffer.c,v
retrieving revision 1.6
diff -u -p -r1.6 executebuffer.c
--- dlls/ddraw/executebuffer.c 15 Jun 2006 16:07:41 -0000 1.6
+++ dlls/ddraw/executebuffer.c 23 Jun 2006 15:55:54 -0000
@@ -78,7 +78,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(L
* for drawing the vertices. It is called from
* IDirect3DDevice::Execute
*
- * TODO: Perhaps some comments about the varios opcodes wouldn't hurt
+ * TODO: Perhaps some comments about the various opcodes wouldn't hurt
*
* Don't declare this static, as it's called from device.c,
* IDirect3DDevice::Execute
Index: dlls/ddraw/gamma.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/gamma.c,v
retrieving revision 1.1
diff -u -p -r1.1 gamma.c
--- dlls/ddraw/gamma.c 15 Jun 2006 16:07:40 -0000 1.1
+++ dlls/ddraw/gamma.c 23 Jun 2006 15:55:54 -0000
@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
/**********************************************************
- * IUnkown parts follow
+ * IUnknown parts follow
**********************************************************/
/**********************************************************
Index: dlls/ddraw/main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/main.c,v
retrieving revision 1.60
diff -u -p -r1.60 main.c
--- dlls/ddraw/main.c 15 Jun 2006 16:08:35 -0000 1.60
+++ dlls/ddraw/main.c 23 Jun 2006 15:55:55 -0000
@@ -71,7 +71,7 @@ WINED3DSURFTYPE DefaultSurfaceType = SUR
* iid: requested version ID.
*
* Returns:
- * DD_OK if the Interface was created sucessfully
+ * DD_OK if the Interface was created successfully
* CLASS_E_NOAGGREGATION if UnkOuter is not NULL
* E_OUTOFMEMORY if some allocation failed
*
@@ -111,7 +111,7 @@ DDRAW_Create(GUID *guid,
devicetype = 0;
}
- /* DDraw doesn't support aggreation, according to msdn */
+ /* DDraw doesn't support aggregation, according to msdn */
if (UnkOuter != NULL)
return CLASS_E_NOAGGREGATION;
@@ -169,7 +169,7 @@ DDRAW_Create(GUID *guid,
/* Initialized member...
*
* 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
*/
This->initialized = FALSE;
@@ -177,7 +177,7 @@ DDRAW_Create(GUID *guid,
/* Initialize WineD3DDevice
*
* It is used for screen setup, surface and palette creation
- * When a Direct3DDevice7 is created, the D3D capatiblities of WineD3D are
+ * When a Direct3DDevice7 is created, the D3D capabilities of WineD3D are
* initialized
*/
hr = IWineD3D_CreateDevice(wineD3D,
Index: dlls/ddraw/surface.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/surface.c,v
retrieving revision 1.4
diff -u -p -r1.4 surface.c
--- dlls/ddraw/surface.c 19 Jun 2006 10:44:41 -0000 1.4
+++ dlls/ddraw/surface.c 23 Jun 2006 15:55:55 -0000
@@ -51,7 +51,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/*****************************************************************************
- * IUnkown parts follow
+ * IUnknown parts follow
*****************************************************************************/
/*****************************************************************************
@@ -172,7 +172,7 @@ IDirectDrawSurfaceImpl_AddRef(IDirectDra
*
* 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
*
* Params:
@@ -196,10 +196,10 @@ static void IDirectDrawSurfaceImpl_Destr
/* Check for attached surfaces and detach them */
if(This->first_attached != This)
{
- /* Well, this shouldn't happen: The surface beeing 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
- * is called, because the refcount is hold. It looks like the app released()
- * it often enought to force this
+ * is called, because the refcount is held. It looks like the app released()
+ * it often enough to force this
*/
IDirectDrawSurface7 *root = ICOM_INTERFACE(This->first_attached, IDirectDrawSurface7);
IDirectDrawSurface7 *detach = ICOM_INTERFACE(This, IDirectDrawSurface7);
@@ -262,16 +262,16 @@ static void IDirectDrawSurfaceImpl_Destr
* It has a nice graph explaining the connection.
*
* 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
* complex surfaces attached to it, then these surfaces are destroyed too,
- * regardless of their refcount. If any surface beeing destroyed has another
- * surface attached to it(with a "soft" attachment, not complex), then
+ * regardless of their refcount. If any surface being destroyed has another
+ * surface attached to it (with a "soft" attachment, not complex), then
* this surface is detached with DeleteAttachedSurface.
*
* When the surface is a texture, the WineD3DTexture is released.
* If the surface is the Direct3D render target, then the D3D
- * capatiblities of the WineD3DDevice are uninitialized, which causes the
+ * capabilities of the WineD3DDevice are uninitialized, which causes the
* swapchain to be released.
*
* Returns:
@@ -394,7 +394,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDr
/*****************************************************************************
* IDirectDrawSurface7::GetAttachedSurface
*
- * Returns an attached surface with the requested caps. Surface attchment
+ * Returns an attached surface with the requested caps. Surface attachment
* and complex surfaces are not clearly described by the MSDN or sdk,
* so this method is tricky and likely to contain problems.
* This implementation searches the complex chain first, then the
@@ -405,7 +405,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDr
* returned. The MSDN says that this method fails if more than one surface
* matches the caps, but apparently this is incorrect.
*
- * The found surface is AddRefed before it's returned.
+ * The found surface is AddRef-ed before it is returned.
*
* Params:
* Caps: Pointer to a DDCAPS2 structure describing the caps asked for
@@ -461,7 +461,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurfac
* that matches the capabilities requested."
*
* The mipmap demo of the DirectX7 sdk shows what to do here:
- * aparently apps expect the first found surface to be returned.
+ * apparently apps expect the first found surface to be returned.
*/
TRACE("(%p): Returning surface %p\n", This, surf);
@@ -493,7 +493,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurfac
* that matches the capabilities requested."
*
* The mipmap demo of the DirectX7 sdk shows what to do here:
- * aparently apps expect the first found surface to be returned.
+ * apparently apps expect the first found surface to be returned.
*/
TRACE("(%p): Returning surface %p\n", This, surf);
@@ -526,7 +526,7 @@ IDirectDrawSurfaceImpl_GetAttachedSurfac
/*****************************************************************************
* IDirectDrawSurface7::Lock
*
- * Locks the surface and returnes a pointer to the surface's memory
+ * Locks the surface and returns a pointer to the surface's memory
*
* Params:
* Rect: Rectangle to lock. If NULL, the whole surface is locked
@@ -716,18 +716,18 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSu
/*****************************************************************************
* IDirectDrawSurface7::AddAttachedSurface
*
- * Attaches an 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
- * 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 the first surface, and a surface that has no attachments
* first_attached points to the surface itself. A surface that has
* no successors in the chain has next_attached set to NULL.
*
* Newly attached surfaces are attached right after the root surface. The
- * complex chains are handled seperately in a simmilar chain, with
+ * complex chains are handled separately in a similar chain, with
* 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,
* not the complex root. See GetAttachedSurface for a description
@@ -833,7 +833,7 @@ IDirectDrawSurfaceImpl_DeleteAttachedSur
* and all parent surfaces */
}
- /* Find the Precessor of the detached surface */
+ /* Find the predecessor of the detached surface */
while(Prev)
{
if(Prev->next_attached == Surf) break;
@@ -1046,7 +1046,7 @@ IDirectDrawSurfaceImpl_SetPrivateData(ID
/*****************************************************************************
* IDirectDrawSurface7::GetPrivateData
*
- * Returnes the private data set with IDirectDrawSurface7::SetPrivateData
+ * Returns the private data set with IDirectDrawSurface7::SetPrivateData
*
* Params:
* tag: GUID of the data to return
@@ -1080,7 +1080,7 @@ IDirectDrawSurfaceImpl_GetPrivateData(ID
/*****************************************************************************
* IDirectDrawSurface7::FreePrivateData
*
- * Frees private stored in the surface
+ * Frees private data stored in the surface
*
* Params:
* tag: Tag of the data to free
@@ -1645,7 +1645,7 @@ static HRESULT WINAPI IDirectDrawSurface
volatile IDirectDrawSurfaceImpl* vThis = This;
TRACE("(%p)\n",This);
- /* A uniquness value of 0 is apparently special.
+ /* A uniqueness value of 0 is apparently special.
* This needs to be checked. */
while (1) {
DWORD old_uniqueness_value = vThis->uniqueness_value;
Index: dlls/ddraw/utils.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/utils.c,v
retrieving revision 1.1
diff -u -p -r1.1 utils.c
--- dlls/ddraw/utils.c 15 Jun 2006 16:07:40 -0000 1.1
+++ dlls/ddraw/utils.c 23 Jun 2006 15:55:55 -0000
@@ -467,7 +467,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DD
case 8:
if(DDPixelFormat->u1.dwAlphaBitDepth == 8)
return WINED3DFMT_A8L8;
- ERR("Unkown Alpha / Lumincase bit depth combination\n");
+ ERR("Unknown Alpha / Lumincase bit depth combination\n");
return WINED3DFMT_UNKNOWN;
}
}
@@ -484,7 +484,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DD
return WINED3DFMT_L8;
default:
- ERR("Unkown luminance-only bit depth 0x%lx\n", DDPixelFormat->u1.dwLuminanceBitCount);
+ ERR("Unknown luminance-only bit depth 0x%lx\n", DDPixelFormat->u1.dwLuminanceBitCount);
return WINED3DFMT_UNKNOWN;
}
}
@@ -497,7 +497,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DD
switch(DDPixelFormat->u1.dwZBufferBitDepth)
{
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_UNKNOWN\n");
return WINED3DFMT_UNKNOWN;
case 15:
@@ -519,7 +519,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DD
return WINED3DFMT_D24X4S4;
default:
- ERR("Unkown Z buffer depth %ld\n", DDPixelFormat->u1.dwZBufferBitDepth);
+ ERR("Unknown Z buffer depth %ld\n", DDPixelFormat->u1.dwZBufferBitDepth);
return WINED3DFMT_UNKNOWN;
}
}
@@ -1123,7 +1123,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpc
* Params:
* dest: Pointer to the destination matrix
* src1: Pointer to the first source matrix
- * src2: Pointer to the secound source matrix
+ * src2: Pointer to the second source matrix
*
*****************************************************************************/
void
Index: dlls/ddraw/vertexbuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/vertexbuffer.c,v
retrieving revision 1.8
diff -u -p -r1.8 vertexbuffer.c
--- dlls/ddraw/vertexbuffer.c 15 Jun 2006 16:08:35 -0000 1.8
+++ dlls/ddraw/vertexbuffer.c 23 Jun 2006 15:55:55 -0000
@@ -188,8 +188,8 @@ Thunk_IDirect3DVertexBufferImpl_1_Releas
* IDirect3DVertexBuffer7::Lock
*
* Locks the vertex buffer and returns a pointer to the vertex data
- * Locking vertex buffers is simmilar to locking surfaces, because Windows
- * uses surfaces to store vertex data internally(According to the DX sdk)
+ * Locking vertex buffers is similar to locking surfaces, because Windows
+ * uses surfaces to store vertex data internally (According to the DX sdk)
*
* Params:
* Flags: Locking flags. Relevant here are DDLOCK_READONLY, DDLOCK_WRITEONLY,
Index: dlls/ddraw/viewport.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/viewport.c,v
retrieving revision 1.6
diff -u -p -r1.6 viewport.c
--- dlls/ddraw/viewport.c 19 Jun 2006 10:44:41 -0000 1.6
+++ dlls/ddraw/viewport.c 23 Jun 2006 15:55:56 -0000
@@ -676,7 +676,7 @@ IDirect3DViewportImpl_NextLight(IDirect3
* IDirect3DViewport3::GetViewport2
*
* Returns the currently set viewport in a D3DVIEWPORT2 structure.
- * Simmilar to IDirect3DViewport3::GetViewport
+ * Similar to IDirect3DViewport3::GetViewport
*
* Params:
* lpData: Pointer to the structure to fill
Index: dlls/ddraw/tests/d3d.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/d3d.c,v
retrieving revision 1.11
diff -u -p -r1.11 d3d.c
--- dlls/ddraw/tests/d3d.c 15 Jun 2006 16:07:43 -0000 1.11
+++ dlls/ddraw/tests/d3d.c 23 Jun 2006 15:55:56 -0000
@@ -33,7 +33,7 @@ static LPDIRECT3DVERTEXBUFFER7 lpVBufDes
static LPDIRECT3DVERTEXBUFFER7 lpVBufDest2 = NULL;
/* To compare bad floating point numbers. Not the ideal way to do it,
- * but it should be enought for here */
+ * but it should be enough for here */
#define comparefloat(a, b) ( ((a - b) < 0.0001) && ((a-b) > -0.0001) )
static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
Index: dlls/shell32/shlfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfolder.c,v
retrieving revision 1.113
diff -u -p -r1.113 shlfolder.c
--- dlls/shell32/shlfolder.c 23 May 2006 12:48:39 -0000 1.113
+++ dlls/shell32/shlfolder.c 23 Jun 2006 15:56:07 -0000
@@ -189,7 +189,7 @@ HRESULT SHELL32_ParseNextElement (IShell
* via IPersistFolder3 or IPersistFolder.
*
* NOTES
- * pathRoot can be NULL for Folders beeing a drive.
+ * pathRoot can be NULL for Folders being a drive.
* In this case the absolute path is built from pidlChild (eg. C:)
*/
static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot,
Index: dlls/wined3d/device.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/device.c,v
retrieving revision 1.232
diff -u -p -r1.232 device.c
--- dlls/wined3d/device.c 21 Jun 2006 10:27:39 -0000 1.232
+++ dlls/wined3d/device.c 23 Jun 2006 15:56:12 -0000
@@ -5016,7 +5016,7 @@ process_vertices_strided(IWineD3DDeviceI
x /= 2;
y /= 2;
- /* Msdn mentiones 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
* investigation...
*/
Index: dlls/wined3d/stateblock.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/stateblock.c,v
retrieving revision 1.43
diff -u -p -r1.43 stateblock.c
--- dlls/wined3d/stateblock.c 10 Jun 2006 11:32:17 -0000 1.43
+++ dlls/wined3d/stateblock.c 23 Jun 2006 15:56:12 -0000
@@ -89,7 +89,7 @@ static ULONG WINAPI IWineD3DStateBlockI
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 application is responsible for making sure the texture references are cleared down */
for (counter = 0; counter < GL_LIMITS(textures); counter++) {
if (This->textures[counter]) {
/* release our 'internal' hold on the texture */
Index: dlls/wined3d/surface_gdi.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/surface_gdi.c,v
retrieving revision 1.8
diff -u -p -r1.8 surface_gdi.c
--- dlls/wined3d/surface_gdi.c 21 Jun 2006 10:27:39 -0000 1.8
+++ dlls/wined3d/surface_gdi.c 23 Jun 2006 15:56:12 -0000
@@ -438,7 +438,7 @@ _Blt_ColorFill(BYTE *buf,
/*****************************************************************************
* IWineD3DSurface::Blt, GDI version
*
- * Performs blits to a surface, eighter 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
*
* Params:
Index: dlls/wined3d/utils.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/utils.c,v
retrieving revision 1.43
diff -u -p -r1.43 utils.c
--- dlls/wined3d/utils.c 21 Jun 2006 10:27:39 -0000 1.43
+++ dlls/wined3d/utils.c 23 Jun 2006 15:56:12 -0000
@@ -2086,7 +2086,7 @@ BOOL CalculateTexRect(IWineD3DSurfaceImp
Rect->top -= This->glRect.top;
Rect->bottom -= This->glRect.top;
- /* Get the gl coordinates. The gl rectangle is a power of 2, eighter 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
*/
glTexCoord[0] = (float) Rect->left / (float) (This->glRect.right - This->glRect.left);
Index: programs/winefile/resource.h
===================================================================
RCS file: /home/wine/wine/programs/winefile/resource.h,v
retrieving revision 1.20
diff -u -p -r1.20 resource.h
--- programs/winefile/resource.h 23 May 2006 12:49:28 -0000 1.20
+++ programs/winefile/resource.h 23 Jun 2006 15:56:21 -0000
@@ -25,7 +25,7 @@
#define IDI_WINEFILE 100
-/* accellerators and menus */
+/* accelerators and menus */
#define IDA_WINEFILE 101
#define IDM_WINEFILE 102
More information about the wine-patches
mailing list