Use jlong for HANDLE and GetProcessId instead of Nt kernel private fu…

…nction
jenkinsci · Jun 24, 2018 · 880c9c3 · 880c9c3
1 parent bd2fa87
commit 880c9c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/native/envvar-cmdline.cpp b/native/envvar-cmdline.cpp
@@ -312,22 +312,14 @@ jstring getCmdLineAndEnvVars(
 	return packedStr;
 }
 
-JNIEXPORT jint JNICALL Java_org_jvnet_winp_Native_getProcessId(JNIEnv* pEnv, jclass clazz, jint handle) {
+JNIEXPORT jint JNICALL Java_org_jvnet_winp_Native_getProcessId(JNIEnv* pEnv, jclass clazz, jlong handle) {
+	char errorBuffer[ERRMSG_SIZE];
 	HANDLE hProcess = (HANDLE)handle;
-	PROCESS_BASIC_INFORMATION ProcInfo;
-	SIZE_T sRead;
-	if(!NT_SUCCESS(ZwQueryInformationProcess(hProcess, ProcessBasicInformation, &ProcInfo, sizeof(ProcInfo), &sRead))) {
-		reportError(pEnv,"Failed to ZWQueryInformationProcess");
+	DWORD pid = GetProcessId(hProcess);
+	if (!pid) {
+		sprintf_s<ERRMSG_SIZE>(errorBuffer, "Failed to get process id from handle=%ld.", handle);
+		reportError(pEnv, errorBuffer);
 		return -1;
 	}
-
-	return (jint)ProcInfo.UniqueProcessId;
-/*	ULONG id=0;
-
-	if(!ReadProcessMemory(hProcess, ProcInfo.UniqueProcessId, &id, sizeof(ULONG), &_)) {
-		reportError(pEnv,"Failed to read process ID");
-		return NULL;
-	}
-
-	return id;*/
+	return pid;
 }
diff --git a/native/java-interface.h b/native/java-interface.h
diff --git a/native/stdafx.h b/native/stdafx.h
@@ -3,7 +3,7 @@
 // are changed infrequently
 #pragma once
 
-#define _WIN32_WINNT 0x500
+#define _WIN32_WINNT 0x501
 
 #include <windows.h>
 #include <tchar.h>

diff --git a/src/main/java/org/jvnet/winp/Native.java b/src/main/java/org/jvnet/winp/Native.java
@@ -25,7 +25,7 @@ class Native {
     native static boolean sendCtrlC(int pid, String sendctrlcExePath);
     native static boolean isCriticalProcess(int pid);
     native static int setPriority(int pid, int value);
-    native static int getProcessId(int handle);
+    native static int getProcessId(long handle);
     native static boolean exitWindowsEx(int flags,int reasonCode);
 
     /**

diff --git a/src/main/java/org/jvnet/winp/WinProcess.java b/src/main/java/org/jvnet/winp/WinProcess.java
@@ -41,7 +41,7 @@ public WinProcess(Process proc) {
         try {
             Field f = proc.getClass().getDeclaredField("handle");
             f.setAccessible(true);
-            int handle = ((Number)f.get(proc)).intValue();
+            long handle = f.getLong(proc);
             pid = Native.getProcessId(handle);
         } catch (NoSuchFieldException e) {
             throw new NotWindowsException(e);