x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

GUI/PROJECT: Fixing various errors

This commit is contained in:
Nukem 2015-10-17 20:15:21 -04:00
parent 33dea5d705
commit 8ee7f7eaad
23 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bridge/x64_dbg_bridge.vcxproj
View File

@ -71,24 +71,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32bridge</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32bridge</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64bridge</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64bridge</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

8
src/dbg/x64_dbg_dbg.vcxproj
View File

@ -249,24 +249,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32dbg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32dbg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64dbg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64dbg</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

8
src/exe/x64_dbg_exe.vcxproj
View File

@ -79,27 +79,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32dbg</TargetName>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x32\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x32\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x32dbg</TargetName>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64dbg</TargetName>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\x64\</OutDir>
<TargetName>x64dbg</TargetName>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>

1
src/gui/Src/BasicView/AbstractTableView.h
View File

@ -7,7 +7,6 @@
#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
#include "NewTypes.h"
#include "StringUtil.h"
//Hacky class that fixes a really annoying cursor problem

1
src/gui/Src/Bridge/Bridge.h
View File

@ -6,7 +6,6 @@
#include <QWidget>
#include <QMutex>
#include "Imports.h"
#include "NewTypes.h"
#include "ReferenceManager.h"
#include "BridgeResult.h"

2
src/gui/Src/Bridge/BridgeResult.h
View File

@ -1,7 +1,7 @@
#ifndef BRIDGERESULT_H
#define BRIDGERESULT_H
#include "NewTypes.h"
#include "Imports.h"
class BridgeResult
{

2
src/gui/Src/Disassembler/BeaTokenizer.h
View File

@ -5,7 +5,7 @@
#include <QSet>
#include "RichTextPainter.h"
#include "BeaEngine.h"
#include "NewTypes.h"
#include "Imports.h"
class BeaTokenizer : RichTextPainter
{

2
src/gui/Src/Disassembler/QBeaEngine.h
View File

@ -2,7 +2,7 @@
#define QBEAENGINE_H
#include <QString>
#include "NewTypes.h"
#include "Imports.h"
#include "BeaTokenizer.h"
typedef struct _Instruction_t

2
src/gui/Src/Gui/CalculatorDialog.h
View File

@ -3,7 +3,7 @@
#include <QDialog>
#include "ValidateExpressionThread.h"
#include "NewTypes.h"
#include "Imports.h"
namespace Ui
{

2
src/gui/Src/Gui/DataCopyDialog.h
View File

@ -3,7 +3,7 @@
#include <QDialog>
#include <QVector>
#include "NewTypes.h"
#include "Imports.h"
namespace Ui
{

2
src/gui/Src/Gui/GotoDialog.h
View File

@ -3,7 +3,7 @@
#include <QDialog>
#include "ValidateExpressionThread.h"
#include "NewTypes.h"
#include "Imports.h"
namespace Ui
{

1
src/gui/Src/Gui/PageMemoryRights.cpp
View File

@ -1,3 +1,4 @@
#include "Imports.h"
#include "PageMemoryRights.h"
#include "ui_PageMemoryRights.h"

2
src/gui/Src/Gui/PageMemoryRights.h
View File

@ -2,7 +2,7 @@
#define PAGEMEMORYRIGHTS_H
#include <QDialog>
#include "NewTypes.h"
#include "types.h"
namespace Ui
{

2
src/gui/Src/Gui/WordEditDialog.h
View File

@ -4,7 +4,7 @@
#include <QDialog>
#include <QPushButton>
#include "ValidateExpressionThread.h"
#include "NewTypes.h"
#include "Imports.h"
namespace Ui
{

1
src/gui/Src/Imports.h
View File

@ -3,5 +3,6 @@
#include "bridge\bridgemain.h"
#include "dbg\_dbgfunctions.h"
#include "types.h"
#endif // IMPORTS_H

2
src/gui/Src/Memory/MemoryPage.h
View File

@ -2,7 +2,7 @@
#define MEMORYPAGE_H
#include <QObject>
#include "NewTypes.h"
#include "Imports.h"
class MemoryPage : public QObject
{

2
src/gui/Src/Utils/Configuration.h
View File

@ -6,7 +6,7 @@
#include <QMap>
#include <QColor>
#include <QFont>
#include "NewTypes.h"
#include "Imports.h"
#define Config() (Configuration::instance())
#define ConfigColor(x) (Config()->getColor(x))

2
src/gui/Src/Utils/MainWindowCloseThread.cpp
View File

@ -1,5 +1,5 @@
#include "MainWindowCloseThread.h"
#include "NewTypes.h"
#include "Imports.h"
#include "Bridge.h"
void MainWindowCloseThread::run()

2
src/gui/Src/Utils/StringUtil.h
View File

@ -2,7 +2,7 @@
#define STRINGUTIL_H
#include <QString>
#include "NewTypes.h"
#include "Imports.h"
static QString AddressToString(dsint Address)
{

2
src/gui/Src/Utils/ValidateExpressionThread.h
View File

@ -3,7 +3,7 @@
#include <QThread>
#include <QMutex>
#include "NewTypes.h"
#include "Imports.h"
class ValidateExpressionThread : public QThread
{

4
src/launcher/x64_dbg_launcher.vcxproj
View File

@ -46,14 +46,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x96dbg</TargetName>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
<OutDir>$(ProjectDir)..\..\bin\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>x96dbg</TargetName>
<GenerateManifest>false</GenerateManifest>

4
src/launcher/x64_dbg_launcher.vcxproj.filters
View File

@ -20,12 +20,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\x64_dbg_exe\resource.rc">
<ResourceCompile Include="..\exe\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\x64_dbg_exe\resource.h">
<ClInclude Include="..\exe\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

4
src/types.h
View File

@ -36,4 +36,6 @@ typedef int int32;
typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
typedef unsigned long long uint64;
typedef unsigned char byte_t;