dwm blur

5 files changed, 24 insertions, 14 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index 2eab07f972..6ca1415f73 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -207,9 +207,9 @@ DROPFILES_fNC=
 DROPFILES_fWide=
 
 org_eclipse_swt_internal_win32_DWM_1BLURBEHIND=
-DWM_BLURBEHIND_bdwFlags=
-DWM_BLURBEHIND_bfEnable=
-DWM_BLURBEHIND_hRgnBlur=
+DWM_BLURBEHIND_dwFlags=
+DWM_BLURBEHIND_fEnable=
+DWM_BLURBEHIND_hRgnBlur=cast=HRGN
 DWM_BLURBEHIND_fTransitionOnMaximized=
 
 org_eclipse_swt_internal_win32_EXTLOGPEN=
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
index 4f6a8c10c1..becf043bd2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
@@ -202,6 +202,7 @@
 #define NO_DrawThemeIcon
 #define NO_DrawThemeParentBackground
 #define NO_DrawThemeText
+#define NO_DwmEnableBlurBehindWindow
 #define NO_DwmExtendFrameIntoClientArea
 #define NO_EnableScrollBar
 #define NO_EndBufferedPaint
@@ -575,6 +576,15 @@ typedef struct _BP_PAINTPARAMS {
 } BP_PAINTPARAMS, *PBP_PAINTPARAMS;
 #endif
 
+#ifndef _DWM_BLURBEHIND
+typedef struct _DWM_BLURBEHIND {
+    DWORD dwFlags;
+    BOOL fEnable;
+    HRGN hRgnBlur;
+    BOOL fTransitionOnMaximized;
+} DWM_BLURBEHIND, *PDWM_BLURBEHIND;
+#endif
+
 #if (_WIN32_IE <= 0x0600)
 typedef struct tagTVITEMCHANGE {
     NMHDR hdr;
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 f8370ab15d..673a3083c7 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
@@ -32,7 +32,7 @@
 #define DrawThemeIcon_LIB "uxtheme.dll"
 #define DrawThemeParentBackground_LIB "uxtheme.dll"
 #define DrawThemeText_LIB "uxtheme.dll"
-#define DwmDwmEnableBlurBehindWindow_LIB "dwmapi.dll"
+#define DwmEnableBlurBehindWindow_LIB "dwmapi.dll"
 #define DwmExtendFrameIntoClientArea_LIB "dwmapi.dll"
 #define GetThemeInt_LIB "uxtheme.dll"
 #define GetThemeMargins_LIB "uxtheme.dll"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
index 432e15aad9..b764f38856 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
@@ -1065,7 +1065,7 @@ void setDROPFILESFields(JNIEnv *env, jobject lpObject, DROPFILES *lpStruct)
 typedef struct DWM_BLURBEHIND_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID bdwFlags, bfEnable, hRgnBlur, fTransitionOnMaximized;
+	jfieldID dwFlags, fEnable, hRgnBlur, fTransitionOnMaximized;
 } DWM_BLURBEHIND_FID_CACHE;
 
 DWM_BLURBEHIND_FID_CACHE DWM_BLURBEHINDFc;
@@ -1074,8 +1074,8 @@ void cacheDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject)
 {
 	if (DWM_BLURBEHINDFc.cached) return;
 	DWM_BLURBEHINDFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DWM_BLURBEHINDFc.bdwFlags = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "bdwFlags", "I");
-	DWM_BLURBEHINDFc.bfEnable = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "bfEnable", "Z");
+	DWM_BLURBEHINDFc.dwFlags = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "dwFlags", "I");
+	DWM_BLURBEHINDFc.fEnable = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "fEnable", "Z");
 	DWM_BLURBEHINDFc.hRgnBlur = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "hRgnBlur", "I");
 	DWM_BLURBEHINDFc.fTransitionOnMaximized = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "fTransitionOnMaximized", "Z");
 	DWM_BLURBEHINDFc.cached = 1;
@@ -1084,9 +1084,9 @@ void cacheDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject)
 DWM_BLURBEHIND *getDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURBEHIND *lpStruct)
 {
 	if (!DWM_BLURBEHINDFc.cached) cacheDWM_BLURBEHINDFields(env, lpObject);
-	lpStruct->bdwFlags = (*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.bdwFlags);
-	lpStruct->bfEnable = (*env)->GetBooleanField(env, lpObject, DWM_BLURBEHINDFc.bfEnable);
-	lpStruct->hRgnBlur = (*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur);
+	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.dwFlags);
+	lpStruct->fEnable = (*env)->GetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fEnable);
+	lpStruct->hRgnBlur = (HRGN)(*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur);
 	lpStruct->fTransitionOnMaximized = (*env)->GetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fTransitionOnMaximized);
 	return lpStruct;
 }
@@ -1094,8 +1094,8 @@ DWM_BLURBEHIND *getDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURB
 void setDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURBEHIND *lpStruct)
 {
 	if (!DWM_BLURBEHINDFc.cached) cacheDWM_BLURBEHINDFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, DWM_BLURBEHINDFc.bdwFlags, (jint)lpStruct->bdwFlags);
-	(*env)->SetBooleanField(env, lpObject, DWM_BLURBEHINDFc.bfEnable, (jboolean)lpStruct->bfEnable);
+	(*env)->SetIntField(env, lpObject, DWM_BLURBEHINDFc.dwFlags, (jint)lpStruct->dwFlags);
+	(*env)->SetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fEnable, (jboolean)lpStruct->fEnable);
 	(*env)->SetIntField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur, (jint)lpStruct->hRgnBlur);
 	(*env)->SetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fTransitionOnMaximized, (jboolean)lpStruct->fTransitionOnMaximized);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
index 7b73ef2927..4ee489ccc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class DWM_BLURBEHIND {
-	public int bdwFlags;
-	public boolean bfEnable;
+	public int dwFlags;
+	public boolean fEnable;
 	public int /*long*/ hRgnBlur;
 	public boolean fTransitionOnMaximized;
 	public static final int sizeof = OS.DWM_BLURBEHIND_sizeof ();