Skip to content

Commit 2b23e97

Browse files
AnubyteCodeAnubyteCode
committed
Original dev is back.
Implemented fixes, notably the recent commit on the original. Will be archiving for now.
1 parent a139b97 commit 2b23e97

File tree

8 files changed

+50
-46
lines changed

8 files changed

+50
-46
lines changed

‎nspector/Common/DrsDecrypterService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ public void DecryptSettingIfNeeded(string profileName, ref NVDRS_SETTING setting
7373
{
7474
if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE)
7575
{
76-
setting.predefinedValue.stringValue = DecryptStringValue(setting.predefinedValue.rawData, setting.settingId);
76+
setting.predefinedValue.StringValue = DecryptStringValue(setting.predefinedValue.rawData, setting.settingId);
7777
if (setting.isCurrentPredefined == 1)
78-
setting.currentValue.stringValue = DecryptStringValue(setting.currentValue.rawData, setting.settingId);
78+
setting.currentValue.StringValue = DecryptStringValue(setting.currentValue.rawData, setting.settingId);
7979
}
8080
else if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE)
8181
{
82-
setting.predefinedValue.dwordValue = DecryptDwordValue(setting.predefinedValue.dwordValue, setting.settingId);
82+
setting.predefinedValue.DwordValue = DecryptDwordValue(setting.predefinedValue.DwordValue, setting.settingId);
8383
if (setting.isCurrentPredefined == 1)
84-
setting.currentValue.dwordValue = DecryptDwordValue(setting.currentValue.dwordValue, setting.settingId);
84+
setting.currentValue.DwordValue = DecryptDwordValue(setting.currentValue.DwordValue, setting.settingId);
8585
}
8686
}
8787
}

‎nspector/Common/DrsScannerService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ private void AddScannedSettingToCache(NVDRS_PROFILE profile, NVDRS_SETTING setti
173173
if (allowAddValue)
174174
{
175175
if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE)
176-
cachedSetting.AddStringValue(setting.predefinedValue.stringValue, profile.profileName);
176+
cachedSetting.AddStringValue(setting.predefinedValue.StringValue, profile.profileName);
177177
else if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE)
178-
cachedSetting.AddDwordValue(setting.predefinedValue.dwordValue, profile.profileName);
178+
cachedSetting.AddDwordValue(setting.predefinedValue.DwordValue, profile.profileName);
179179
else if (setting.settingType == NVDRS_SETTING_TYPE.NVDRS_BINARY_TYPE)
180-
cachedSetting.AddBinaryValue(setting.predefinedValue.binaryValue, profile.profileName);
180+
cachedSetting.AddBinaryValue(setting.predefinedValue.BinaryValue, profile.profileName);
181181

182182
}
183183
else

