Updated for new libFirm.

[r27370]

diff --git a/win32/firmEvaluator/firm.c b/win32/firmEvaluator/firm.c
index b8585a3..d4c77a5 100644 (file)
--- a/win32/firmEvaluator/firm.c
+++ b/win32/firmEvaluator/firm.c
@@ -254,8 +254,14 @@ static HRESULT format_type(DEBUGHELPER *pHelper, int nBase, const void *addr, ch
     _tcsncat(pResult, " ", max);
   }
 
-  if (format_ident(pHelper, tp.name, name, sizeof(name)) != S_OK)
-    return E_FAIL;
+  name[0] = '\0';
+  if (tp.name) {
+    if (format_ident(pHelper, tp.name, name, sizeof(name)) != S_OK)
+      return E_FAIL;
+  } else {
+    if (format_mode(pHelper, tp.mode, name, sizeof(name)) != S_OK)
+      return E_FAIL;
+  }
 
   _tcsncat(pResult, name, max);
   switch (nBase) {

diff --git a/win32/firmEvaluator/firmEvaluator.rc b/win32/firmEvaluator/firmEvaluator.rc
index 0e16d49..548a1a4 100644 (file)
--- a/win32/firmEvaluator/firmEvaluator.rc
+++ b/win32/firmEvaluator/firmEvaluator.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,17,0,32\r
- PRODUCTVERSION 1,17,0,32\r
+ FILEVERSION 1,18,0,32\r
+ PRODUCTVERSION 1,18,0,32\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x21L\r
@@ -45,12 +45,12 @@ BEGIN
         BEGIN\r
             VALUE "CompanyName", "Michael Beck"\r
             VALUE "FileDescription", "firmEvaluator -- libFirm debug Extension for Developer Studio 6/7/8"\r
-            VALUE "FileVersion", "1, 17, 0, 32"\r
+            VALUE "FileVersion", "1, 18, 0, 32"\r
             VALUE "InternalName", "firmEvaluator"\r
             VALUE "LegalCopyright", "Copyright © 2005-2010 Michael Beck"\r
             VALUE "OriginalFilename", "firmEvaluator.dll"\r
             VALUE "ProductName", "firmEvaluator -- libFirm debug Extension for Developer Studio 6/7/8"\r
-            VALUE "ProductVersion", "1, 17, 0, 32"\r
+            VALUE "ProductVersion", "1, 18, 0, 32"\r
             VALUE "SpecialBuild", "Licensed for IPD Goos"\r
         END\r
     END\r