DBG+GUI: misc changes

src/dbg/expressionfunctions.cpp

@@ -56,6 +56,9 @@ void ExpressionFunctions::Init()
     RegisterEasy("disasm.sel\1dis.sel", disasmsel);
     RegisterEasy("dump.sel", dumpsel);
     RegisterEasy("stack.sel", stacksel);
+
+    RegisterEasy("peb\1PEB", peb);
+    RegisterEasy("teb\1TEB", teb);
 }
 
 bool ExpressionFunctions::Register(const String & name, int argc, CBEXPRESSIONFUNCTION cbFunction, void* userdata)

src/dbg/exprfunc.cpp

@@ -1,6 +1,7 @@
 #include "exprfunc.h"
 #include "symbolinfo.h"
 #include "module.h"
+#include "debugger.h"
 
 namespace Exprfunc
 {
@@ -46,4 +47,14 @@ namespace Exprfunc
     {
         return selstart(GUI_STACK);
     }
+
+    duint peb()
+    {
+        return duint(GetPEBLocation(fdProcessInfo->hProcess));
+    }
+
+    duint teb()
+    {
+        return duint(GetTEBLocation(hActiveThread));
+    }
 }

src/dbg/exprfunc.h

@@ -12,4 +12,7 @@ namespace Exprfunc
     duint disasmsel();
     duint dumpsel();
     duint stacksel();
+
+    duint peb();
+    duint teb();
 }

src/dbg/value.cpp

@@ -1448,21 +1448,6 @@ bool valapifromstring(const char* name, duint* value, int* value_size, bool prin
     return true;
 }
 
-bool valenvfromstring(const char* string, duint* Address)
-{
-    if(scmp(string, "peb"))
-    {
-        *Address = (duint)GetPEBLocation(fdProcessInfo->hProcess);
-        return true;
-    }
-    else if(scmp(string, "teb"))
-    {
-        *Address = (duint)GetTEBLocation(hActiveThread);
-        return true;
-    }
-    return false;
-}
-
 /**
 \brief Check if a string is a valid decimal number. This function also accepts "-" or "." as prefix.
 \param string The string to check.
@@ -1723,8 +1708,6 @@ bool valfromstring_noexpr(const char* string, duint* value, bool silent, bool ba
             *isvar = true;
         return true;
     }
-    else if(valenvfromstring(string, value)) //environment block
-        return true;
     else if(strstr(string, "sub_") == string)  //then come sub_ functions
     {
         auto result = sscanf(string, "sub_%" fext "X", value) == 1;

src/gui/Src/BasicView/ReferenceView.cpp

@@ -141,7 +141,6 @@ void ReferenceView::referenceSetCurrentTaskProgressSlot(int progress, QString ta
 
 void ReferenceView::addColumnAt(int width, QString title)
 {
-    printf("addColumnAt(%d, %s)\n", width, title.toUtf8().constData());
     int charwidth = mList->getCharWidth();
     if(width)
         width = charwidth * width + 8;
@@ -159,7 +158,6 @@ void ReferenceView::addColumnAt(int width, QString title)
 
 void ReferenceView::setRowCount(dsint count)
 {
-    printf("setRowCount(%d)\n", count);
     emit mCountTotalLabel->setText(QString("%1").arg(count));
     mSearchBox->setText("");
     mList->setRowCount(count);
@@ -167,7 +165,6 @@ void ReferenceView::setRowCount(dsint count)
 
 void ReferenceView::setCellContent(int r, int c, QString s)
 {
-    printf("setCellContent(%d, %d, %s)\n", r, c, s.toUtf8().constData());
     mSearchBox->setText("");
     mList->setCellContent(r, c, s);
 }

src/gui/Src/Utils/StringUtil.cpp

@@ -209,7 +209,6 @@ QString GetDataTypeString(void* buffer, duint size, ENCODETYPE type)
 
 QString ToDateString(const QDate & date)
 {
-    /*
     static const char* months[] =
     {
         "Jan",
@@ -226,8 +225,6 @@ QString ToDateString(const QDate & date)
         "Dec"
     };
     return QString().sprintf("%s %d %d", months[date.month() - 1], date.day(), date.year());
-    */
-    return QLocale(QString(currentLocale)).toString(date);
 }
 
 QString FILETIMEToDate(const FILETIME & date)

src/gui/Src/Utils/StringUtil.h

@@ -18,23 +18,19 @@ static QString ToPtrString(duint Address)
     // ((int32)0xFFFF0000) == 0xFFFFFFFFFFFF0000 with sign extension
     //
 
+    char temp[32];
 #ifdef _WIN64
-    char temp[33];
     sprintf_s(temp, "%016llX", Address);
 #else
-    char temp[17];
     sprintf_s(temp, "%08X", Address);
 #endif // _WIN64
-
     return QString(temp);
 }
 
 static QString ToLongLongHexString(unsigned long long Value)
 {
-    char temp[33];
-
+    char temp[32];
     sprintf_s(temp, "%llX", Value);
-
     return QString(temp);
 }