diff options
5 files changed, 33 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index c536fa81dc..b514f5898d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -4159,6 +4159,30 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentProcess) } #endif +#ifndef NO_GetCurrentProcessExplicitAppUserModelID +JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentProcessExplicitAppUserModelID) + (JNIEnv *env, jclass that, jintLongArray arg0) +{ + jintLong *lparg0=NULL; + jint rc = 0; + OS_NATIVE_ENTER(env, that, GetCurrentProcessExplicitAppUserModelID_FUNC); + if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* + rc = (jint)GetCurrentProcessExplicitAppUserModelID(lparg0); +*/ + { + OS_LOAD_FUNCTION(fp, GetCurrentProcessExplicitAppUserModelID) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(jintLong *))fp)(lparg0); + } + } +fail: + if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0); + OS_NATIVE_EXIT(env, that, GetCurrentProcessExplicitAppUserModelID_FUNC); + return rc; +} +#endif + #ifndef NO_GetCurrentProcessId JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentProcessId) (JNIEnv *env, jclass that) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h index 8a995a3efc..c9d1e035ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.h @@ -42,6 +42,7 @@ #define DwmEnableBlurBehindWindow_LIB "dwmapi.dll" #define DwmExtendFrameIntoClientArea_LIB "dwmapi.dll" #define DwmIsCompositionEnabled_LIB "dwmapi.dll" +#define GetCurrentProcessExplicitAppUserModelID_LIB "shell32.dll" #define GetGestureInfo_LIB "user32.dll" #define GetThemeInt_LIB "uxtheme.dll" #define GetThemeMargins_LIB "uxtheme.dll" diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index b788be6c62..c947f89492 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1068; -int OS_nativeFunctionCallCount[1068]; +int OS_nativeFunctionCount = 1069; +int OS_nativeFunctionCallCount[1069]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -294,6 +294,7 @@ char * OS_nativeFunctionNames[] = { "GetComboBoxInfo", "GetCurrentObject", "GetCurrentProcess", + "GetCurrentProcessExplicitAppUserModelID", "GetCurrentProcessId", "GetCurrentThreadId", "GetCursor", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h index 55d743839b..3d606b8309 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -302,6 +302,7 @@ typedef enum { GetComboBoxInfo_FUNC, GetCurrentObject_FUNC, GetCurrentProcess_FUNC, + GetCurrentProcessExplicitAppUserModelID_FUNC, GetCurrentProcessId_FUNC, GetCurrentThreadId_FUNC, GetCursor_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java index 1429fac03e..c06b800392 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java @@ -4297,6 +4297,8 @@ public static final native boolean GetComboBoxInfo (int /*long*/ hwndCombo, COMB public static final native int /*long*/ GetCurrentObject (int /*long*/ hdc, int uObjectType); public static final native int GetCurrentProcessId (); public static final native int GetCurrentThreadId (); +/** @method flags=dynamic */ +public static final native int GetCurrentProcessExplicitAppUserModelID(int /*long*/[] AppID); public static final native int /*long*/ GetCursor (); public static final native boolean GetCursorPos (POINT lpPoint); /** |