further improvements to DWM code, but still not working

Author: tomysshadow

FlashpointSecurePlayer/FlashpointProxy.cs

@@ -101,30 +101,35 @@ private static void GetSystemProxy(ref INTERNET_PER_CONN_OPTION_LIST internetPer
 
             // allocate a block of memory of the options
             internetPerConnOptionList.pOptions = Marshal.AllocCoTaskMem(Marshal.SizeOf(internetPerConnOptionListOptions[0]) + Marshal.SizeOf(internetPerConnOptionListOptions[1]));
-            
-            IntPtr internetPerConnOptionPointer = internetPerConnOptionList.pOptions;
 
-            // marshal data from a managed object to unmanaged memory
-            for (int i = 0; i < internetPerConnOptionListOptions.Length; i++) {
-                Marshal.StructureToPtr(internetPerConnOptionListOptions[i], internetPerConnOptionPointer, false);
-                internetPerConnOptionPointer = (IntPtr)((int)internetPerConnOptionPointer + Marshal.SizeOf(internetPerConnOptionListOptions[i]));
-            }
+            try {
+                IntPtr internetPerConnOptionPointer = internetPerConnOptionList.pOptions;
 
-            // fill the internetPerConnOptionList structure
-            internetPerConnOptionList.dwSize = internetPerConnOptionListSize;
+                // marshal data from a managed object to unmanaged memory
+                for (int i = 0; i < internetPerConnOptionListOptions.Length; i++) {
+                    Marshal.StructureToPtr(internetPerConnOptionListOptions[i], internetPerConnOptionPointer, false);
+                    internetPerConnOptionPointer = (IntPtr)((int)internetPerConnOptionPointer + Marshal.SizeOf(internetPerConnOptionListOptions[i]));
+                }
 
-            // NULL == LAN, otherwise connectoid name
-            internetPerConnOptionList.pszConnection = IntPtr.Zero;
+                // fill the internetPerConnOptionList structure
+                internetPerConnOptionList.dwSize = internetPerConnOptionListSize;
 
-            // set two options
-            internetPerConnOptionList.dwOptionCount = (uint)internetPerConnOptionListOptions.Length;
-            internetPerConnOptionList.dwOptionError = 0;
+                // NULL == LAN, otherwise connectoid name
+                internetPerConnOptionList.pszConnection = IntPtr.Zero;
 
-            // query internet options
-            bool result = InternetQueryOption(IntPtr.Zero, INTERNET_OPTION.INTERNET_OPTION_PER_CONNECTION_OPTION, ref internetPerConnOptionList, ref internetPerConnOptionListSize);
-                
-            if (!result) {
-                throw new FlashpointProxyException("Could not query the Internet Options.");
+                // set two options
+                internetPerConnOptionList.dwOptionCount = (uint)internetPerConnOptionListOptions.Length;
+                internetPerConnOptionList.dwOptionError = 0;
+
+                // query internet options
+                bool result = InternetQueryOption(IntPtr.Zero, INTERNET_OPTION.INTERNET_OPTION_PER_CONNECTION_OPTION, ref internetPerConnOptionList, ref internetPerConnOptionListSize);
+
+                if (!result) {
+                    throw new FlashpointProxyException("Could not query the Internet Options.");
+                }
+            } catch (Exception ex) {
+                Marshal.FreeCoTaskMem(internetPerConnOptionList.pOptions);
+                throw ex;
             }
         }
 

FlashpointSecurePlayer/Shared.cs

@@ -318,7 +318,7 @@ public struct MSLLHOOKSTRUCT {
         public static extern bool UnhookWindowsHookEx(IntPtr hhk);
 
         public enum DWMWINDOWATTRIBUTE : uint {
-            DWMWA_NCRENDERING_ENABLED,
+            DWMWA_NCRENDERING_ENABLED = 1,
             DWMWA_NCRENDERING_POLICY,
             DWMWA_TRANSITIONS_FORCEDISABLED,
             DWMWA_ALLOW_NCPAINT,
@@ -346,10 +346,10 @@ public enum DWMWINDOWATTRIBUTE : uint {
         }
 
         [DllImport("DWMAPI.DLL")]
-        public static extern int DwmGetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE dwAttribute, IntPtr pvAttribute, uint cbAttribute);
+        public static extern int DwmGetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE dwAttribute, out int pvAttribute, uint cbAttribute);
 
         [DllImport("DWMAPI.DLL")]
-        public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE dwAttribute, IntPtr pvAttribute, uint cbAttribute);
+        public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE dwAttribute, ref int pvAttribute, uint cbAttribute);
 
         [StructLayout(LayoutKind.Sequential)]
         public struct SECURITY_ATTRIBUTES {

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -58,29 +58,23 @@ private IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam) {
 
         private bool TransitionsForceDisabled {
             get {
-                int attributeValueSize = Marshal.SizeOf(typeof(int));
-                IntPtr attributeValuePointer = Marshal.AllocHGlobal(attributeValueSize);
-
-                try {
-                    DwmGetWindowAttribute(Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, attributeValuePointer, (uint)attributeValueSize);
-                    return (Marshal.ReadInt32(attributeValuePointer, 0) != 0) ? true : false;
-                } finally {
-                    Marshal.FreeHGlobal(attributeValuePointer);
+                int attributeValue = 0;
+
+                int err = DwmGetWindowAttribute(Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, out attributeValue, (uint)Marshal.SizeOf(typeof(int)));
+
+                if (err != S_OK) {
+                    Marshal.ThrowExceptionForHR(err);
                 }
+                return (attributeValue != 0) ? true : false;
             }
 
             set {
                 int attributeValue = value ? 1 : 0;
+                
+                int err = DwmSetWindowAttribute(Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, ref attributeValue, (uint)Marshal.SizeOf(typeof(int)));
 
-                int attributeValueSize = Marshal.SizeOf(attributeValue);
-                IntPtr attributeValuePointer = Marshal.AllocHGlobal(attributeValueSize);
-
-                try {
-                    Marshal.WriteInt32(attributeValuePointer, 0, attributeValue);
-
-                    DwmSetWindowAttribute(Handle, DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED, attributeValuePointer, (uint)attributeValueSize);
-                } finally {
-                    Marshal.FreeHGlobal(attributeValuePointer);
+                if (err != S_OK) {
+                    Marshal.ThrowExceptionForHR(err);
                 }
             }
         }
@@ -114,6 +108,7 @@ private bool ExitFullscreenLabelTimer {
         }
 
         private bool fullscreen = false;
+        private bool fullscreenTransitionsForceDisabled = false;
         private FormBorderStyle fullscreenFormBorderStyle = FormBorderStyle.Sizable;
         private FormWindowState fullscreenWindowState = FormWindowState.Maximized;
         private Point fullscreenLocation;
@@ -152,9 +147,11 @@ public bool Fullscreen {
                     closableWebBrowserSize = closableWebBrowser.Size;
 
                     try {
+                        fullscreenTransitionsForceDisabled = TransitionsForceDisabled;
                         TransitionsForceDisabled = true;
                     } catch {
-                        // Fail silently.
+                        // no Aero!
+                        fullscreenTransitionsForceDisabled = false;
                     }
 
                     // need to do this first to have an effect if starting maximized
@@ -181,13 +178,7 @@ public bool Fullscreen {
 
                     // commit by bringing the window to the front
                     BringToFront();
-
-                    try {
-                        TransitionsForceDisabled = false;
-                    } catch {
-                        // Fail silently.
-                    }
-            } else {
+                } else {
                     // hide "Press F11 to exit fullscreen" label
                     ExitFullscreenLabelTimer = false;
 
@@ -198,12 +189,6 @@ public bool Fullscreen {
                         }
                     }
 
-                    try {
-                        TransitionsForceDisabled = true;
-                    } catch {
-                        // Fail silently.
-                    }
-
                     // need to do this first to reset the window to its former size
                     FormBorderStyle = FormBorderStyle.Sizable;
                     // exit fullscreen
@@ -226,11 +211,11 @@ public bool Fullscreen {
 
                     // commit by bringing the window to the front
                     BringToFront();
-
+                    
                     try {
-                        TransitionsForceDisabled = false;
+                        TransitionsForceDisabled = fullscreenTransitionsForceDisabled;
                     } catch {
-                        // Fail silently.
+                        // no Aero!
                     }
                 }
             }