ddraw: Spelling fixes.
This commit is contained in:
parent
d6ba069d9e
commit
825baa23a2
|
@ -339,7 +339,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface)
|
||||||
*
|
*
|
||||||
* Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE
|
* 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
|
* DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
|
@ -2186,12 +2186,12 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This,
|
||||||
* the WineD3DSurface when the ddraw surface is destroyed.
|
* the WineD3DSurface when the ddraw surface is destroyed.
|
||||||
*
|
*
|
||||||
* However, for all surfaces which can be in a container in WineD3D,
|
* 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,
|
* so this concerns primary surfaces with a front and a back buffer,
|
||||||
* and textures.
|
* and textures.
|
||||||
*
|
*
|
||||||
* |------------------------| |-----------------|
|
* |------------------------| |-----------------|
|
||||||
* | DDraw surface | | Containter |
|
* | DDraw surface | | Container |
|
||||||
* | | | |
|
* | | | |
|
||||||
* | Child |<------------->| Parent |
|
* | Child |<------------->| Parent |
|
||||||
* | Texture |<------------->| |
|
* | Texture |<------------->| |
|
||||||
|
@ -2633,7 +2633,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
|
||||||
{
|
{
|
||||||
Pool = WINED3DPOOL_SYSTEMMEM;
|
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 */
|
/* Get the format. It's set already by CreateNewSurface */
|
||||||
Format = PixelFormat_DD2WineD3D(&object->surface_desc.u4.ddpfPixelFormat);
|
Format = PixelFormat_DD2WineD3D(&object->surface_desc.u4.ddpfPixelFormat);
|
||||||
|
|
|
@ -502,7 +502,7 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
|
||||||
*
|
*
|
||||||
* Parameters:
|
* Parameters:
|
||||||
* HWDesc: Structure to fill with the HW caps
|
* 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:
|
* Returns:
|
||||||
* D3D_OK on success
|
* D3D_OK on success
|
||||||
|
@ -1067,7 +1067,7 @@ IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface,
|
||||||
* Params:
|
* Params:
|
||||||
* Count: Pointer to a DWORD containing the numbers of pick records to
|
* Count: Pointer to a DWORD containing the numbers of pick records to
|
||||||
* retrieve
|
* retrieve
|
||||||
* D3DPickRec: Address to store the resulting D3DPICKRECORD arry.
|
* D3DPickRec: Address to store the resulting D3DPICKRECORD array.
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* D3D_OK, because it's a stub
|
* D3D_OK, because it's a stub
|
||||||
|
|
|
@ -750,7 +750,7 @@ Thunk_IDirect3DImpl_1_FindDevice(IDirect3D *iface,
|
||||||
*
|
*
|
||||||
* Params:
|
* Params:
|
||||||
* refiid: IID of the device to create
|
* refiid: IID of the device to create
|
||||||
* Surface: Inititial rendertarget
|
* Surface: Initial rendertarget
|
||||||
* Device: Address to return the interface pointer
|
* Device: Address to return the interface pointer
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
|
@ -1293,7 +1293,7 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D,
|
||||||
WINED3DCAPS WCaps;
|
WINED3DCAPS WCaps;
|
||||||
HRESULT hr;
|
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);
|
TRACE("()->(%p,%p,%p\n", WineD3D, Desc123, Desc7);
|
||||||
|
|
||||||
memset(&WCaps, 0, sizeof(WCaps));
|
memset(&WCaps, 0, sizeof(WCaps));
|
||||||
|
|
|
@ -149,7 +149,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
|
||||||
* Assigns a lighting value to this object
|
* Assigns a lighting value to this object
|
||||||
*
|
*
|
||||||
* Params:
|
* Params:
|
||||||
* Light: Lighting parametes to set
|
* Light: Lighting parameter to set
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* D3D_OK on success
|
* D3D_OK on success
|
||||||
|
|
|
@ -649,7 +649,7 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
|
||||||
* What is this? Seems to create DirectDraw objects...
|
* What is this? Seems to create DirectDraw objects...
|
||||||
*
|
*
|
||||||
* Params
|
* Params
|
||||||
* The ususal things???
|
* The usual things???
|
||||||
*
|
*
|
||||||
* RETURNS
|
* RETURNS
|
||||||
* ???
|
* ???
|
||||||
|
@ -931,7 +931,7 @@ DllMain(HINSTANCE hInstDLL,
|
||||||
struct list *entry, *entry2;
|
struct list *entry, *entry2;
|
||||||
WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n");
|
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)
|
LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list)
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -950,7 +950,7 @@ DllMain(HINSTANCE hInstDLL,
|
||||||
|
|
||||||
/* Does a D3D device exist? Destroy it
|
/* Does a D3D device exist? Destroy it
|
||||||
* TODO: Destroy all Vertex buffers, Lights, Materials
|
* TODO: Destroy all Vertex buffers, Lights, Materials
|
||||||
* and execture buffers too
|
* and execute buffers too
|
||||||
*/
|
*/
|
||||||
if(ddraw->d3ddevice)
|
if(ddraw->d3ddevice)
|
||||||
{
|
{
|
||||||
|
|
|
@ -125,7 +125,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface)
|
||||||
* DDERR_ALREADYINITIALIZED
|
* DDERR_ALREADYINITIALIZED
|
||||||
*
|
*
|
||||||
* Params:
|
* Params:
|
||||||
* DD: DirectDraw interface this palette is asigned to
|
* DD: DirectDraw interface this palette is assigned to
|
||||||
* Flags: Some flags, as usual
|
* Flags: Some flags, as usual
|
||||||
* ColorTable: The startup color table
|
* ColorTable: The startup color table
|
||||||
*
|
*
|
||||||
|
|
|
@ -287,7 +287,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
|
||||||
IUnknown *ifaceToRelease = This->ifaceToRelease;
|
IUnknown *ifaceToRelease = This->ifaceToRelease;
|
||||||
int i;
|
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);
|
EnterCriticalSection(&ddraw_cs);
|
||||||
if(!This->is_complex_root)
|
if(!This->is_complex_root)
|
||||||
{
|
{
|
||||||
|
@ -711,7 +711,7 @@ IDirectDrawSurfaceImpl_Flip(IDirectDrawSurface7 *iface,
|
||||||
* What about overlay surfaces, AFAIK they can flip too?
|
* What about overlay surfaces, AFAIK they can flip too?
|
||||||
*/
|
*/
|
||||||
if( !(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) )
|
if( !(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) )
|
||||||
return DDERR_INVALIDOBJECT; /* Unckecked */
|
return DDERR_INVALIDOBJECT; /* Unchecked */
|
||||||
|
|
||||||
EnterCriticalSection(&ddraw_cs);
|
EnterCriticalSection(&ddraw_cs);
|
||||||
|
|
||||||
|
@ -1317,7 +1317,7 @@ IDirectDrawSurfaceImpl_PageLock(IDirectDrawSurface7 *iface,
|
||||||
* Allows a sysmem surface to be paged out
|
* Allows a sysmem surface to be paged out
|
||||||
*
|
*
|
||||||
* Params:
|
* Params:
|
||||||
* Flags: Not used, must be 0(unckeched)
|
* Flags: Not used, must be 0(unchecked)
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
* DD_OK, because it's a stub
|
* DD_OK, because it's a stub
|
||||||
|
|
|
@ -359,7 +359,7 @@ static void LightTest(void)
|
||||||
ok(rc == D3D_OK, "IDirect3DDevice7_GetCaps failed with %x\n", rc);
|
ok(rc == D3D_OK, "IDirect3DDevice7_GetCaps failed with %x\n", rc);
|
||||||
|
|
||||||
if ( caps.dwMaxActiveLights == (DWORD) -1) {
|
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");
|
skip("T&L not supported\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -518,7 +518,7 @@ static void ProcessVerticesTest(void)
|
||||||
rc = IDirect3DVertexBuffer7_Lock(lpVBufDest2, 0, (void **) &out2, NULL);
|
rc = IDirect3DVertexBuffer7_Lock(lpVBufDest2, 0, (void **) &out2, NULL);
|
||||||
ok(rc==D3D_OK , "IDirect3DVertexBuffer::Lock returned: %x\n", rc);
|
ok(rc==D3D_OK , "IDirect3DVertexBuffer::Lock returned: %x\n", rc);
|
||||||
if(!out2) goto out;
|
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,
|
* 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
|
* The RHW value of the last vertex is written into the next vertex
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -648,7 +648,7 @@ static void SrcColorKey32BlitTest(void)
|
||||||
rc = IDirectDrawSurface_Blt(lpDst, NULL, lpSrc, NULL, DDBLT_KEYDEST, &fx);
|
rc = IDirectDrawSurface_Blt(lpDst, NULL, lpSrc, NULL, DDBLT_KEYDEST, &fx);
|
||||||
ok(rc == DD_OK, "IDirectDrawSurface_Blt returned %08x\n", rc);
|
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
|
* Again, the result was checked before, no need to do that again
|
||||||
*/
|
*/
|
||||||
rc = IDirectDrawSurface_Blt(lpDst, NULL, lpSrc, NULL, DDBLT_KEYDESTOVERRIDE, &fx);
|
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);
|
hr = IDirectDrawSurface7_GetPrivateData(surface7, &IID_IDirectDrawSurface7, &ptr, &size);
|
||||||
ok(hr == DD_OK, "IDirectDrawSurface7_GetPrivateData failed with %08x\n", hr);
|
ok(hr == DD_OK, "IDirectDrawSurface7_GetPrivateData failed with %08x\n", hr);
|
||||||
ref2 = getref((IUnknown *) lpDD);
|
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(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);
|
ok(ref2 == ref + 1, "Object reference is %d, expected %d. ptr at %p, orig at %p\n", ref2, ref + 1, ptr, lpDD);
|
||||||
|
|
||||||
|
|
|
@ -554,7 +554,7 @@ static void offscreen_test(IDirect3DDevice7 *device)
|
||||||
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0);
|
hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0);
|
||||||
ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr);
|
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);
|
hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0);
|
||||||
ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr);
|
ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr);
|
||||||
|
|
||||||
|
|
|
@ -620,7 +620,7 @@ IDirect3DViewportImpl_SetBackgroundDepth(IDirect3DViewport3 *iface,
|
||||||
*
|
*
|
||||||
* Params:
|
* Params:
|
||||||
* lplpDDSurface: Address to store the interface pointer
|
* 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:
|
* Returns:
|
||||||
* D3D_OK, because it's a stub
|
* D3D_OK, because it's a stub
|
||||||
|
|
Loading…
Reference in New Issue