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

Made sure windll names are correct

Browse Source 
A/W has meaning and should ALWAYS be noted
This commit is contained in:
A_D 2021-01-28 18:36:31 +02:00 committed by Athanasius
parent 67d41d63dc
commit 4e75941311
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
protocol.py
View File

@ -114,23 +114,23 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
CW_USEDEFAULT = 0x80000000 CW_USEDEFAULT = 0x80000000
CreateWindowEx = windll.user32.CreateWindowExW CreateWindowExW = windll.user32.CreateWindowExW
CreateWindowEx.argtypes = [DWORD, LPCWSTR, LPCWSTR, DWORD, INT, INT, INT, INT, HWND, HMENU, HINSTANCE, LPVOID] CreateWindowExW.argtypes = [DWORD, LPCWSTR, LPCWSTR, DWORD, INT, INT, INT, INT, HWND, HMENU, HINSTANCE, LPVOID]
CreateWindowEx.restype = HWND CreateWindowExW.restype = HWND
RegisterClass = windll.user32.RegisterClassW RegisterClassW = windll.user32.RegisterClassW
RegisterClass.argtypes = [POINTER(WNDCLASS)] RegisterClassW.argtypes = [POINTER(WNDCLASS)]
DefWindowProc = windll.user32.DefWindowProcW DefWindowProcW = windll.user32.DefWindowProcW
GetParent = windll.user32.GetParent GetParent = windll.user32.GetParent
SetForegroundWindow = windll.user32.SetForegroundWindow SetForegroundWindow = windll.user32.SetForegroundWindow
GetMessage = windll.user32.GetMessageW GetMessageW = windll.user32.GetMessageW
TranslateMessage = windll.user32.TranslateMessage TranslateMessage = windll.user32.TranslateMessage
DispatchMessage = windll.user32.DispatchMessageW DispatchMessageW = windll.user32.DispatchMessageW
PostThreadMessage = windll.user32.PostThreadMessageW PostThreadMessageW = windll.user32.PostThreadMessageW
SendMessage = windll.user32.SendMessageW SendMessageW = windll.user32.SendMessageW
SendMessage.argtypes = [HWND, UINT, WPARAM, LPARAM] SendMessageW.argtypes = [HWND, UINT, WPARAM, LPARAM]
PostMessage = windll.user32.PostMessageW PostMessageW = windll.user32.PostMessageW
PostMessage.argtypes = [HWND, UINT, WPARAM, LPARAM] PostMessageW.argtypes = [HWND, UINT, WPARAM, LPARAM]
WM_QUIT = 0x0012 WM_QUIT = 0x0012
# https://docs.microsoft.com/en-us/windows/win32/dataxchg/wm-dde-initiate # https://docs.microsoft.com/en-us/windows/win32/dataxchg/wm-dde-initiate
@ -142,12 +142,12 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
PackDDElParam = windll.user32.PackDDElParam PackDDElParam = windll.user32.PackDDElParam
PackDDElParam.argtypes = [UINT, LPARAM, LPARAM] PackDDElParam.argtypes = [UINT, LPARAM, LPARAM]
GlobalAddAtom = windll.kernel32.GlobalAddAtomW GlobalAddAtomW = windll.kernel32.GlobalAddAtomW
GlobalAddAtom.argtypes = [LPWSTR] GlobalAddAtomW.argtypes = [LPWSTR]
GlobalAddAtom.restype = ATOM GlobalAddAtomW.restype = ATOM
GlobalGetAtomName = windll.kernel32.GlobalGetAtomNameW GlobalGetAtomNameW = windll.kernel32.GlobalGetAtomNameW
GlobalGetAtomName.argtypes = [ATOM, LPWSTR, INT] GlobalGetAtomNameW.argtypes = [ATOM, LPWSTR, INT]
GlobalGetAtomName.restype = UINT GlobalGetAtomNameW.restype = UINT
GlobalLock = windll.kernel32.GlobalLock GlobalLock = windll.kernel32.GlobalLock
GlobalLock.argtypes = [HGLOBAL] GlobalLock.argtypes = [HGLOBAL]
GlobalLock.restype = LPVOID GlobalLock.restype = LPVOID
@ -171,7 +171,7 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
if message != WM_DDE_INITIATE: if message != WM_DDE_INITIATE:
# Not a DDE init message, bail and tell windows to do the default # Not a DDE init message, bail and tell windows to do the default
# https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-defwindowproca?redirectedfrom=MSDN # https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-defwindowproca?redirectedfrom=MSDN
return DefWindowProc(hwnd, message, wParam, lParam) return DefWindowProcW(hwnd, message, wParam, lParam)
service = create_unicode_buffer(256) service = create_unicode_buffer(256)
topic = create_unicode_buffer(256) topic = create_unicode_buffer(256)
@ -185,17 +185,17 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
# which we can read out as shown below, and then compare. # which we can read out as shown below, and then compare.
target_is_valid = lparam_low == 0 or ( target_is_valid = lparam_low == 0 or (
GlobalGetAtomName(lparam_low, service, 256) and service.value == appname GlobalGetAtomNameW(lparam_low, service, 256) and service.value == appname
) )
topic_is_valid = lparam_high == 0 or ( topic_is_valid = lparam_high == 0 or (
GlobalGetAtomName(lparam_high, topic, 256) and topic.value.lower() == 'system' GlobalGetAtomNameW(lparam_high, topic, 256) and topic.value.lower() == 'system'
) )
if target_is_valid and topic_is_valid: if target_is_valid and topic_is_valid:
# if everything is happy, send an acknowledgement of the DDE request # if everything is happy, send an acknowledgement of the DDE request
SendMessage( SendMessageW(
wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, GlobalAddAtom(appname), GlobalAddAtom('System')) wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, GlobalAddAtomW(appname), GlobalAddAtomW('System'))
) )
return 0 return 0
@ -224,7 +224,7 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
thread = self.thread thread = self.thread
if thread: if thread:
self.thread = None self.thread = None
PostThreadMessage(thread.ident, WM_QUIT, 0, 0) PostThreadMessageW(thread.ident, WM_QUIT, 0, 0)
thread.join() # Wait for it to quit thread.join() # Wait for it to quit
def worker(self): def worker(self):
@ -241,12 +241,12 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
wndclass.lpszMenuName = None wndclass.lpszMenuName = None
wndclass.lpszClassName = 'DDEServer' wndclass.lpszClassName = 'DDEServer'
if not RegisterClass(byref(wndclass)): if not RegisterClassW(byref(wndclass)):
print('Failed to register Dynamic Data Exchange for cAPI') print('Failed to register Dynamic Data Exchange for cAPI')
return return
# https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-createwindowexw # https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-createwindowexw
hwnd = CreateWindowEx( hwnd = CreateWindowExW(
0, # dwExStyle 0, # dwExStyle
wndclass.lpszClassName, # lpClassName wndclass.lpszClassName, # lpClassName
"DDE Server", # lpWindowName "DDE Server", # lpWindowName
@ -260,7 +260,7 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
msg = MSG() msg = MSG()
# Calls GetMessageW: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getmessagew # Calls GetMessageW: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getmessagew
while GetMessage(byref(msg), None, 0, 0) != 0: while GetMessageW(byref(msg), None, 0, 0) != 0:
if msg.message == WM_DDE_EXECUTE: if msg.message == WM_DDE_EXECUTE:
# GlobalLock does some sort of "please dont move this?" # GlobalLock does some sort of "please dont move this?"
# https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-globallock # https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-globallock
@ -274,18 +274,18 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
SetForegroundWindow(GetParent(self.master.winfo_id())) # raise app window SetForegroundWindow(GetParent(self.master.winfo_id())) # raise app window
# Send back a WM_DDE_ACK. this is _required_ with WM_DDE_EXECUTE # Send back a WM_DDE_ACK. this is _required_ with WM_DDE_EXECUTE
PostMessage(msg.wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, 0x80, msg.lParam)) PostMessageW(msg.wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, 0x80, msg.lParam))
else: else:
# Send back a WM_DDE_ACK. this is _required_ with WM_DDE_EXECUTE # Send back a WM_DDE_ACK. this is _required_ with WM_DDE_EXECUTE
PostMessage(msg.wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, 0, msg.lParam)) PostMessageW(msg.wParam, WM_DDE_ACK, hwnd, PackDDElParam(WM_DDE_ACK, 0, msg.lParam))
elif msg.message == WM_DDE_TERMINATE: elif msg.message == WM_DDE_TERMINATE:
PostMessage(msg.wParam, WM_DDE_TERMINATE, hwnd, 0) PostMessageW(msg.wParam, WM_DDE_TERMINATE, hwnd, 0)
else: else:
TranslateMessage(byref(msg)) # "Translates virtual key messages into character messages" ??? TranslateMessage(byref(msg)) # "Translates virtual key messages into character messages" ???
DispatchMessage(byref(msg)) DispatchMessageW(byref(msg))
else: # Linux / Run from source else: # Linux / Run from source