DarthAffe/CUE.NET
1
0 Fork 0
mirror of https://github.com/DarthAffe/CUE.NET.git synced 2026-11-11 13:06:24 +00:00
Code Issues Releases Wiki Activity

Merge changes from master to development

Browse Source
This commit is contained in:
DarthAffe committed 2015-10-18 17:21:36 +02:00
2 parents e49945004f 0c862fc6de
commit ec292a2afc
3 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Devices/Generic/CorsairProtocolDetails.cs
+2 -2
View File
@@ -54,8 +54,8 @@ namespace CUE.NET.Devices.Generic
/// <param name="nativeDetails">The native CorsairProtocolDetails-struct</param> /// <param name="nativeDetails">The native CorsairProtocolDetails-struct</param>
internal CorsairProtocolDetails(_CorsairProtocolDetails nativeDetails) internal CorsairProtocolDetails(_CorsairProtocolDetails nativeDetails)
{ {
this.SdkVersion = nativeDetails.sdkVersion == IntPtr.Zero ? null : Marshal.PtrToStringAuto(nativeDetails.sdkVersion); this.SdkVersion = nativeDetails.sdkVersion == IntPtr.Zero ? null : Marshal.PtrToStringAnsi(nativeDetails.sdkVersion);
this.ServerVersion = nativeDetails.serverVersion == IntPtr.Zero ? null : Marshal.PtrToStringAuto(nativeDetails.serverVersion); this.ServerVersion = nativeDetails.serverVersion == IntPtr.Zero ? null : Marshal.PtrToStringAnsi(nativeDetails.serverVersion);
this.SdkProtocolVersion = nativeDetails.sdkProtocolVersion; this.SdkProtocolVersion = nativeDetails.sdkProtocolVersion;
this.ServerProtocolVersion = nativeDetails.serverProtocolVersion; this.ServerProtocolVersion = nativeDetails.serverProtocolVersion;
this.BreakingChanges = nativeDetails.breakingChanges != 0; this.BreakingChanges = nativeDetails.breakingChanges != 0;
Devices/Generic/GenericDeviceInfo.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace CUE.NET.Devices.Generic
internal GenericDeviceInfo(_CorsairDeviceInfo nativeInfo) internal GenericDeviceInfo(_CorsairDeviceInfo nativeInfo)
{ {
this.Type = nativeInfo.type; this.Type = nativeInfo.type;
this.Model = nativeInfo.model == IntPtr.Zero ? null : Marshal.PtrToStringAuto(nativeInfo.model); this.Model = nativeInfo.model == IntPtr.Zero ? null : Marshal.PtrToStringAnsi(nativeInfo.model);
this.CapsMask = (CorsairDeviceCaps)nativeInfo.capsMask; this.CapsMask = (CorsairDeviceCaps)nativeInfo.capsMask;
} }
Examples/SimpleDevTest/Program.cs
+2 -2
View File
@@ -3,14 +3,14 @@ using System.Drawing;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CUE.NET; using CUE.NET;
using CUE.NET.Brushes;
using CUE.NET.Devices.Generic.Enums; using CUE.NET.Devices.Generic.Enums;
using CUE.NET.Devices.Keyboard; using CUE.NET.Devices.Keyboard;
using CUE.NET.Devices.Keyboard.Brushes;
using CUE.NET.Devices.Keyboard.Brushes.Gradient;
using CUE.NET.Devices.Keyboard.Enums; using CUE.NET.Devices.Keyboard.Enums;
using CUE.NET.Devices.Keyboard.Extensions; using CUE.NET.Devices.Keyboard.Extensions;
using CUE.NET.Devices.Keyboard.Keys; using CUE.NET.Devices.Keyboard.Keys;
using CUE.NET.Exceptions; using CUE.NET.Exceptions;
using CUE.NET.Gradients;
namespace SimpleDevTest namespace SimpleDevTest
{ {