Skip to content

Commit f0cd387

Browse files
neon-nyanneon-nyan
committed
Code QA
1 parent 60382c3 commit f0cd387

20 files changed

Lines changed: 128 additions & 123 deletions

‎ABI/ABI_IFreeWrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal static int ABI_Free(ComInterfaceDispatch* thisNative)
1717
try
1818
{
1919
// Unmarshal - Convert native data to managed data.
20-
var @this = ComInterfaceDispatch.GetInstance<IFree>(thisNative);
20+
IFree @this = ComInterfaceDispatch.GetInstance<IFree>(thisNative);
2121
@this.Free();
2222
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
2323
retVal = 0; // S_OK

‎ABI/ABI_IGameInstallerWrapper.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ internal static int ABI_GetGameSizeAsync(ComInterfaceDispatch* thisNative, GameI
2020
try
2121
{
2222
// Unmarshal - Convert native data to managed data.
23-
var cancelToken = cancelTokenNative;
24-
var @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
25-
@this.GetGameSizeAsync(gameInstallerKind, in cancelToken, out var result);
23+
Guid cancelToken = cancelTokenNative;
24+
IGameInstaller @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
25+
@this.GetGameSizeAsync(gameInstallerKind, in cancelToken, out nint result);
2626
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
2727
retVal = 0; // S_OK
2828
// Marshal - Convert managed data to native data.
@@ -45,9 +45,9 @@ internal static int ABI_GetGameDownloadedSizeAsync(ComInterfaceDispatch* thisNat
4545
try
4646
{
4747
// Unmarshal - Convert native data to managed data.
48-
var cancelToken = cancelTokenNative;
49-
var @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
50-
@this.GetGameDownloadedSizeAsync(gameInstallerKind, in cancelToken, out var result);
48+
Guid cancelToken = cancelTokenNative;
49+
IGameInstaller @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
50+
@this.GetGameDownloadedSizeAsync(gameInstallerKind, in cancelToken, out nint result);
5151
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
5252
retVal = 0; // S_OK
5353
// Marshal - Convert managed data to native data.
@@ -70,11 +70,11 @@ internal static int ABI_StartInstallAsync(ComInterfaceDispatch* thisNative, nint
7070
try
7171
{
7272
// Unmarshal - Convert native data to managed data.
73-
var cancelToken = cancelTokenNative;
74-
var progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
75-
var progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
76-
var @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
77-
@this.StartInstallAsync(progressDelegate, progressStateDelegate, in cancelToken, out var result);
73+
Guid cancelToken = cancelTokenNative;
74+
InstallProgressStateDelegate? progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
75+
InstallProgressDelegate? progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
76+
IGameInstaller @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
77+
@this.StartInstallAsync(progressDelegate, progressStateDelegate, in cancelToken, out nint result);
7878
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
7979
retVal = 0; // S_OK
8080
// Marshal - Convert managed data to native data.
@@ -97,11 +97,11 @@ internal static int ABI_StartUpdateAsync(ComInterfaceDispatch* thisNative, nint
9797
try
9898
{
9999
// Unmarshal - Convert native data to managed data.
100-
var cancelToken = cancelTokenNative;
101-
var progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
102-
var progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
103-
var @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
104-
@this.StartUpdateAsync(progressDelegate, progressStateDelegate, in cancelToken, out var result);
100+
Guid cancelToken = cancelTokenNative;
101+
InstallProgressStateDelegate? progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
102+
InstallProgressDelegate? progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
103+
IGameInstaller @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
104+
@this.StartUpdateAsync(progressDelegate, progressStateDelegate, in cancelToken, out nint result);
105105
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
106106
retVal = 0; // S_OK
107107
// Marshal - Convert managed data to native data.
@@ -124,11 +124,11 @@ internal static int ABI_StartPreloadAsync(ComInterfaceDispatch* thisNative, nint
124124
try
125125
{
126126
// Unmarshal - Convert native data to managed data.
127-
var cancelToken = cancelTokenNative;
128-
var progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
129-
var progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
130-
var @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
131-
@this.StartPreloadAsync(progressDelegate, progressStateDelegate, in cancelToken, out var result);
127+
Guid cancelToken = cancelTokenNative;
128+
InstallProgressStateDelegate? progressStateDelegate = progressStateDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressStateDelegate>(progressStateDelegateNative) : null;
129+
InstallProgressDelegate? progressDelegate = progressDelegateNative != 0 ? Marshal.GetDelegateForFunctionPointer<InstallProgressDelegate>(progressDelegateNative) : null;
130+
IGameInstaller @this = ComInterfaceDispatch.GetInstance<IGameInstaller>(thisNative);
131+
@this.StartPreloadAsync(progressDelegate, progressStateDelegate, in cancelToken, out nint result);
132132
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
133133
retVal = 0; // S_OK
134134
// Marshal - Convert managed data to native data.

‎ABI/ABI_IGameManagerWrapper.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ internal static int ABI_SetGamePath(ComInterfaceDispatch* thisNative, ushort* ga
2424
try
2525
{
2626
// Unmarshal - Convert native data to managed data.
27-
var gamePath = Utf16StringMarshaller.ConvertToManaged(gamePathNative);
28-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
27+
string? gamePath = Utf16StringMarshaller.ConvertToManaged(gamePathNative);
28+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
2929
@this.SetGamePath(gamePath ?? "");
3030
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
3131
retVal = 0; // S_OK
@@ -46,8 +46,8 @@ internal static int ABI_GetCurrentGameVersion(ComInterfaceDispatch* thisNative,
4646
try
4747
{
4848
// Unmarshal - Convert native data to managed data.
49-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
50-
@this.GetCurrentGameVersion(out var gameVersion);
49+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
50+
@this.GetCurrentGameVersion(out GameVersion gameVersion);
5151
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
5252
retVal = 0; // S_OK
5353
// Marshal - Convert managed data to native data.
@@ -69,8 +69,8 @@ internal static int ABI_SetCurrentGameVersion(ComInterfaceDispatch* thisNative,
6969
try
7070
{
7171
// Unmarshal - Convert native data to managed data.
72-
var version = versionNative;
73-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
72+
GameVersion version = versionNative;
73+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
7474
@this.SetCurrentGameVersion(in version);
7575
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
7676
retVal = 0; // S_OK
@@ -91,8 +91,8 @@ internal static int ABI_GetApiGameVersion(ComInterfaceDispatch* thisNative, Game
9191
try
9292
{
9393
// Unmarshal - Convert native data to managed data.
94-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
95-
@this.GetApiGameVersion(out var gameVersion);
94+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
95+
@this.GetApiGameVersion(out GameVersion gameVersion);
9696
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
9797
retVal = 0; // S_OK
9898
// Marshal - Convert managed data to native data.
@@ -114,8 +114,8 @@ internal static int ABI_GetApiPreloadGameVersion(ComInterfaceDispatch* thisNativ
114114
try
115115
{
116116
// Unmarshal - Convert native data to managed data.
117-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
118-
@this.GetApiPreloadGameVersion(out var gameVersion);
117+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
118+
@this.GetApiPreloadGameVersion(out GameVersion gameVersion);
119119
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
120120
retVal = 0; // S_OK
121121
// Marshal - Convert managed data to native data.
@@ -137,8 +137,8 @@ internal static int ABI_IsGameInstalled(ComInterfaceDispatch* thisNative, int* r
137137
try
138138
{
139139
// Unmarshal - Convert native data to managed data.
140-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
141-
@this.IsGameInstalled(out var result);
140+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
141+
@this.IsGameInstalled(out bool result);
142142
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
143143
retVal = 0; // S_OK
144144
// Marshal - Convert managed data to native data.
@@ -160,8 +160,8 @@ internal static int ABI_IsGameHasUpdate(ComInterfaceDispatch* thisNative, int* r
160160
try
161161
{
162162
// Unmarshal - Convert native data to managed data.
163-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
164-
@this.IsGameHasUpdate(out var result);
163+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
164+
@this.IsGameHasUpdate(out bool result);
165165
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
166166
retVal = 0; // S_OK
167167
// Marshal - Convert managed data to native data.
@@ -183,8 +183,8 @@ internal static int ABI_IsGameHasPreload(ComInterfaceDispatch* thisNative, int*
183183
try
184184
{
185185
// Unmarshal - Convert native data to managed data.
186-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
187-
@this.IsGameHasPreload(out var result);
186+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
187+
@this.IsGameHasPreload(out bool result);
188188
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
189189
retVal = 0; // S_OK
190190
// Marshal - Convert managed data to native data.
@@ -205,7 +205,7 @@ internal static int ABI_LoadConfig(ComInterfaceDispatch* thisNative)
205205
try
206206
{
207207
// Unmarshal - Convert native data to managed data.
208-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
208+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
209209
@this.LoadConfig();
210210
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
211211
retVal = 0; // S_OK
@@ -225,7 +225,7 @@ internal static int ABI_SaveConfig(ComInterfaceDispatch* thisNative)
225225
try
226226
{
227227
// Unmarshal - Convert native data to managed data.
228-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
228+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
229229
@this.SaveConfig();
230230
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
231231
retVal = 0; // S_OK
@@ -247,9 +247,9 @@ internal static int ABI_FindExistingInstallPathAsync(ComInterfaceDispatch* thisN
247247
try
248248
{
249249
// Unmarshal - Convert native data to managed data.
250-
var cancelToken = cancelTokenNative;
251-
var @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
252-
@this.FindExistingInstallPathAsync(in cancelToken, out var result);
250+
Guid cancelToken = cancelTokenNative;
251+
IGameManager @this = ComInterfaceDispatch.GetInstance<IGameManager>(thisNative);
252+
@this.FindExistingInstallPathAsync(in cancelToken, out nint result);
253253
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
254254
retVal = 0; // S_OK
255255
// Marshal - Convert managed data to native data.

‎ABI/ABI_IGameUninstallerWrapper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ internal static int ABI_UninstallAsync(ComInterfaceDispatch* thisNative, Guid* c
2020
try
2121
{
2222
// Unmarshal - Convert native data to managed data.
23-
var cancelToken = cancelTokenNative;
24-
var @this = ComInterfaceDispatch.GetInstance<IGameUninstaller>(thisNative);
25-
@this.UninstallAsync(in cancelToken, out var result);
23+
Guid cancelToken = cancelTokenNative;
24+
IGameUninstaller @this = ComInterfaceDispatch.GetInstance<IGameUninstaller>(thisNative);
25+
@this.UninstallAsync(in cancelToken, out nint result);
2626
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
2727
retVal = 0; // S_OK
2828
// Marshal - Convert managed data to native data.

‎ABI/ABI_IInitializableTaskWrapper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ internal static int ABI_InitAsync(ComInterfaceDispatch* thisNative, Guid* cancel
2020
try
2121
{
2222
// Unmarshal - Convert native data to managed data.
23-
var cancelToken = cancelTokenNative;
24-
var @this = ComInterfaceDispatch.GetInstance<IInitializableTask>(thisNative);
25-
@this.InitAsync(in cancelToken, out var result);
23+
Guid cancelToken = cancelTokenNative;
24+
IInitializableTask @this = ComInterfaceDispatch.GetInstance<IInitializableTask>(thisNative);
25+
@this.InitAsync(in cancelToken, out nint result);
2626
// NotifyForSuccessfulInvoke - Keep alive any managed objects that need to stay alive across the call.
2727
retVal = 0; // S_OK
2828
// Marshal - Convert managed data to native data.

0 commit comments

Comments
 (0)