Don't clear the trace when the file selection has been cancelled.

[apitrace] / d3dshader.py

diff --git a/d3dshader.py b/d3dshader.py
index b9e18ab03add0656ba8bae5628d978d5f709dae2..08a2d7f624d404019ae46ec2800fd6a9f70feef2 100644 (file)
--- a/d3dshader.py
+++ b/d3dshader.py
@@ -24,7 +24,7 @@
 ##########################################################################/
 
 
-from base import Type
+from stdapi import Type
 
 
 class D3DShader(Type):
@@ -43,10 +43,10 @@ class D3DShader(Type):
         print '''
 typedef HRESULT 
 (WINAPI *PD3DXDISASSEMBLESHADER)(
-   CONST DWORD *pShader,
-   BOOL EnableColorCode,
-   LPCSTR pComments,
-   LPD3DXBUFFER *ppDisassembly
+    CONST DWORD *pShader,
+    BOOL EnableColorCode,
+    LPCSTR pComments,
+    LPD3DXBUFFER *ppDisassembly
 );
         '''
         print 'void Dump%s(const DWORD *tokens)' % (self.id)
@@ -55,18 +55,18 @@ typedef HRESULT
     static HMODULE hD3DXModule = NULL; 
     static PD3DXDISASSEMBLESHADER pfnD3DXDisassembleShader = NULL;
 
-    if(firsttime) {
-        if(!hD3DXModule) {
+    if (firsttime) {
+        if (!hD3DXModule) {
             unsigned release;
-            unsigned version;
-            for(release = 0; release <= 1; ++release) {
+            int version;
+            for (release = 0; release <= 1; ++release) {
                 /* Version 41 corresponds to Mar 2009 version of DirectX Runtime / SDK */ 
-                for(version = 41; version >= 24; --version) {
+                for (version = 41; version >= 0; --version) {
                     char filename[256];
                     _snprintf(filename, sizeof(filename), 
-                              "d3dx9%s_%u.dll", release ? "" : "d", version);
+                              "d3dx9%s%s%u.dll", release ? "" : "d", version ? "_" : "", version);
                     hD3DXModule = LoadLibraryA(filename);
-                    if(hD3DXModule)
+                    if (hD3DXModule)
                         goto found;
                 }
             }
@@ -75,19 +75,19 @@ found:
         }
 
         if (hD3DXModule)
-            if(!pfnD3DXDisassembleShader)
+            if (!pfnD3DXDisassembleShader)
                 pfnD3DXDisassembleShader = (PD3DXDISASSEMBLESHADER)GetProcAddress(hD3DXModule, "D3DXDisassembleShader");
 
         firsttime = FALSE;
     }
    
-    if(pfnD3DXDisassembleShader) {
+    if (pfnD3DXDisassembleShader) {
         LPD3DXBUFFER pDisassembly = NULL;
    
         if (pfnD3DXDisassembleShader( (DWORD *)tokens, FALSE, NULL, &pDisassembly) == D3D_OK)
-            Log::LiteralString((char *)pDisassembly->GetBufferPointer());
+            Trace::LiteralString((char *)pDisassembly->GetBufferPointer());
 
-        if(pDisassembly)
+        if (pDisassembly)
             pDisassembly->Release();
     }
 }