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 0d075e66459..b2e59a8c70f 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 @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ @@ -9253,18 +9250,34 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfo__II_3II) } #endif -#ifndef NO_SystemParametersInfoForDpi -JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoForDpi) +#ifndef NO_SystemParametersInfoForDpi__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2II +JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoForDpi__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2II) (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4) { NONCLIENTMETRICS _arg2, *lparg2=NULL; jboolean rc = 0; - OS_NATIVE_ENTER(env, that, SystemParametersInfoForDpi_FUNC); + OS_NATIVE_ENTER(env, that, SystemParametersInfoForDpi__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2II_FUNC); if (arg2) if ((lparg2 = getNONCLIENTMETRICSFields(env, arg2, &_arg2)) == NULL) goto fail; rc = (jboolean)SystemParametersInfoForDpi(arg0, arg1, lparg2, arg3, arg4); fail: if (arg2 && lparg2) setNONCLIENTMETRICSFields(env, arg2, lparg2); - OS_NATIVE_EXIT(env, that, SystemParametersInfoForDpi_FUNC); + OS_NATIVE_EXIT(env, that, SystemParametersInfoForDpi__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2II_FUNC); + return rc; +} +#endif + +#ifndef NO_SystemParametersInfoForDpi__II_3III +JNIEXPORT jboolean JNICALL OS_NATIVE(SystemParametersInfoForDpi__II_3III) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4) +{ + jint *lparg2=NULL; + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, SystemParametersInfoForDpi__II_3III_FUNC); + if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail; + rc = (jboolean)SystemParametersInfoForDpi(arg0, arg1, lparg2, arg3, arg4); +fail: + if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0); + OS_NATIVE_EXIT(env, that, SystemParametersInfoForDpi__II_3III_FUNC); return rc; } #endif 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 bc809ece5f4..15503f2c022 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 @@ -7,9 +7,6 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation *******************************************************************************/ /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */ @@ -687,7 +684,8 @@ typedef enum { SystemParametersInfo__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2I_FUNC, SystemParametersInfo__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC, SystemParametersInfo__II_3II_FUNC, - SystemParametersInfoForDpi_FUNC, + SystemParametersInfoForDpi__IILorg_eclipse_swt_internal_win32_NONCLIENTMETRICS_2II_FUNC, + SystemParametersInfoForDpi__II_3III_FUNC, TBBUTTONINFO_1sizeof_FUNC, TBBUTTON_1sizeof_FUNC, TCHITTESTINFO_1sizeof_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 d6abf999892..66b285598a3 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 @@ -4465,6 +4465,7 @@ public static int HRESULT_FROM_WIN32(int x) { public static final native boolean SystemParametersInfo (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni); public static final native boolean SystemParametersInfo (int uiAction, int uiParam, int [] pvParam, int fWinIni); public static final native boolean SystemParametersInfoForDpi (int uiAction, int uiParam, NONCLIENTMETRICS pvParam, int fWinIni, int dpi); +public static final native boolean SystemParametersInfoForDpi (int uiAction, int uiParam, int [] pvParam, int fWinIni, int dpi); /** * @param lpKeyState cast=(PBYTE) * @param pwszBuff cast=(LPWSTR)