Skip to content

Commit

Permalink
Data type correction (fixes x86 and arm64)
Browse files Browse the repository at this point in the history
  • Loading branch information
thebookisclosed committed Aug 11, 2020
1 parent 3d7e702 commit 7fff356
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions ViVe/NativeMethods.cs
Expand Up @@ -28,7 +28,7 @@ public static class NativeMethods
[DllImport("ntdll.dll")]
public static extern int RtlQueryAllFeatureConfigurations(
FeatureConfigurationSection sectionType,
ref uint changeStamp,
ref ulong changeStamp,
IntPtr buffer,
ref int featureCount
);
Expand All @@ -37,12 +37,12 @@ public static class NativeMethods
public static extern int RtlQueryFeatureConfiguration(
uint featureId,
FeatureConfigurationSection sectionType,
ref uint changeStamp,
ref ulong changeStamp,
IntPtr buffer
);

[DllImport("ntdll.dll")]
public static extern uint RtlQueryFeatureConfigurationChangeStamp();
public static extern ulong RtlQueryFeatureConfigurationChangeStamp();

[DllImport("ntdll.dll")]
public static extern int RtlQueryFeatureUsageNotificationSubscriptions(
Expand All @@ -52,7 +52,7 @@ IntPtr buffer

[DllImport("ntdll.dll")]
public static extern int RtlSetFeatureConfigurations(
ref uint changeStamp,
ref ulong changeStamp,
FeatureConfigurationSection sectionType,
byte[] buffer,
int featureCount
Expand Down
4 changes: 2 additions & 2 deletions ViVe/Properties/AssemblyInfo.cs
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2020.4.9.1000")]
[assembly: AssemblyFileVersion("2020.4.9.1000")]
[assembly: AssemblyVersion("2020.8.11.1001")]
[assembly: AssemblyFileVersion("2020.8.11.1001")]
20 changes: 10 additions & 10 deletions ViVe/RtlFeatureManager.cs
Expand Up @@ -29,17 +29,17 @@ public static class RtlFeatureManager
{
public static List<FeatureConfiguration> QueryAllFeatureConfigurations()
{
uint dummy = 0;
ulong dummy = 0;
return QueryAllFeatureConfigurations(FeatureConfigurationSection.Runtime, ref dummy);
}

public static List<FeatureConfiguration> QueryAllFeatureConfigurations(FeatureConfigurationSection section)
{
uint dummy = 0;
ulong dummy = 0;
return QueryAllFeatureConfigurations(section, ref dummy);
}

public static List<FeatureConfiguration> QueryAllFeatureConfigurations(FeatureConfigurationSection section, ref uint changeStamp)
public static List<FeatureConfiguration> QueryAllFeatureConfigurations(FeatureConfigurationSection section, ref ulong changeStamp)
{
int featureCount = 0;
NativeMethods.RtlQueryAllFeatureConfigurations(section, ref changeStamp, IntPtr.Zero, ref featureCount);
Expand Down Expand Up @@ -82,17 +82,17 @@ public static List<FeatureConfiguration> QueryAllFeatureConfigurations(FeatureCo

public static FeatureConfiguration QueryFeatureConfiguration(uint featureId)
{
uint dummy = 0;
ulong dummy = 0;
return QueryFeatureConfiguration(featureId, FeatureConfigurationSection.Runtime, ref dummy);
}

public static FeatureConfiguration QueryFeatureConfiguration(uint featureId, FeatureConfigurationSection section)
{
uint dummy = 0;
ulong dummy = 0;
return QueryFeatureConfiguration(featureId, section, ref dummy);
}

public static FeatureConfiguration QueryFeatureConfiguration(uint featureId, FeatureConfigurationSection section, ref uint changeStamp)
public static FeatureConfiguration QueryFeatureConfiguration(uint featureId, FeatureConfigurationSection section, ref ulong changeStamp)
{
// One feature config is 12 bytes long
IntPtr rawBuf = Marshal.AllocHGlobal(12);
Expand All @@ -116,24 +116,24 @@ public static FeatureConfiguration QueryFeatureConfiguration(uint featureId, Fea
VariantPayload = BitConverter.ToInt32(buf, 8) };
}

public static uint QueryFeatureConfigurationChangeStamp()
public static ulong QueryFeatureConfigurationChangeStamp()
{
return NativeMethods.RtlQueryFeatureConfigurationChangeStamp();
}

public static int SetLiveFeatureConfigurations(List<FeatureConfiguration> configurations)
{
uint dummy = 0;
ulong dummy = 0;
return SetLiveFeatureConfigurations(configurations, FeatureConfigurationSection.Runtime, ref dummy);
}

public static int SetLiveFeatureConfigurations(List<FeatureConfiguration> configurations, FeatureConfigurationSection section)
{
uint dummy = 0;
ulong dummy = 0;
return SetLiveFeatureConfigurations(configurations, section, ref dummy);
}

public static int SetLiveFeatureConfigurations(List<FeatureConfiguration> configurations, FeatureConfigurationSection section, ref uint changeStamp)
public static int SetLiveFeatureConfigurations(List<FeatureConfiguration> configurations, FeatureConfigurationSection section, ref ulong changeStamp)
{
return NativeMethods.RtlSetFeatureConfigurations(ref changeStamp, section, RtlDataHelpers.SerializeFeatureConfigurations(configurations), configurations.Count);
}
Expand Down
2 changes: 1 addition & 1 deletion ViVeTool/Program.cs
Expand Up @@ -27,7 +27,7 @@ class Program
{
static void Main(string[] args)
{
Console.WriteLine("ViVeTool v0.2.0 - Vibranium feature configuration tool\n");
Console.WriteLine("ViVeTool v0.2.1 - Vibranium feature configuration tool\n");
if (args.Length < 1)
{
PrintHelp();
Expand Down

0 comments on commit 7fff356

Please sign in to comment.