[PATCH 7/7] ddraw: Fix remaining style issues in executebuffer.c

Stefan Dösinger stefandoesinger at gmx.at
Sun Oct 30 09:02:27 CDT 2016


Signed-off-by: Stefan Dösinger <stefandoesinger at gmx.at>

---

Feel free to ignore this. With this the file follows the wined3d style,
unless I missed something...
---
 dlls/ddraw/executebuffer.c | 89 ++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index f0c2b03..4eff806 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -33,14 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
  *
  *****************************************************************************/
 
-static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
+static void _dump_executedata(const D3DEXECUTEDATA *lpData)
+{
     TRACE("dwSize : %d\n", lpData->dwSize);
     TRACE("Vertex      Offset : %d  Count  : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
     TRACE("Instruction Offset : %d  Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
     TRACE("HVertex     Offset : %d\n", lpData->dwHVertexOffset);
 }
 
-static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
+static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc)
+{
     TRACE("dwSize       : %d\n", lpDesc->dwSize);
     TRACE("dwFlags      : %x\n", lpDesc->dwFlags);
     TRACE("dwCaps       : %x\n", lpDesc->dwCaps);
@@ -76,12 +78,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
     for (;;)
     {
         D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr;
-	BYTE size;
-	WORD count;
-	
-	count = current->wCount;
-	size = current->bSize;
-	instr += sizeof(D3DINSTRUCTION);
+        BYTE size;
+        WORD count;
+
+        count = current->wCount;
+        size = current->bSize;
+        instr += sizeof(D3DINSTRUCTION);
         primitive_size = 0;
 
         switch (current->bOpcode)
@@ -204,10 +206,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
                 break;
             }
 
-	    case D3DOP_MATRIXLOAD:
-	        WARN("MATRIXLOAD-s     (%d)\n", count);
-	        instr += count * size;
-	        break;
+            case D3DOP_MATRIXLOAD:
+                WARN("MATRIXLOAD-s     (%d)\n", count);
+                instr += count * size;
+                break;
 
             case D3DOP_MATRIXMULTIPLY:
                 TRACE("MATRIXMULTIPLY   (%d)\n", count);
@@ -372,19 +374,16 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
                 }
                 break;
 
-	    case D3DOP_TEXTURELOAD: {
-	        WARN("TEXTURELOAD-s    (%d)\n", count);
-
-		instr += count * size;
-	    } break;
+            case D3DOP_TEXTURELOAD:
+                WARN("TEXTURELOAD-s    (%d)\n", count);
+                instr += count * size;
 
-	    case D3DOP_EXIT: {
-	        TRACE("EXIT             (%d)\n", count);
-		/* We did this instruction */
-		instr += size;
-		/* Exit this loop */
-		goto end_of_buffer;
-	    } break;
+            case D3DOP_EXIT:
+                TRACE("EXIT             (%d)\n", count);
+                /* We did this instruction */
+                instr += size;
+                /* Exit this loop */
+                goto end_of_buffer;
 
             case D3DOP_BRANCHFORWARD:
                 TRACE("BRANCHFORWARD    (%d)\n", count);
@@ -397,30 +396,34 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
                         if (!ci->bNegate)
                         {
                             TRACE(" Branch to %d\n", ci->dwOffset);
-                            if (ci->dwOffset) {
+                            if (ci->dwOffset)
+                            {
                                 instr = (char*)current + ci->dwOffset;
                                 break;
                             }
-			}
-		    } else {
-		        if (ci->bNegate) {
+                        }
+                    }
+                    else
+                    {
+                        if (ci->bNegate)
+                        {
                             TRACE(" Branch to %d\n", ci->dwOffset);
-                            if (ci->dwOffset) {
+                            if (ci->dwOffset)
+                            {
                                 instr = (char*)current + ci->dwOffset;
                                 break;
                             }
-			}
-		    }
+                        }
+                    }
 
-		    instr += size;
+                    instr += size;
                 }
                 break;
 
-	    case D3DOP_SPAN: {
-	        WARN("SPAN-s           (%d)\n", count);
-
-		instr += count * size;
-	    } break;
+            case D3DOP_SPAN:
+                WARN("SPAN-s           (%d)\n", count);
+                instr += count * size;
+                break;
 
             case D3DOP_SETSTATUS:
                 TRACE("SETSTATUS        (%d)\n", count);
@@ -431,12 +434,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
                 }
                 break;
 
-	    default:
-	        ERR("Unhandled OpCode %d !!!\n",current->bOpcode);
-	        /* Try to save ... */
-	        instr += count * size;
-	        break;
-	}
+            default:
+                ERR("Unhandled OpCode %d !!!\n",current->bOpcode);
+                /* Try to save ... */
+                instr += count * size;
+                break;
+        }
     }
 
 end_of_buffer:
-- 
2.7.3




More information about the wine-patches mailing list