diff --git a/DisplayMagicianShared/AMD/ADL.cs b/DisplayMagicianShared/AMD/ADL.cs
index 309b426..8b18ad7 100644
--- a/DisplayMagicianShared/AMD/ADL.cs
+++ b/DisplayMagicianShared/AMD/ADL.cs
@@ -427,7 +427,7 @@ namespace ATI.ADL
internal const int ADL_MAX_GLSYNC_PORTS = 8;
/// Maximum number of GL-Sync ports on the GL-Sync module
internal const int ADL_MAX_GLSYNC_PORT_LEDS = 8;
- /// Maximum number of ADLMOdes for the adapter
+ /// Maximum number of ADLModes for the adapter
internal const int ADL_MAX_NUM_DISPLAYMODES = 1024;
#endregion Internal Constant
diff --git a/DisplayMagicianShared/AMD/ADLWrapper.cs b/DisplayMagicianShared/AMD/ADLWrapper.cs
new file mode 100644
index 0000000..01c8b17
--- /dev/null
+++ b/DisplayMagicianShared/AMD/ADLWrapper.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using ATI.ADL;
+
+namespace DisplayMagicianShared.AMD
+{
+ class ADLWrapper
+ {
+ public ADLWrapper()
+ {
+ int ADLRet = ADL.ADL_FAIL;
+ int NumberOfAdapters = 0;
+ int NumberOfDisplays = 0;
+
+ if (null != ADL.ADL2_Main_Control_Create)
+ // Second parameter is 1: Get only the present adapters
+ ADLRet = ADL.ADL2_Main_Control_Create(ADL.ADL2_Main_Memory_Alloc, 1);
+ if (ADL.ADL_SUCCESS == ADLRet)
+ {
+ if (null != ADL.ADL2_Adapter_NumberOfAdapters_Get)
+ {
+ ADL.ADL2_Adapter_NumberOfAdapters_Get(ref NumberOfAdapters);
+ }
+ Console.WriteLine("Number Of Adapters: " + NumberOfAdapters.ToString() + "\n");
+
+ if (0 < NumberOfAdapters)
+ {
+ // Get OS adpater info from ADL
+ ADLAdapterInfoArray OSAdapterInfoData;
+ OSAdapterInfoData = new ADLAdapterInfoArray();
+
+ if (null != ADL.ADL2_Adapter_AdapterInfo_Get)
+ {
+ IntPtr AdapterBuffer = IntPtr.Zero;
+ int size = Marshal.SizeOf(OSAdapterInfoData);
+ AdapterBuffer = Marshal.AllocCoTaskMem((int)size);
+ Marshal.StructureToPtr(OSAdapterInfoData, AdapterBuffer, false);
+
+ if (null != ADL.ADL2_Adapter_AdapterInfo_Get)
+ {
+ ADLRet = ADL.ADL2_Adapter_AdapterInfo_Get(AdapterBuffer, size);
+ if (ADL.ADL_SUCCESS == ADLRet)
+ {
+ OSAdapterInfoData = (ADLAdapterInfoArray)Marshal.PtrToStructure(AdapterBuffer, OSAdapterInfoData.GetType());
+ int IsActive = 0;
+
+ for (int i = 0; i < NumberOfAdapters; i++)
+ {
+ // Check if the adapter is active
+ if (null != ADL.ADL2_Adapter_Active_Get)
+ ADLRet = ADL.ADL2_Adapter_Active_Get(OSAdapterInfoData.ADLAdapterInfo[i].AdapterIndex, ref IsActive);
+
+ if (ADL.ADL_SUCCESS == ADLRet)
+ {
+ Console.WriteLine("Adapter is : " + (0 == IsActive ? "DISABLED" : "ENABLED"));
+ Console.WriteLine("Adapter Index: " + OSAdapterInfoData.ADLAdapterInfo[i].AdapterIndex.ToString());
+ Console.WriteLine("Adapter UDID : " + OSAdapterInfoData.ADLAdapterInfo[i].UDID);
+ Console.WriteLine("Bus No : " + OSAdapterInfoData.ADLAdapterInfo[i].BusNumber.ToString());
+ Console.WriteLine("Driver No : " + OSAdapterInfoData.ADLAdapterInfo[i].DriverNumber.ToString());
+ Console.WriteLine("Function No : " + OSAdapterInfoData.ADLAdapterInfo[i].FunctionNumber.ToString());
+ Console.WriteLine("Vendor ID : " + OSAdapterInfoData.ADLAdapterInfo[i].VendorID.ToString());
+ Console.WriteLine("Adapter Name : " + OSAdapterInfoData.ADLAdapterInfo[i].AdapterName);
+ Console.WriteLine("Display Name : " + OSAdapterInfoData.ADLAdapterInfo[i].DisplayName);
+ Console.WriteLine("Present : " + (0 == OSAdapterInfoData.ADLAdapterInfo[i].Present ? "No" : "Yes"));
+ Console.WriteLine("Exist : " + (0 == OSAdapterInfoData.ADLAdapterInfo[i].Exist ? "No" : "Yes"));
+ Console.WriteLine("Driver Path : " + OSAdapterInfoData.ADLAdapterInfo[i].DriverPath);
+ Console.WriteLine("Driver Path X: " + OSAdapterInfoData.ADLAdapterInfo[i].DriverPathExt);
+ Console.WriteLine("PNP String : " + OSAdapterInfoData.ADLAdapterInfo[i].PNPString);
+
+ // Obtain information about displays
+ ADLDisplayInfo oneDisplayInfo = new ADLDisplayInfo();
+
+ if (null != ADL.ADL2_Display_DisplayInfo_Get)
+ {
+ IntPtr DisplayBuffer = IntPtr.Zero;
+ int j = 0;
+
+ // Force the display detection and get the Display Info. Use 0 as last parameter to NOT force detection
+ ADLRet = ADL.ADL2_Display_DisplayInfo_Get(OSAdapterInfoData.ADLAdapterInfo[i].AdapterIndex, ref NumberOfDisplays, out DisplayBuffer, 1);
+ if (ADL.ADL_SUCCESS == ADLRet)
+ {
+ List DisplayInfoData = new List();
+ for (j = 0; j < NumberOfDisplays; j++)
+ {
+ oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt32() + j * Marshal.SizeOf(oneDisplayInfo)), oneDisplayInfo.GetType());
+ DisplayInfoData.Add(oneDisplayInfo);
+ }
+ Console.WriteLine("\nTotal Number of Displays supported: " + NumberOfDisplays.ToString());
+ Console.WriteLine("\nDispID AdpID Type OutType CnctType Connected Mapped InfoValue DisplayName ");
+
+ for (j = 0; j < NumberOfDisplays; j++)
+ {
+ int InfoValue = DisplayInfoData[j].DisplayInfoValue;
+ string StrConnected = (1 == (InfoValue & 1)) ? "Yes" : "No ";
+ string StrMapped = (2 == (InfoValue & 2)) ? "Yes" : "No ";
+ int AdpID = DisplayInfoData[j].DisplayID.DisplayLogicalAdapterIndex;
+ string StrAdpID = (AdpID < 0) ? "--" : AdpID.ToString("d2");
+
+ Console.WriteLine(DisplayInfoData[j].DisplayID.DisplayLogicalIndex.ToString() + " " +
+ StrAdpID + " " +
+ DisplayInfoData[j].DisplayType.ToString() + " " +
+ DisplayInfoData[j].DisplayOutputType.ToString() + " " +
+ DisplayInfoData[j].DisplayConnector.ToString() + " " +
+ StrConnected + " " +
+ StrMapped + " " +
+ InfoValue.ToString("x4") + " " +
+ DisplayInfoData[j].DisplayName.ToString());
+ }
+ Console.WriteLine();
+ }
+ else
+ {
+ Console.WriteLine("ADL_Display_DisplayInfo_Get() returned error code " + ADLRet.ToString());
+ }
+ // Release the memory for the DisplayInfo structure
+ if (IntPtr.Zero != DisplayBuffer)
+ Marshal.FreeCoTaskMem(DisplayBuffer);
+ }
+ }
+ }
+ }
+ else
+ {
+ Console.WriteLine("ADL_Adapter_AdapterInfo_Get() returned error code " + ADLRet.ToString());
+ }
+ }
+ // Release the memory for the AdapterInfo structure
+ if (IntPtr.Zero != AdapterBuffer)
+ Marshal.FreeCoTaskMem(AdapterBuffer);
+ }
+ }
+ if (null != ADL.ADL2_Main_Control_Destroy)
+ ADL.ADL2_Main_Control_Destroy();
+ }
+ else
+ {
+ Console.WriteLine("ADL_Main_Control_Create() returned error code " + ADLRet.ToString());
+ Console.WriteLine("\nCheck if ADL is properly installed!\n");
+ }
+ }
+ }
+}
diff --git a/DisplayMagicianShared/DisplayMagicianShared.csproj b/DisplayMagicianShared/DisplayMagicianShared.csproj
index 5763661..b00d301 100644
--- a/DisplayMagicianShared/DisplayMagicianShared.csproj
+++ b/DisplayMagicianShared/DisplayMagicianShared.csproj
@@ -52,6 +52,7 @@
+
True
diff --git a/DisplayMagicianShared/ProfileRepository.cs b/DisplayMagicianShared/ProfileRepository.cs
index e249fe6..2d0ce08 100644
--- a/DisplayMagicianShared/ProfileRepository.cs
+++ b/DisplayMagicianShared/ProfileRepository.cs
@@ -12,7 +12,7 @@ using WindowsDisplayAPI;
using System.Diagnostics;
using System.Text.RegularExpressions;
using NvAPIWrapper.Native.GPU;
-using ATI.ADL;
+using DisplayMagicianShared.AMD;
using System.Windows.Forms;
namespace DisplayMagicianShared
@@ -795,17 +795,7 @@ namespace DisplayMagicianShared
}
// If the Video Card is an AMD, then we should generate specific AMD displayIdentifiers
- bool isAmd = false;
- int ADLRet = -1;
- int NumberOfAdapters = 0;
- int NumberOfDisplays = 0;
- if (ADL.ADL2_Main_Control_Create != null)
- // Second parameter is 1: So we only get the adapters present in the system
- ADLRet = ADL.ADL2_Main_Control_Create(ADL.ADL2_Main_Memory_Alloc, 1);
- if (ADL.ADL_SUCCESS == ADLRet)
- {
- ADLRet = ADL.ADL2_Display_SLSMapConfig_Get()
- }
+ AMD.ADLWrapper thingy = new AMD.ADLWrapper();
try
{
@@ -1154,6 +1144,9 @@ namespace DisplayMagicianShared
SharedLogger.logger.Debug(ex, "ProfileRepository/GenerateAllAvailableDisplayIdentifiers: Attemped to get GetPhysicalCPUs through NvAPIWrapper library but got exception. This means the video card isn't compatible with the NvAPIWrapper library we use. It is unlikely to be an NVIDIA video card.");
}
+ // If the Video Card is an AMD, then we should generate specific AMD displayIdentifiers
+ AMD.ADLWrapper thingy = new AMD.ADLWrapper();
+
if (isNvidia && myPhysicalGPUs != null && myPhysicalGPUs.Length > 0)
//if (false)
{