platform/windows: fix more compilation errors

Author: Serial-ATA

native/macros/src/call.rs

@@ -41,8 +41,9 @@ macro_rules! parameter_types {
 			fn from_str(s: &str) -> Option<Self> {
 				match s {
 					$(stringify!($sys_ty) | stringify!(jni::sys::$sys_ty) | stringify!(::jni::sys::$sys_ty) => Some(SafeJniWrapperType::Primitive(Primitive::$sys_ty)),)+
-					$(stringify!($obj_ty) | stringify!(jni::objects::$obj_ty) | stringify!(::jni::objects::$obj_ty) => Some(SafeJniWrapperType::$obj_ty),)+
-					_ => None
+					$(stringify!($obj_sys_ty) | stringify!(jni::objects::$obj_sys_ty) | stringify!(::jni::objects::$obj_sys_ty)
+					| stringify!($obj_ty) | stringify!(jni::objects::$obj_ty) | stringify!(::jni::objects::$obj_ty) => Some(SafeJniWrapperType::$obj_ty),)+
+					_ => None,
 				}
 			}
 

native/nio/Cargo.toml

@@ -20,4 +20,4 @@ cfg-if.workspace = true
 libc.workspace = true
 
 [target.'cfg(target_family = "windows")'.dependencies]
-windows.workspace = true
+windows = { workspace = true, features = ["Win32_Networking_WinSock"] }

native/nio/src/fs/windows/WindowsNativeDispatcher.rs

@@ -28,7 +28,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_FormatMessage(
 	_env: JniEnv,
 	_this: JClass,
 	_error_code: jint,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#FormatMessage");
 }
 
@@ -147,7 +147,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_FindNextFile0(
 	_this: JClass,
 	_handle: jlong,
 	_data_address: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#FindNextFile0");
 }
 
@@ -166,7 +166,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_FindNextStream0(
 	_env: JniEnv,
 	_this: JClass,
 	_handle: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#FindNextStream0");
 }
 
@@ -314,7 +314,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_GetVolumePathName
 	_env: JniEnv,
 	_this: JClass,
 	_address: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#GetVolumePathName0");
 }
 
@@ -477,7 +477,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_ConvertSidToStrin
 	_env: JniEnv,
 	_this: JClass,
 	_address: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#ConvertSidToStringSid");
 }
 
@@ -620,7 +620,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_GetFullPathName0(
 	_env: JniEnv,
 	_clz: JClass,
 	_path_address: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#GetFullPathName0");
 }
 
@@ -629,7 +629,7 @@ pub extern "system" fn Java_sun_nio_fs_WindowsNativeDispatcher_GetFinalPathNameB
 	_env: JniEnv,
 	_this: JClass,
 	_handle: jlong,
-) -> jstring {
+) -> JString {
 	unimplemented!("sun.nio.fs.WindowsNativeDispatcher#GetFinalPathNameByHandle");
 }