‎nspector/Common/DrsSettingsService.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ private SettingItem CreateSettingItem(NVDRS_SETTING setting, bool useDefault = f
396396
}
397397
else if (setting.isCurrentPredefined == 1 && setting.isPredefinedValid == 1)
398398
{
399-
valueRaw = DrsUtil.GetDwordString(setting.predefinedValue.dwordValue);
400-
valueText = DrsUtil.GetDwordSettingValueName(settingMeta, setting.predefinedValue.dwordValue);
399+
valueRaw = DrsUtil.GetDwordString(setting.predefinedValue.DwordValue);
400+
valueText = DrsUtil.GetDwordSettingValueName(settingMeta, setting.predefinedValue.DwordValue);
401401

402402
if (setting.settingLocation == NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION)
403403
settingState = SettingState.NvidiaSetting;
@@ -406,8 +406,8 @@ private SettingItem CreateSettingItem(NVDRS_SETTING setting, bool useDefault = f
406406
}
407407
else
408408
{
409-
valueRaw = DrsUtil.GetDwordString(setting.currentValue.dwordValue);
410-
valueText = DrsUtil.GetDwordSettingValueName(settingMeta, setting.currentValue.dwordValue);
409+
valueRaw = DrsUtil.GetDwordString(setting.currentValue.DwordValue);
410+
valueText = DrsUtil.GetDwordSettingValueName(settingMeta, setting.currentValue.DwordValue);
411411

412412
if (setting.settingLocation == NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION)
413413
settingState = SettingState.UserdefinedSetting;
@@ -425,14 +425,14 @@ private SettingItem CreateSettingItem(NVDRS_SETTING setting, bool useDefault = f
425425
}
426426
else if (setting.isCurrentPredefined == 1 && setting.isPredefinedValid == 1)
427427
{
428-
valueRaw = setting.predefinedValue.stringValue;
429-
valueText = DrsUtil.GetStringSettingValueName(settingMeta, setting.predefinedValue.stringValue);
428+
valueRaw = setting.predefinedValue.StringValue;
429+
valueText = DrsUtil.GetStringSettingValueName(settingMeta, setting.predefinedValue.StringValue);
430430
settingState = SettingState.NvidiaSetting;
431431
}
432432
else
433433
{
434-
valueRaw = setting.currentValue.stringValue;
435-
valueText = DrsUtil.GetStringSettingValueName(settingMeta, setting.currentValue.stringValue);
434+
valueRaw = setting.currentValue.StringValue;
435+
valueText = DrsUtil.GetStringSettingValueName(settingMeta, setting.currentValue.StringValue);
436436

437437
if (setting.settingLocation == NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION)
438438
settingState = SettingState.UserdefinedSetting;
@@ -450,14 +450,14 @@ private SettingItem CreateSettingItem(NVDRS_SETTING setting, bool useDefault = f
450450
}
451451
else if (setting.isCurrentPredefined == 1 && setting.isPredefinedValid == 1)
452452
{
453-
valueRaw = DrsUtil.GetBinaryString(setting.predefinedValue.binaryValue);
454-
valueText = DrsUtil.GetBinarySettingValueName(settingMeta, setting.predefinedValue.binaryValue);
453+
valueRaw = DrsUtil.GetBinaryString(setting.predefinedValue.BinaryValue);
454+
valueText = DrsUtil.GetBinarySettingValueName(settingMeta, setting.predefinedValue.BinaryValue);
455455
settingState = SettingState.NvidiaSetting;
456456
}
457457
else
458458
{
459-
valueRaw = DrsUtil.GetBinaryString(setting.currentValue.binaryValue);
460-
valueText = DrsUtil.GetBinarySettingValueName(settingMeta, setting.currentValue.binaryValue);
459+
valueRaw = DrsUtil.GetBinaryString(setting.currentValue.BinaryValue);
460+
valueText = DrsUtil.GetBinarySettingValueName(settingMeta, setting.currentValue.BinaryValue);
461461

462462
if (setting.settingLocation == NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION)
463463
settingState = SettingState.UserdefinedSetting;

‎nspector/Common/DrsSettingsServiceBase.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected void StoreDwordValue(IntPtr hSession, IntPtr hProfile, uint settingId,
134134
settingLocation = NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION,
135135
currentValue = new NVDRS_SETTING_UNION()
136136
{
137-
dwordValue = dwordValue,
137+
DwordValue = dwordValue,
138138
},
139139
};
140140

@@ -154,7 +154,7 @@ protected void StoreStringValue(IntPtr hSession, IntPtr hProfile, uint settingId
154154
settingLocation = NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION,
155155
currentValue = new NVDRS_SETTING_UNION()
156156
{
157-
stringValue = stringValue,
157+
StringValue = stringValue,
158158
},
159159
};
160160

@@ -174,7 +174,7 @@ protected void StoreBinaryValue(IntPtr hSession, IntPtr hProfile, uint settingId
174174
settingLocation = NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION,
175175
currentValue = new NVDRS_SETTING_UNION()
176176
{
177-
binaryValue = binValue,
177+
BinaryValue = binValue,
178178
},
179179
};
180180

@@ -212,7 +212,7 @@ protected void StoreBinaryValue(IntPtr hSession, IntPtr hProfile, uint settingId
212212
var newSetting = ReadSetting(hSession, hProfile, settingId);
213213
if (newSetting == null)
214214
return null;
215-
return newSetting.Value.currentValue.dwordValue;
215+
return newSetting.Value.currentValue.DwordValue;
216216
}
217217

218218
protected void AddApplication(IntPtr hSession, IntPtr hProfile, string applicationName)

‎nspector/Common/Import/ImportExportUitl.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ private static string ConvertSettingValueToString(NVDRS_SETTING setting)
3232

3333
return setting.settingType switch
3434
{
35-
NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE => settingUnion.dwordValue.ToString(),
36-
NVDRS_SETTING_TYPE.NVDRS_STRING_TYPE => settingUnion.ansiStringValue,
37-
NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE => settingUnion.stringValue,
38-
NVDRS_SETTING_TYPE.NVDRS_BINARY_TYPE => Convert.ToBase64String(settingUnion.binaryValue),
35+
NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE => settingUnion.DwordValue.ToString(),
36+
NVDRS_SETTING_TYPE.NVDRS_STRING_TYPE => settingUnion.AnsiStringValue,
37+
NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE => settingUnion.StringValue,
38+
NVDRS_SETTING_TYPE.NVDRS_BINARY_TYPE => Convert.ToBase64String(settingUnion.BinaryValue),
3939
_ => throw new Exception("invalid setting type"),
4040
};
4141
}
@@ -70,16 +70,16 @@ private static NVDRS_SETTING_UNION ConvertStringToSettingUnion(SettingValueType
7070
switch (valueType)
7171
{
7272
case SettingValueType.Dword:
73-
union.dwordValue = uint.Parse(valueString);
73+
union.DwordValue = uint.Parse(valueString);
7474
break;
7575
case SettingValueType.String:
76-
union.stringValue = valueString;
76+
union.StringValue = valueString;
7777
break;
7878
case SettingValueType.AnsiString:
79-
union.ansiStringValue = valueString;
79+
union.AnsiStringValue = valueString;
8080
break;
8181
case SettingValueType.Binary:
82-
union.binaryValue = Convert.FromBase64String(valueString);
82+
union.BinaryValue = Convert.FromBase64String(valueString);
8383
break;
8484
default:
8585
throw new Exception("invalid value type");

‎nspector/Common/Meta/DriverSettingMetaService.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ private List<uint> InitSettingIds()
3232

3333
private SettingMeta GetDriverSettingMetaInternal(uint settingId)
3434
{
35+
// temporary fix for 571.96 overflow bug by emoose
36+
if ((settingId & 0xFFFFF000) == 0x10c7d000)
37+
return null;
38+
3539
var values = new NVDRS_SETTING_VALUES
3640
{
3741
version = nvw.NVDRS_SETTING_VALUES_VER
@@ -65,26 +69,26 @@ private SettingMeta GetDriverSettingMetaInternal(uint settingId)
6569

6670
if (values.settingType == NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE)
6771
{
68-
result.DefaultDwordValue = values.defaultValue.dwordValue;
72+
result.DefaultDwordValue = values.defaultValue.DwordValue;
6973
result.DwordValues = [];
7074
for (int i = 0; i < values.numSettingValues; i++)
7175
{
7276
result.DwordValues.Add(
7377
new SettingValue<uint>(Source)
7478
{
75-
Value = values.settingValues[i].dwordValue,
76-
ValueName = DrsUtil.GetDwordString(values.settingValues[i].dwordValue),
79+
Value = values.settingValues[i].DwordValue,
80+
ValueName = DrsUtil.GetDwordString(values.settingValues[i].DwordValue),
7781
});
7882
}
7983
}
8084

8185
if (values.settingType == NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE)
8286
{
83-
result.DefaultStringValue = values.defaultValue.stringValue;
87+
result.DefaultStringValue = values.defaultValue.StringValue;
8488
result.StringValues = [];
8589
for (int i = 0; i < values.numSettingValues; i++)
8690
{
87-
var strValue = values.settingValues[i].stringValue;
91+
var strValue = values.settingValues[i].StringValue;
8892
if (strValue != null)
8993
{
9094
result.StringValues.Add(
@@ -99,11 +103,11 @@ private SettingMeta GetDriverSettingMetaInternal(uint settingId)
99103

100104
if (values.settingType == NVDRS_SETTING_TYPE.NVDRS_BINARY_TYPE)
101105
{
102-
result.DefaultBinaryValue = values.defaultValue.binaryValue;
106+
result.DefaultBinaryValue = values.defaultValue.BinaryValue;
103107
result.BinaryValues = [];
104108
for (int i = 0; i < values.numSettingValues; i++)
105109
{
106-
var binValue = values.settingValues[i].binaryValue;
110+
var binValue = values.settingValues[i].BinaryValue;
107111
if (binValue != null)
108112
{
109113
result.BinaryValues.Add(

‎nspector/Native/NVAPI/NvapiDrsWrapper.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ internal struct NVDRS_SETTING_UNION
231231
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4100)]
232232
public byte[] rawData;
233233

234-
public byte[] binaryValue
234+
public byte[] BinaryValue
235235
{
236236
readonly get
237237
{
@@ -252,7 +252,7 @@ readonly get
252252
}
253253
}
254254

255-
public uint dwordValue
255+
public uint DwordValue
256256
{
257257
readonly get
258258
{
@@ -266,7 +266,7 @@ readonly get
266266
}
267267
}
268268

269-
public string stringValue
269+
public string StringValue
270270
{
271271
readonly get
272272
{
@@ -281,7 +281,7 @@ readonly get
281281
}
282282
}
283283

284-
public string ansiStringValue
284+
public string AnsiStringValue
285285
{
286286
readonly get
287287
{
@@ -344,7 +344,7 @@ internal struct NVDRS_APPLICATION_V2
344344
[StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Unicode)]
345345
internal struct NVDRS_APPLICATION_V3
346346
{
347-
public uint isMetro { readonly get { return ((uint)((bitvector1 & 1))); } set { bitvector1 = ((uint)((value | bitvector1))); } }
347+
public uint IsMetro { readonly get { return ((uint)((bitvector1 & 1))); } set { bitvector1 = ((uint)((value | bitvector1))); } }
348348

349349
public uint version;
350350
public uint isPredefined;

‎nspector/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("AnubyteCode")]
1212
[assembly: AssemblyProduct("NVIDIA Profile Inspector")]
13-
[assembly: AssemblyCopyright("Orbmu2k: MIA")]
13+
[assembly: AssemblyCopyright("Orbmu2k")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,7 +32,7 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.4.1.0")]
36-
[assembly: AssemblyFileVersion("2.4.1.0")]
35+
[assembly: AssemblyVersion("2.4.1.2")]
36+
[assembly: AssemblyFileVersion("2.4.1.2")]
3737

3838

0 commit comments

Comments
 (0)