diff --git a/windows/Sources/FabricSandbox/JniEntrypoint.swift b/windows/Sources/FabricSandbox/JniEntrypoint.swift index 01ce8d2..39e451b 100644 --- a/windows/Sources/FabricSandbox/JniEntrypoint.swift +++ b/windows/Sources/FabricSandbox/JniEntrypoint.swift @@ -2,12 +2,11 @@ import Jni import WinSDK @_cdecl("Java_net_fabricmc_sandbox_Main_nativeEntrypoint") -public func entrypoint(env: UnsafeMutablePointer, clazz: jclass!) { +public func entrypoint(jni: UnsafeMutablePointer, clazz: jclass!) { do { try FabricSandbox().run() } catch { - var jni = env.pointee - let runtimeException = jni.FindClass("java/lang/RuntimeException")! - let _ = jni.ThrowNew(runtimeException, "\(error)") + let runtimeException = jni.pointee.FindClass("java/lang/RuntimeException")! + let _ = jni.pointee.ThrowNew(runtimeException, "\(error)") } } diff --git a/windows/Sources/FabricSandbox/String+Jni.swift b/windows/Sources/FabricSandbox/String+Jni.swift deleted file mode 100644 index e3553ea..0000000 --- a/windows/Sources/FabricSandbox/String+Jni.swift +++ /dev/null @@ -1,11 +0,0 @@ -import Jni - -extension String { - // Construct a String from a jstring - init(_ env: UnsafeMutablePointer, jstring: jstring!) { - var jni = env.pointee - let chars = jni.GetStringChars(jstring, nil)! - defer { jni.ReleaseStringChars(jstring, chars) } - self = String(decodingCString: chars, as: UTF16.self) - } -} diff --git a/windows/Sources/Sandbox/AppContainer.swift b/windows/Sources/Sandbox/AppContainer.swift index 3d17a4b..83e9530 100644 --- a/windows/Sources/Sandbox/AppContainer.swift +++ b/windows/Sources/Sandbox/AppContainer.swift @@ -42,6 +42,9 @@ public class AppContainer { } */ + // Fow now delete an existing container if it exists + let _ = _DeleteAppContainerProfile(name.wide) + var capabilities = attributes.map { $0.sidAttributes } var sid: PSID? = nil let result = capabilities.withUnsafeMutableBufferPointer { capabilities in