(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -155,6 +155,9 @@ namespace EventInput
            return SetWindowLongPtr(hWnd, nIndex, dwNewLong);
        }

+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        static extern IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
        static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
 #endif
@@ -173,8 +176,8 @@ namespace EventInput
 #if WINDOWS
            hookProcDelegate = HookProc;

-            prevWndProc = SetWindowLongPtr(window.Handle, GWL_WNDPROC,
-            Marshal.GetFunctionPointerForDelegate(hookProcDelegate));
+            prevWndProc = TrySetWindowLong(window.Handle, GWL_WNDPROC,
+                Marshal.GetFunctionPointerForDelegate(hookProcDelegate));

            hIMC = ImmGetContext(window.Handle);
 #else