ddraw: Remove some stray tabs.

dlls/ddraw/clipper.c

@@ -52,17 +52,15 @@ static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface(
 
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppvObj);
 
-    if (IsEqualGUID(&IID_IUnknown, riid)
-	|| IsEqualGUID(&IID_IDirectDrawClipper, riid))
+    if (IsEqualGUID(&IID_IDirectDrawClipper, riid)
+            || IsEqualGUID(&IID_IUnknown, riid))
     {
         IUnknown_AddRef(iface);
         *ppvObj = iface;
         return S_OK;
     }
-    else
-    {
+
     return E_NOINTERFACE;
-    }
 }
 
 /*****************************************************************************

dlls/ddraw/main.c

@@ -687,8 +687,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     TRACE("rclsid %s, riid %s, object %p.\n",
             debugstr_guid(rclsid), debugstr_guid(riid), ppv);
 
-    if ( !IsEqualGUID( &IID_IClassFactory, riid )
-	 && ! IsEqualGUID( &IID_IUnknown, riid) )
+    if (!IsEqualGUID(&IID_IClassFactory, riid)
+            && !IsEqualGUID(&IID_IUnknown, riid))
         return E_NOINTERFACE;
 
     for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++)

dlls/ddraw/material.c

@@ -326,10 +326,8 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
     return D3D_OK;
 }
 
-static HRESULT WINAPI
-Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface,
-					LPDIRECT3DDEVICE2 lpDirect3DDevice2,
-					LPD3DMATERIALHANDLE lpHandle)
+static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface,
+        IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle)
 {
     TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle);
 
@@ -337,10 +335,8 @@ Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface,
             (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle);
 }
 
-static HRESULT WINAPI
-Thunk_IDirect3DMaterialImpl_1_GetHandle(LPDIRECT3DMATERIAL iface,
-					LPDIRECT3DDEVICE lpDirect3DDevice,
-					LPD3DMATERIALHANDLE lpHandle)
+static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface,
+        IDirect3DDevice *lpDirect3DDevice, D3DMATERIALHANDLE *lpHandle)
 {
     TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle);
 

dlls/ddraw/palette.c

-/*		DirectDraw - IDirectPalette base interface
- *
+/*
  * Copyright 2006 Stefan Dösinger
  *
  * This library is free software; you can redistribute it and/or

dlls/ddraw/tests/dsurface.c

@@ -77,7 +77,8 @@ static void MipMapCreationTest(void)
     ddsd.dwHeight = 32;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -107,7 +108,8 @@ static void MipMapCreationTest(void)
     ddsd.dwHeight = 32;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -139,7 +141,8 @@ static void MipMapCreationTest(void)
     ddsd.dwHeight = 32;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -170,7 +173,8 @@ static void MipMapCreationTest(void)
     ddsd.dwHeight = 64;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -234,7 +238,8 @@ static void SrcColorKey32BlitTest(void)
     U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x0000FF;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDst, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -244,7 +249,8 @@ static void SrcColorKey32BlitTest(void)
     ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0xFF00FF;
     rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpSrc, NULL);
     ok(rc==DD_OK,"CreateSurface returned: %x\n",rc);
-    if (FAILED(rc)) {
+    if (FAILED(rc))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -1862,7 +1868,8 @@ static void test_lockrect_invalid(void)
 
         hr = IDirectDraw_CreateSurface(lpDD, &surface_desc, &surface, NULL);
         ok(SUCCEEDED(hr), "CreateSurface failed (0x%08x)\n", hr);
-        if (FAILED(hr)) {
+        if (FAILED(hr))
+        {
             skip("failed to create surface\n");
             continue;
         }
@@ -1951,7 +1958,8 @@ static void CompressedTest(void)
 
     hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);
     ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);
-    if (FAILED(hr)) {
+    if (FAILED(hr))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -1975,7 +1983,8 @@ static void CompressedTest(void)
     U4(ddsd).ddpfPixelFormat.dwFourCC = MAKEFOURCC('D','X','T','3');
     hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);
     ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);
-    if (FAILED(hr)) {
+    if (FAILED(hr))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -1998,7 +2007,8 @@ static void CompressedTest(void)
     U4(ddsd).ddpfPixelFormat.dwFourCC = MAKEFOURCC('D','X','T','5');
     hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);
     ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);
-    if (FAILED(hr)) {
+    if (FAILED(hr))
+    {
         skip("failed to create surface\n");
         return;
     }
@@ -2699,7 +2709,8 @@ static void PaletteTest(void)
     U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x0000FF;
     hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpSurf, NULL);
     ok(hr==DD_OK, "CreateSurface returned: %x\n",hr);
-    if (FAILED(hr)) {
+    if (FAILED(hr))
+    {
         skip("failed to create surface\n");
         goto err;
     }

dlls/ddraw/viewport.c

@@ -52,14 +52,17 @@ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) {
     }
 
     /* And copy the values in the structure used by the device */
