Merge branch 'master' into master

flylinfan · Mar 6, 2021 · 8cd1676 · 8cd1676
2 parents 58a654a + eac145f
commit 8cd1676
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -26,13 +26,13 @@ Currently, the supported versions are organized as follows:
 
 Required elements to compiled the project:
 
-* Visual Studio (currently Visual Studio 2015 community)
-* CMake (at least 3.0.2)
-* Qt5 (currently 5.9.1)
+* Visual Studio (currently Visual Studio 2017 Community)
+* CMake (currently 3.13.2)
+* Qt5 (currently 5.15.2)
 
 Before running CMake you have to set the CMAKE_PREFIX_PATH environment variable with the Qt **full path**, for instance (x64):
 ```
-set CMAKE_PREFIX_PATH=C:\Qt\Qt5.9.1\5.9.1\msvc2015_64
+set CMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2015_64\
 ```
 Before running CMake to produce the project solution you have to create the build directories:
 - ```RpcView/Build/x64``` for 64-bit targets
@@ -41,15 +41,18 @@ Before running CMake to produce the project solution you have to create the buil
 Here is an example to generate the x64 solution with Visual Studio 2015 from the ```RpcView/Build/x64``` directory:
 
 ```cmake
-cmake -G"Visual Studio 14 2015 Win64" ../../
--- The C compiler identification is MSVC 19.0.24215.1
--- The CXX compiler identification is MSVC 19.0.24215.1
--- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/cl.exe
--- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/cl.exe -- works
+cmake -G"Visual Studio 15 2017 Win64" ../../
+-- Selecting Windows SDK version 10.0.17763.0 to target Windows 10.0.19042.
+-- The C compiler identification is MSVC 19.16.27045.0
+-- The CXX compiler identification is MSVC 19.16.27045.0
+-- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe
+-- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe -- works
 -- Detecting C compiler ABI info
 -- Detecting C compiler ABI info - done
--- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/cl.exe
--- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/cl.exe -- works
+-- Detecting C compile features
+-- Detecting C compile features - done
+-- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe
+-- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe -- works
 -- Detecting CXX compiler ABI info
 -- Detecting CXX compiler ABI info - done
 -- Detecting CXX compile features
@@ -70,11 +73,11 @@ cmake -G"Visual Studio 14 2015 Win64" ../../
 
 To produce the Win32 solution:
 ```
-set CMAKE_PREFIX_PATH=C:\Qt\Qt5.9.1\5.9.1\msvc2015
+set CMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2015
 ```
 Then from the ```RpcView/Build/x86``` directory:
 ```cmake
-cmake -G"Visual Studio 14 2015" ../../
+cmake -G"Visual Studio 15 2017" ../../
 -- The C compiler identification is MSVC 19.0.24215.1
 -- The CXX compiler identification is MSVC 19.0.24215.1
 -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/cl.exe

diff --git a/RpcCore/RpcCore4_32bits/RpcInternals.h b/RpcCore/RpcCore4_32bits/RpcInternals.h
@@ -62,6 +62,7 @@ static UINT64 RPC_CORE_RUNTIME_VERSION[] = {
 	0xA00004A6101FCLL,  //10.0.19041.508
 	0xA00004A610222LL,  //10.0.19041.546
 	0xA00004A610276LL,  //10.0.19041.630
+  0xA00004A610296LL,  //10.0.19041.662
 	0xA00004A6102EALL   //10.0.19041.746
 };
 

diff --git a/RpcCore/RpcCore4_64bits/RpcInternals.h b/RpcCore/RpcCore4_64bits/RpcInternals.h
@@ -62,6 +62,7 @@ static UINT64 RPC_CORE_RUNTIME_VERSION[] = {
 	0xA00004A6101FCLL,  //10.0.19041.508
 	0xA00004A610222LL,  //10.0.19041.546
 	0xA00004A610276LL,  //10.0.19041.630
+	0xA00004A610296LL,  //10.0.19041.662 
 	0xA00004A6102EALL   //10.0.19041.746
 };
 

