|
1 | 1 | #pragma once |
2 | 2 | #include <filesystem> |
3 | 3 | #include <map> |
| 4 | +#include <vector> |
4 | 5 | #include <stdarg.h> |
5 | 6 | #include "menu.h" |
6 | 7 | #include "switch.h" |
@@ -103,9 +104,9 @@ int getRegion() { |
103 | 104 | void getVersion(u64 tid, char version[0x10]) { |
104 | 105 | nsInitialize(); |
105 | 106 | NsApplicationControlData contolData; |
106 | | - nsGetApplicationControlData(1, tid, &contolData, sizeof(NsApplicationControlData), NULL); |
| 107 | + nsGetApplicationControlData(NsApplicationControlSource_Storage, tid, &contolData, sizeof(NsApplicationControlData), NULL); |
107 | 108 | nsExit(); |
108 | | - strcpy(version, contolData.nacp.version); |
| 109 | + strcpy(version, contolData.nacp.display_version); |
109 | 110 | } |
110 | 111 |
|
111 | 112 | int getSmashVersion() { |
@@ -172,14 +173,15 @@ void log(const char* format, ...) { |
172 | 173 | va_end(args); |
173 | 174 | } |
174 | 175 |
|
175 | | -bool isServiceRunning(const char *serviceName) { |
| 176 | +bool isServiceRunning(const char* serviceName) { |
176 | 177 | Handle handle; |
177 | | - bool running = R_FAILED(smRegisterService(&handle, serviceName, false, 1)); |
| 178 | + SmServiceName encodedName = smEncodeName(serviceName); |
| 179 | + bool running = R_FAILED(smRegisterService(&handle, encodedName, false, 1)); |
178 | 180 |
|
179 | 181 | svcCloseHandle(handle); |
180 | 182 |
|
181 | 183 | if (!running) |
182 | | - smUnregisterService(serviceName); |
| 184 | + smUnregisterService(encodedName); |
183 | 185 |
|
184 | 186 | return running; |
185 | 187 | } |
@@ -223,8 +225,8 @@ u64 runningTID() |
223 | 225 | u64 tid = 0; |
224 | 226 | pmdmntInitialize(); |
225 | 227 | pminfoInitialize(); |
226 | | - pmdmntGetApplicationPid(&pid); |
227 | | - pminfoGetTitleId(&tid, pid); |
| 228 | + pmdmntGetApplicationProcessId(&pid); |
| 229 | + pminfoGetProgramId(&tid, pid); |
228 | 230 | pminfoExit(); |
229 | 231 | pmdmntExit(); |
230 | 232 | return tid; |
|
0 commit comments