ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-05 18:03:17 +03:00
Code Issues Projects Releases Wiki Activity

Wait for other instance to be responsive before forwarding auth

Browse Source
This commit is contained in:
Jonathan Harris 2019-02-19 18:14:16 +00:00
parent 04ee40ee26
commit 19ccfaf481
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EDMarketConnector.py
View File

@ -737,7 +737,10 @@ if __name__ == "__main__":
GetWindowText.argtypes = [HWND, LPWSTR, ctypes.c_int] GetWindowText.argtypes = [HWND, LPWSTR, ctypes.c_int]
GetWindowTextLength = ctypes.windll.user32.GetWindowTextLengthW GetWindowTextLength = ctypes.windll.user32.GetWindowTextLengthW
GetProcessHandleFromHwnd = ctypes.windll.oleacc.GetProcessHandleFromHwnd GetProcessHandleFromHwnd = ctypes.windll.oleacc.GetProcessHandleFromHwnd
SW_RESTORE = 9
SetForegroundWindow = ctypes.windll.user32.SetForegroundWindow SetForegroundWindow = ctypes.windll.user32.SetForegroundWindow
ShowWindow = ctypes.windll.user32.ShowWindow
ShowWindowAsync = ctypes.windll.user32.ShowWindowAsync ShowWindowAsync = ctypes.windll.user32.ShowWindowAsync
COINIT_MULTITHREADED = 0 COINIT_MULTITHREADED = 0
@ -762,12 +765,13 @@ if __name__ == "__main__":
cls = ctypes.create_unicode_buffer(257) cls = ctypes.create_unicode_buffer(257)
if GetClassName(hWnd, cls, 257) and cls.value == 'TkTopLevel' and WindowTitle(hWnd) == applongname and GetProcessHandleFromHwnd(hWnd): if GetClassName(hWnd, cls, 257) and cls.value == 'TkTopLevel' and WindowTitle(hWnd) == applongname and GetProcessHandleFromHwnd(hWnd):
# If GetProcessHandleFromHwnd succeeds then the app is already running as this user # If GetProcessHandleFromHwnd succeeds then the app is already running as this user
ShowWindowAsync(hWnd, 9) # SW_RESTORE
if len(sys.argv) > 1 and sys.argv[1].startswith(protocolhandler.redirect): if len(sys.argv) > 1 and sys.argv[1].startswith(protocolhandler.redirect):
# Browser invoked us directly with auth response. Forward the response to the other app instance. # Browser invoked us directly with auth response. Forward the response to the other app instance.
CoInitializeEx(0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) CoInitializeEx(0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)
ShellExecute(0, None, sys.argv[1], None, None, 1) ShowWindow(hWnd, SW_RESTORE) # Wait for it to be responsive to avoid ShellExecute recursing
ShellExecute(0, None, sys.argv[1], None, None, SW_RESTORE)
else: else:
ShowWindowAsync(hWnd, SW_RESTORE)
SetForegroundWindow(hWnd) SetForegroundWindow(hWnd)
sys.exit(0) sys.exit(0)
return True return True

1
README.md
View File

@ -126,7 +126,6 @@ Troubleshooting
The authentication didn't complete correctly for some reason. This can be caused by: The authentication didn't complete correctly for some reason. This can be caused by:
- Using Internet Explorer. IE is [known](https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/) to be broken. Please (temporarily) set your default browser to Edge, Chrome or Firefox and retry. - Using Internet Explorer. IE is [known](https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/) to be broken. Please (temporarily) set your default browser to Edge, Chrome or Firefox and retry.
- Incorrect protocol association in Firefox. In Firefox change Options → Applications → edmc to "Use EDMarketConnector.exe **(default)**".
- Entering credentials for a different Cmdr - see [Error: Wrong Cmdr](#error-wrong-cmdr). - Entering credentials for a different Cmdr - see [Error: Wrong Cmdr](#error-wrong-cmdr).
- Entering Steam credentials instead of Frontier credentials - see [Error: User not found](#error-user-not-found). - Entering Steam credentials instead of Frontier credentials - see [Error: User not found](#error-user-not-found).