diff --git a/RpcView/DecompilationWidget.cpp b/RpcView/DecompilationWidget.cpp
@@ -31,7 +31,7 @@ DecompilationWidget_C::DecompilationWidget_C(QWidget *parent) : QDockWidget(Widg
 	pTextEdit = new QTextEdit(this);
 	pTextEdit->setLineWrapMode(QTextEdit::NoWrap);
 	pTextEdit->setFont(font);
-	pTextEdit->setTabStopWidth(font.pointSize()*TAB_AS_CHARS);
+	pTextEdit->setTabStopDistance(font.pointSize()*TAB_AS_CHARS);
 
 	pIdlHighlighter = new IdlHighlighter_C(pTextEdit->document());
 	setWidget(pTextEdit);

diff --git a/RpcView/InterfacesWidget.cpp b/RpcView/InterfacesWidget.cpp
@@ -56,7 +56,7 @@ void InterfacesWidget_C::InterfaceSelected(const QModelIndex& Index)
             UuidStringARef      = pProxyModel->data(pProxyModel->index(Index.row(), Column_Uuid)).toString().toLatin1();
 			pUuidStringA		= (UCHAR*)UuidStringARef.data();
 	QString	VersionString		= pProxyModel->data( pProxyModel->index(Index.row(), Column_Version) ).toString();
-			VersionStringList	= VersionString.split(".", QString::SkipEmptyParts, Qt::CaseSensitive);
+			VersionStringList	= VersionString.split(".", Qt::SkipEmptyParts, Qt::CaseSensitive);
 
 	if (VersionStringList.isEmpty())
 	{

diff --git a/RpcView/ProceduresWidget.cpp b/RpcView/ProceduresWidget.cpp
@@ -207,7 +207,7 @@ ProceduresWidget_C::ProceduresWidget_C(QWidget* pParent):QDockWidget(WidgetName)
 
 	pProcedures->setColumnCount(ProceduresWigetColumn_Last);
 	pProcedures->setSortingEnabled(true);
-	pProcedures->sortByColumn(-1);
+	pProcedures->sortByColumn(-1, Qt::AscendingOrder);
 	pProcedures->setAnimated(true);
 	pProcedures->expandAll();
 	pProcedures->setAlternatingRowColors(true);

diff --git a/RpcView/ProcessWidget.cpp b/RpcView/ProcessWidget.cpp
@@ -341,8 +341,8 @@ void ProcessWidget_C::LoadConfiguration(QSettings* pSettings)
 	//
 	// Force Tree sorting by PID
 	//
-	pProcessTree->sortByColumn(Column_Pid);
-	pProcessTree->sortByColumn(-1);
+	pProcessTree->sortByColumn(Column_Pid, Qt::AscendingOrder);
+	pProcessTree->sortByColumn(-1, Qt::AscendingOrder);
 }
 
 //------------------------------------------------------------------------------
@@ -358,8 +358,8 @@ void ProcessWidget_C::InitProcessTreeWidget(QWidget* pParent)
 		pHeaderItem->setText( Idx, GetColumName((Column_T)Idx) );
 	}
 	pProcessTree->setColumnCount(Column_Last);
-	pProcessTree->sortByColumn(Column_Pid);
-	pProcessTree->sortByColumn(-1);
+	pProcessTree->sortByColumn(Column_Pid, Qt::AscendingOrder);
+	pProcessTree->sortByColumn(-1, Qt::AscendingOrder);
 	pProcessTree->setAnimated(true);
 	pProcessTree->setSortingEnabled(true);
 
@@ -524,8 +524,8 @@ void ProcessWidget_C::ViewHeaderClicked(int logicalIndex)
 
 		pStackedWidget->setCurrentWidget(pProcessTree);
 		pProcessTree->header()->restoreState(pProcessView->header()->saveState());
-		pProcessTree->sortByColumn(Column_Pid);
-		pProcessTree->sortByColumn(-1);
+		pProcessTree->sortByColumn(Column_Pid,Qt::AscendingOrder);
+		pProcessTree->sortByColumn(-1, Qt::AscendingOrder);
 		pProcessTree->scrollToItem(pProcessTree->currentItem());
 	}
 }