-    if (This->use_vp2) {
+    if (This->use_vp2)
+    {
         vp.dwX = This->viewports.vp2.dwX;
         vp.dwY = This->viewports.vp2.dwY;
         vp.dwHeight = This->viewports.vp2.dwHeight;
         vp.dwWidth = This->viewports.vp2.dwWidth;
         vp.dvMinZ = This->viewports.vp2.dvMinZ;
         vp.dvMaxZ = This->viewports.vp2.dvMaxZ;
-    } else {
+    }
+    else
+    {
         vp.dwX = This->viewports.vp1.dwX;
         vp.dwY = This->viewports.vp1.dwY;
         vp.dwHeight = This->viewports.vp1.dwHeight;
@@ -126,25 +129,23 @@ static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp)
  *  E_NOINTERFACE if the requested interface wasn't found
  *
  *****************************************************************************/
-static HRESULT WINAPI
-IDirect3DViewportImpl_QueryInterface(IDirect3DViewport3 *iface,
-                                     REFIID riid,
-                                     void **obp)
+static HRESULT WINAPI IDirect3DViewportImpl_QueryInterface(IDirect3DViewport3 *iface, REFIID riid, void **object)
 {
-    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
+    TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
 
-    *obp = NULL;
-
-    if ( IsEqualGUID(&IID_IUnknown,  riid) ||
-	 IsEqualGUID(&IID_IDirect3DViewport, riid) ||
-	 IsEqualGUID(&IID_IDirect3DViewport2, riid) ||
-	 IsEqualGUID(&IID_IDirect3DViewport3, riid) ) {
+    if (IsEqualGUID(&IID_IDirect3DViewport3, riid)
+            || IsEqualGUID(&IID_IDirect3DViewport2, riid)
+            || IsEqualGUID(&IID_IDirect3DViewport, riid)
+            || IsEqualGUID(&IID_IUnknown, riid))
+    {
         IDirect3DViewport3_AddRef(iface);
-        *obp = iface;
-	TRACE("  Creating IDirect3DViewport1/2/3 interface %p\n", *obp);
+        *object = iface;
         return S_OK;
     }
-    FIXME("(%p): interface for IID %s NOT found!\n", iface, debugstr_guid(riid));
+
+    WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+    *object = NULL;
     return E_NOINTERFACE;
 }
 
@@ -738,9 +739,10 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface,
     }
 
     /* Find a light number and update both light and viewports objects accordingly */
-    while(map&1) {
-        map>>=1;
-	i++;
+    while (map & 1)
+    {
+        map >>= 1;
+        ++i;
     }
     lpDirect3DLightImpl->dwLightIndex = i;
     This->num_lights++;
@@ -791,13 +793,13 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface,
         if (cur_light == lpDirect3DLightImpl)
         {
             light_deactivate(lpDirect3DLightImpl);
-	    if (prev_light == NULL) This->lights = cur_light->next;
+            if (!prev_light) This->lights = cur_light->next;
             else prev_light->next = cur_light->next;
-	    /* Detach the light to the viewport */
+            /* Detach the light from the viewport. */
             cur_light->active_viewport = NULL;
-	    IDirect3DLight_Release( (IDirect3DLight *)cur_light );
-	    This->num_lights--;
-	    This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex);
+            IDirect3DLight_Release((IDirect3DLight *)cur_light);
+            --This->num_lights;
+            This->map_lights &= ~(1 << lpDirect3DLightImpl->dwLightIndex);
             LeaveCriticalSection(&ddraw_cs);
             return D3D_OK;
         }