API tools faq
paste
Advertisement
Guest User

WatiN 64b pinvoke fix

a guest
Jul 24th, 2014
483
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.18 KB | None | 0 0
raw download clone embed print report
  1. WatiN-2.1.0.1196/source/src/Core/Browser.cs
  2. 79c79
  3. < NativeMethods.GetWindowPlacement(hWnd, ref placement);
  4. ---
  5. > NativeMethods.GetWindowPlacement(hWnd, out placement);
  6. 112c112
  7. < var intThreadIDIE = ProcessID;
  8. ---
  9. > var intThreadIDIE = Convert.ToUInt32(ProcessID);
  10. 117,118c117,118
  11. < NativeMethods.keybd_event(NativeMethods.KEYEVENTF_TAB, 0x45, NativeMethods.KEYEVENTF_EXTENDEDKEY, 0);
  12. < NativeMethods.keybd_event(NativeMethods.KEYEVENTF_TAB, 0x45, NativeMethods.KEYEVENTF_EXTENDEDKEY | NativeMethods.KEYEVENTF_KEYUP, 0);
  13. ---
  14. > NativeMethods.keybd_event(NativeMethods.KEYEVENTF_TAB, 0x45, NativeMethods.KEYEVENTF_EXTENDEDKEY, UIntPtr.Zero);
  15. > NativeMethods.keybd_event(NativeMethods.KEYEVENTF_TAB, 0x45, NativeMethods.KEYEVENTF_EXTENDEDKEY | NativeMethods.KEYEVENTF_KEYUP, UIntPtr.Zero);
  16.  
  17. WatiN-2.1.0.1196/source/src/Core/Native/IHwnd.cs
  18. 37c37
  19. < void SendMessage(int msg, int wParam, int lParam);
  20. ---
  21. > void SendMessage(uint msg, UIntPtr wParam, IntPtr lParam);
  22.  
  23. WatiN-2.1.0.1196/source/src/Core/Native/InternetExplorer/IEUtils.cs
  24. 36,37c36,41
  25. < [DllImport("oleacc", CharSet = CharSet.Ansi, SetLastError = true, ExactSpelling = true)]
  26. < public static extern Int32 ObjectFromLresult(Int32 lResult, ref Guid riid, Int32 wParam, ref IHTMLDocument2 ppvObject);
  27. ---
  28. > //[DllImport("oleacc", CharSet = CharSet.Ansi, SetLastError = true, ExactSpelling = true)]
  29. > //public static extern Int32 ObjectFromLresult(Int32 lResult, ref Guid riid, Int32 wParam, ref IHTMLDocument2 ppvObject);
  30. >
  31. > [DllImport("oleacc.dll", PreserveSig = false)]
  32. > [return: MarshalAs(UnmanagedType.Interface)]
  33. > static extern object ObjectFromLresult(IntPtr lResult,[MarshalAs(UnmanagedType.LPStruct)] Guid riid, UIntPtr wParam);
  34. 81,84c85
  35. < var IID_IHTMLDocument2 = new Guid("626FC520-A41E-11CF-A731-00A0C9082637");
  36. <
  37. < var lRes = 0;
  38. <
  39. ---
  40. > //var IID_IHTMLDocument2 = new Guid("626FC520-A41E-11CF-A731-00A0C9082637");
  41. 96,97c97,99
  42. < NativeMethods.SendMessageTimeout(hWnd, lMsg, 0, 0, NativeMethods.SMTO_ABORTIFHUNG, 1000, ref lRes);
  43. < if (lRes != 0)
  44. ---
  45. > IntPtr lRes;
  46. > NativeMethods.SendMessageTimeout(hWnd, lMsg, UIntPtr.Zero, IntPtr.Zero, NativeMethods.SMTO_ABORTIFHUNG, 1000, out lRes);
  47. > if (lRes != IntPtr.Zero)
  48. 100,105c102,107
  49. < IHTMLDocument2 ieDOMFromhWnd = null;
  50. < var hr = ObjectFromLresult(lRes, ref IID_IHTMLDocument2, 0, ref ieDOMFromhWnd);
  51. < if (hr != 0)
  52. < {
  53. < throw new COMException("ObjectFromLresult has thrown an exception", hr);
  54. < }
  55. ---
  56. > IHTMLDocument2 ieDOMFromhWnd = ObjectFromLresult(lRes, typeof(IHTMLDocument2).GUID, UIntPtr.Zero) as IHTMLDocument2;
  57. > //var hr = ObjectFromLresult(lRes, ref IID_IHTMLDocument2, 0, ref ieDOMFromhWnd);
  58. > //if (ieDOMFromhWnd == null)
  59. > //{
  60. > // throw new COMException("ObjectFromLresult has thrown an exception,hr");
  61. > //}
  62.  
  63. WatiN-2.1.0.1196/source/src/Core/Native/Windows/Hwnd.cs
  64. 68c68
  65. < public void SendMessage(int msg, int wParam, int lParam)
  66. ---
  67. > public void SendMessage(uint msg, UIntPtr wParam, IntPtr lParam)
  68. 94c94
  69. < NativeMethods.SendMessage(new HandleRef(null, handle), NativeMethods.WM_CHAR, new IntPtr(Convert.ToInt64(c)), IntPtr.Zero);
  70. ---
  71. > NativeMethods.SendMessage(new HandleRef(null, handle), NativeMethods.WM_CHAR, new UIntPtr(Convert.ToUInt64(c)), IntPtr.Zero);
  72.  
  73. WatiN-2.1.0.1196/source/src/Core/Native/Windows/Win32.cs
  74. 141c141
  75. < [DllImport("user32", EntryPoint = "GetClassNameA", CharSet = CharSet.Ansi, SetLastError = true, ExactSpelling = true)]
  76. ---
  77. > [DllImport("user32.dll", EntryPoint = "GetClassNameA", CharSet = CharSet.Ansi, SetLastError = true, ExactSpelling = true)]
  78. 143a144
  79. > [return: MarshalAs(UnmanagedType.Bool)]
  80. 148c149
  81. < internal static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string className, IntPtr windowTitle);
  82. ---
  83. > internal static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string className, string windowTitle);
  84. 154c155
  85. < internal static extern IntPtr GetDlgItem(IntPtr handleToWindow, int ControlId);
  86. ---
  87. > internal static extern IntPtr GetDlgItem(IntPtr handleToWindow, int controlId);
  88. 163c164
  89. < public static extern IntPtr GetWindow(IntPtr hWnd, int uCmd);
  90. ---
  91. > public static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
  92. 165a167
  93. > [return: MarshalAs(UnmanagedType.Bool)]
  94. 175c177,178
  95. < internal static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
  96. ---
  97. > [return: MarshalAs(UnmanagedType.Bool)]
  98. > internal static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);
  99. 177a181
  100. > [return: MarshalAs(UnmanagedType.Bool)]
  101. 180a185
  102. > [return: MarshalAs(UnmanagedType.Bool)]
  103. 183a189
  104. > [return: MarshalAs(UnmanagedType.Bool)]
  105. 187c193
  106. < internal static extern int SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
  107. ---
  108. > internal static extern IntPtr SendMessage(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam);
  109. 190c196
  110. < internal static extern IntPtr SendMessage(HandleRef hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
  111. ---
  112. > internal static extern IntPtr SendMessage(HandleRef hWnd, uint msg, UIntPtr wParam, IntPtr lParam);
  113. 200c206
  114. < internal static extern IntPtr SetWindowPos(IntPtr hWnd, int hWndInsertAfter, int x, int Y, int cx, int cy, int wFlags);
  115. ---
  116. > internal static extern IntPtr SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int Y, int cx, int cy, uint wFlags);
  117. 211c217
  118. < public static extern Int32 RegisterWindowMessage(string lpString);
  119. ---
  120. > public static extern uint RegisterWindowMessage(string lpString);
  121. 214c220
  122. < public static extern Int32 SendMessageTimeout(IntPtr hWnd, Int32 msg, Int32 wParam, Int32 lParam, Int32 fuFlags, Int32 uTimeout, ref Int32 lpdwResult);
  123. ---
  124. > public static extern IntPtr SendMessageTimeout(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam, uint fuFlags, uint uTimeout, out IntPtr lResult);
  125. 217c223
  126. < internal static extern bool AttachThreadInput(int idAttach, int idAttachTo, bool fAttach);
  127. ---
  128. > internal static extern bool AttachThreadInput(uint idAttach, uint idAttachTo, bool fAttach);
  129. 220c226
  130. < internal static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, int dwExtraInfo);
  131. ---
  132. > internal static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
  133. 259a266
  134. > [return: MarshalAs(UnmanagedType.Bool)]
  135. 263c270
  136. < internal static extern int GetWindowThreadProcessId(IntPtr window, out int processId);
  137. ---
  138. > internal static extern uint GetWindowThreadProcessId(IntPtr window, out IntPtr processId);
  139. 271c278
  140. < internal static extern int GetCurrentThreadId();
  141. ---
  142. > internal static extern uint GetCurrentThreadId();
  143. 323c330
  144. < SendMessage(buttonPtr, BM_CLICK, 0, 0);
  145. ---
  146. > SendMessage(buttonPtr, BM_CLICK, UIntPtr.Zero, IntPtr.Zero);
  147. 362c369
  148. < SetWindowPos(hWnd, 0, 0, 0, width, height, 0);
  149. ---
  150. > SetWindowPos(hWnd, IntPtr.Zero, 0, 0, width, height, 0);
  151.  
  152. WatiN-2.1.0.1196/source/src/Core/Native/Windows/WinButton.cs
  153. 50,51c50,51
  154. < _hWnd.SendMessage(NativeMethods.WM_ACTIVATE, NativeMethods.MA_ACTIVATE, 0);
  155. < _hWnd.SendMessage(NativeMethods.BM_CLICK, 0, 0);
  156. ---
  157. > _hWnd.SendMessage(NativeMethods.WM_ACTIVATE, new UIntPtr(NativeMethods.MA_ACTIVATE), IntPtr.Zero);
  158. > _hWnd.SendMessage(NativeMethods.BM_CLICK, UIntPtr.Zero, IntPtr.Zero);
  159.  
  160. WatiN-2.1.0.1196/source/src/Core/Native/Windows/Window.cs
  161. 83c83
  162. < NativeMethods.SendMessage(Hwnd, NativeMethods.WM_CLOSE, 0, 0);
  163. ---
  164. > NativeMethods.SendMessage(Hwnd, NativeMethods.WM_CLOSE, UIntPtr.Zero, IntPtr.Zero);
  165. 130c130
  166. < int iePid;
  167. ---
  168. > IntPtr iePid;
  169. 134c134
  170. < return iePid;
  171. ---
  172. > return iePid.ToInt32();
  173.  
  174. WatiN-2.1.0.1196/source/src/Core/UtilityClasses/CaptureWebPage.cs
  175. 167,168c167,168
  176. < hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "MozillaWindowClass", IntPtr.Zero);
  177. < hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "MozillaContentWindowClass", IntPtr.Zero);
  178. ---
  179. > hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "MozillaWindowClass", null);
  180. > hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "MozillaContentWindowClass", null);
  181. 313c313
  182. < hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "Internet Explorer_Server", IntPtr.Zero);
  183. ---
  184. > hwnd = NativeMethods.FindWindowEx(hwnd, IntPtr.Zero, "Internet Explorer_Server", null);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!