From 825baa23a2d77476b06299f853685216ef651ea0 Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 2 Apr 2008 14:26:42 -0500 Subject: [PATCH] ddraw: Spelling fixes. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/direct3d.c | 4 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 6 +++--- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 6 +++--- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/tests/visual.c | 2 +- dlls/ddraw/viewport.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 60ffdcd4d98..80c543c77b6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -339,7 +339,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) * * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE * - * These seem not really imporant for wine + * These don't seem very important for wine: * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX * * Returns: @@ -2186,12 +2186,12 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, * the WineD3DSurface when the ddraw surface is destroyed. * * However, for all surfaces which can be in a container in WineD3D, - * we have to do this. These surfaces are ususally complex surfaces, + * we have to do this. These surfaces are usually complex surfaces, * so this concerns primary surfaces with a front and a back buffer, * and textures. * * |------------------------| |-----------------| - * | DDraw surface | | Containter | + * | DDraw surface | | Container | * | | | | * | Child |<------------->| Parent | * | Texture |<------------->| | @@ -2633,7 +2633,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, { Pool = WINED3DPOOL_SYSTEMMEM; } - /* Should I forward the MANEGED cap to the managed pool ? */ + /* Should I forward the MANAGED cap to the managed pool ? */ /* Get the format. It's set already by CreateNewSurface */ Format = PixelFormat_DD2WineD3D(&object->surface_desc.u4.ddpfPixelFormat); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 62aa9ba5ce8..f39b0b085de 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -502,7 +502,7 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface, * * Parameters: * HWDesc: Structure to fill with the HW caps - * HelDesc: Structure to fill with the hardare emulation caps + * HelDesc: Structure to fill with the hardware emulation caps * * Returns: * D3D_OK on success @@ -1067,7 +1067,7 @@ IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface, * Params: * Count: Pointer to a DWORD containing the numbers of pick records to * retrieve - * D3DPickRec: Address to store the resulting D3DPICKRECORD arry. + * D3DPickRec: Address to store the resulting D3DPICKRECORD array. * * Returns: * D3D_OK, because it's a stub diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 730fcf63058..0e026fd1cf7 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -750,7 +750,7 @@ Thunk_IDirect3DImpl_1_FindDevice(IDirect3D *iface, * * Params: * refiid: IID of the device to create - * Surface: Inititial rendertarget + * Surface: Initial rendertarget * Device: Address to return the interface pointer * * Returns: @@ -1293,7 +1293,7 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D, WINED3DCAPS WCaps; HRESULT hr; - /* Some Variables to asign to the pointers in WCaps */ + /* Some variables to assign to the pointers in WCaps */ TRACE("()->(%p,%p,%p\n", WineD3D, Desc123, Desc7); memset(&WCaps, 0, sizeof(WCaps)); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 74ddb69bda4..eec147e13e7 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -149,7 +149,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface, * Assigns a lighting value to this object * * Params: - * Light: Lighting parametes to set + * Light: Lighting parameter to set * * Returns: * D3D_OK on success diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index a33cb34e4cb..76706eca2c2 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -649,7 +649,7 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * What is this? Seems to create DirectDraw objects... * * Params - * The ususal things??? + * The usual things??? * * RETURNS * ??? @@ -931,7 +931,7 @@ DllMain(HINSTANCE hInstDLL, struct list *entry, *entry2; WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); - /* We remove elemets from this loop */ + /* We remove elements from this loop */ LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) { HRESULT hr; @@ -950,7 +950,7 @@ DllMain(HINSTANCE hInstDLL, /* Does a D3D device exist? Destroy it * TODO: Destroy all Vertex buffers, Lights, Materials - * and execture buffers too + * and execute buffers too */ if(ddraw->d3ddevice) { diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 44fbe03d553..5ac2ae86c0f 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -125,7 +125,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface) * DDERR_ALREADYINITIALIZED * * Params: - * DD: DirectDraw interface this palette is asigned to + * DD: DirectDraw interface this palette is assigned to * Flags: Some flags, as usual * ColorTable: The startup color table * diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index da152de85f9..3467a640ea2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -287,7 +287,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) IUnknown *ifaceToRelease = This->ifaceToRelease; int i; - /* Complex attached surfaces are destroyed implicitely when the root is released */ + /* Complex attached surfaces are destroyed implicitly when the root is released */ EnterCriticalSection(&ddraw_cs); if(!This->is_complex_root) { @@ -711,7 +711,7 @@ IDirectDrawSurfaceImpl_Flip(IDirectDrawSurface7 *iface, * What about overlay surfaces, AFAIK they can flip too? */ if( !(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) ) - return DDERR_INVALIDOBJECT; /* Unckecked */ + return DDERR_INVALIDOBJECT; /* Unchecked */ EnterCriticalSection(&ddraw_cs); @@ -1317,7 +1317,7 @@ IDirectDrawSurfaceImpl_PageLock(IDirectDrawSurface7 *iface, * Allows a sysmem surface to be paged out * * Params: - * Flags: Not used, must be 0(unckeched) + * Flags: Not used, must be 0(unchecked) * * Returns: * DD_OK, because it's a stub diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index eb020a682ca..b10993bc5f4 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -359,7 +359,7 @@ static void LightTest(void) ok(rc == D3D_OK, "IDirect3DDevice7_GetCaps failed with %x\n", rc); if ( caps.dwMaxActiveLights == (DWORD) -1) { - /* Some cards without T&L Support return -1 (Examples: Vodoo banshee, RivaTNT / NV4) */ + /* Some cards without T&L Support return -1 (Examples: Voodoo Banshee, RivaTNT / NV4) */ skip("T&L not supported\n"); return; } @@ -518,7 +518,7 @@ static void ProcessVerticesTest(void) rc = IDirect3DVertexBuffer7_Lock(lpVBufDest2, 0, (void **) &out2, NULL); ok(rc==D3D_OK , "IDirect3DVertexBuffer::Lock returned: %x\n", rc); if(!out2) goto out; - /* Small thing without much practial meaning, but I stumbled upon it, + /* Small thing without much practical meaning, but I stumbled upon it, * so let's check for it: If the output vertex buffer has to RHW value, * The RHW value of the last vertex is written into the next vertex */ diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1e35e372acd..dded9914901 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -648,7 +648,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Blt(lpDst, NULL, lpSrc, NULL, DDBLT_KEYDEST, &fx); ok(rc == DD_OK, "IDirectDrawSurface_Blt returned %08x\n", rc); - /* With korrectly passed override keys no key in the surface is needed. + /* With correctly passed override keys no key in the surface is needed. * Again, the result was checked before, no need to do that again */ rc = IDirectDrawSurface_Blt(lpDst, NULL, lpSrc, NULL, DDBLT_KEYDESTOVERRIDE, &fx); @@ -2253,7 +2253,7 @@ static void PrivateDataTest(void) hr = IDirectDrawSurface7_GetPrivateData(surface7, &IID_IDirectDrawSurface7, &ptr, &size); ok(hr == DD_OK, "IDirectDrawSurface7_GetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) lpDD); - /* Object is NOT beein addrefed */ + /* Object is NOT being addrefed */ ok(ptr == (IUnknown *) lpDD, "Returned interface pointer is %p, expected %p\n", ptr, lpDD); ok(ref2 == ref + 1, "Object reference is %d, expected %d. ptr at %p, orig at %p\n", ref2, ref + 1, ptr, lpDD); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 8eb39cdede5..ee5bc7f500c 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -554,7 +554,7 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); - /* Draw without textures - Should resut in a white quad */ + /* Draw without textures - Should result in a white quad */ hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0); ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index deb4146d929..3d78383db4f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -620,7 +620,7 @@ IDirect3DViewportImpl_SetBackgroundDepth(IDirect3DViewport3 *iface, * * Params: * lplpDDSurface: Address to store the interface pointer - * lpValid: Set to TRUE if a depth is asigned, FALSE otherwise + * lpValid: Set to TRUE if a depth is assigned, FALSE otherwise * * Returns: * D3D_OK, because it's a stub -- 2.11.4.GIT