Skip to content

Commit 81f5ea8

Browse files
Chaoses-IbChaoses-Ib
committed
Shorten the API prefix "IbAhkSend" to "IbSend"
1 parent 3d293b4 commit 81f5ea8

5 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎AhkDll.Ahk/v1/IbAhkSend.ahk‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ IbSendInit(send_type := "AnyDriver", mode := 1, args*){
1919
}
2020

2121
if (send_type == "AnyDriver")
22-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 0, "Int", 0, "Ptr", 0, "Int")
22+
result := DllCall("IbAhkSend\IbSendInit", "Int", 0, "Int", 0, "Ptr", 0, "Int")
2323
else if (send_type == "SendInput")
24-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 1, "Int", 0, "Ptr", 0, "Int")
24+
result := DllCall("IbAhkSend\IbSendInit", "Int", 1, "Int", 0, "Ptr", 0, "Int")
2525
else if (send_type == "Logitech")
26-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 2, "Int", 0, "Ptr", 0, "Int")
26+
result := DllCall("IbAhkSend\IbSendInit", "Int", 2, "Int", 0, "Ptr", 0, "Int")
2727
else if (send_type == "DD"){
2828
if (args.MaxIndex() == 1)
29-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 3, "Int", 0, "WStr", args[1], "Int")
29+
result := DllCall("IbAhkSend\IbSendInit", "Int", 3, "Int", 0, "WStr", args[1], "Int")
3030
else
31-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 3, "Int", 0, "Ptr", 0, "Int")
31+
result := DllCall("IbAhkSend\IbSendInit", "Int", 3, "Int", 0, "Ptr", 0, "Int")
3232
} else
3333
throw "Invalid send type"
3434

@@ -47,28 +47,28 @@ IbSendInit(send_type := "AnyDriver", mode := 1, args*){
4747
IbSendMode(mode){
4848
static ahk_mode := ""
4949
if (mode == 1){
50-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 1)
50+
DllCall("IbAhkSend\IbSendInputHook", "Int", 1)
5151
ahk_mode := A_SendMode
5252
SendMode Input
5353
} else if (mode == 0){
5454
SendMode %ahk_mode%
55-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 0)
55+
DllCall("IbAhkSend\IbSendInputHook", "Int", 0)
5656
} else {
5757
throw "Invalid send mode"
5858
}
5959
}
6060

6161
IbSendDestroy(){
62-
DllCall("IbAhkSend\IbAhkSendDestroy")
62+
DllCall("IbAhkSend\IbSendDestroy")
6363
;DllCall("FreeLibrary", "Ptr", hModule)
6464
}
6565

6666
IbSyncKeyStates(){
67-
DllCall("IbAhkSend\IbAhkSendSyncKeyStates")
67+
DllCall("IbAhkSend\IbSendSyncKeyStates")
6868
}
6969

7070
IbSend(keys){
71-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 1) ;or IbSendMode(1)
71+
DllCall("IbAhkSend\IbSendInputHook", "Int", 1) ;or IbSendMode(1)
7272
SendInput %keys%
73-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 0) ;or IbSendMode(0)
73+
DllCall("IbAhkSend\IbSendInputHook", "Int", 0) ;or IbSendMode(0)
7474
}

‎AhkDll.Ahk/v2/IbAhkSend.ahk‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ IbSendInit(send_type := "AnyDriver", mode := 1, args*){
1919
}
2020

2121
if (send_type == "AnyDriver")
22-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 0, "Int", 0, "Ptr", 0, "Int")
22+
result := DllCall("IbAhkSend\IbSendInit", "Int", 0, "Int", 0, "Ptr", 0, "Int")
2323
else if (send_type == "SendInput")
24-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 1, "Int", 0, "Ptr", 0, "Int")
24+
result := DllCall("IbAhkSend\IbSendInit", "Int", 1, "Int", 0, "Ptr", 0, "Int")
2525
else if (send_type == "Logitech")
26-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 2, "Int", 0, "Ptr", 0, "Int")
26+
result := DllCall("IbAhkSend\IbSendInit", "Int", 2, "Int", 0, "Ptr", 0, "Int")
2727
else if (send_type == "DD"){
2828
if (args.Length == 1)
29-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 3, "Int", 0, "WStr", args[1], "Int")
29+
result := DllCall("IbAhkSend\IbSendInit", "Int", 3, "Int", 0, "WStr", args[1], "Int")
3030
else
31-
result := DllCall("IbAhkSend\IbAhkSendInit", "Int", 3, "Int", 0, "Ptr", 0, "Int")
31+
result := DllCall("IbAhkSend\IbSendInit", "Int", 3, "Int", 0, "Ptr", 0, "Int")
3232
} else
3333
throw "Invalid send type"
3434

@@ -55,30 +55,30 @@ IbSendInit(send_type := "AnyDriver", mode := 1, args*){
5555
IbSendMode(mode){
5656
static ahk_mode := ""
5757
if (mode == 1){
58-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 1)
58+
DllCall("IbAhkSend\IbSendInputHook", "Int", 1)
5959
ahk_mode := A_SendMode
6060
SendMode("Input")
6161
} else if (mode == 0){
6262
SendMode(ahk_mode)
63-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 0)
63+
DllCall("IbAhkSend\IbSendInputHook", "Int", 0)
6464
} else {
6565
throw "Invalid send mode"
6666
}
6767
}
6868

6969
IbSendDestroy(){
70-
DllCall("IbAhkSend\IbAhkSendDestroy")
70+
DllCall("IbAhkSend\IbSendDestroy")
7171
;DllCall("FreeLibrary", "Ptr", hModule)
7272
}
7373

7474
IbSyncKeyStates(){
75-
DllCall("IbAhkSend\IbAhkSendSyncKeyStates")
75+
DllCall("IbAhkSend\IbSendSyncKeyStates")
7676
}
7777

7878
IbSend(keys){
79-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 1) ;or IbSendMode(1)
79+
DllCall("IbAhkSend\IbSendInputHook", "Int", 1) ;or IbSendMode(1)
8080
SendInput(keys)
81-
DllCall("IbAhkSend\IbAhkSendInputHook", "Int", 0) ;or IbSendMode(0)
81+
DllCall("IbAhkSend\IbSendInputHook", "Int", 0) ;or IbSendMode(0)
8282
}
8383

8484
IbClick(args*){

‎AhkDll.Test/AhkDll.Test.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ template <SendType TypeV>
3838
class InitTest {
3939
public:
4040
InitTest() {
41-
Send::Error error = IbAhkSendInit(TypeV, 0, nullptr);
41+
Send::Error error = IbSendInit(TypeV, 0, nullptr);
4242
BOOST_REQUIRE(error == Send::Error::Success);
4343
}
4444

4545
~InitTest() {
46-
IbAhkSendDestroy();
46+
IbSendDestroy();
4747
}
4848
};
4949

@@ -115,7 +115,7 @@ class KeyboardTest : public InitTest<TypeV>
115115

116116
capture = true;
117117
measure.begin();
118-
IbAhkSendInput(2, input, sizeof INPUT);
118+
IbSendInput(2, input, sizeof INPUT);
119119
uint64_t t1 = measure.end();
120120

121121
measure.begin();
@@ -161,11 +161,11 @@ class MouseTest : public InitTest<TypeV> {
161161
for (size_t i = 0; i < 10000 / 200; i++) {
162162
input.mi.dx = input.mi.dy = 1;
163163
for (size_t i = 0; i < 100; i++)
164-
IbAhkSendInput(1, &input, sizeof INPUT);
164+
IbSendInput(1, &input, sizeof INPUT);
165165

166166
input.mi.dx = input.mi.dy = -1;
167167
for (size_t i = 0; i < 100; i++)
168-
IbAhkSendInput(1, &input, sizeof INPUT);
168+
IbSendInput(1, &input, sizeof INPUT);
169169
}
170170
uint64_t t = measure.end();
171171

@@ -187,7 +187,7 @@ class MouseTest : public InitTest<TypeV> {
187187
input.mi = {};
188188
input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_MOVE_NOCOALESCE;
189189
input.mi.dx = input.mi.dy = 100;
190-
IbAhkSendInput(1, &input, sizeof INPUT);
190+
IbSendInput(1, &input, sizeof INPUT);
191191

192192
measure.begin();
193193
do {
@@ -212,7 +212,7 @@ class MouseTest : public InitTest<TypeV> {
212212
input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_MOVE_NOCOALESCE | MOUSEEVENTF_ABSOLUTE;
213213
input.mi.dx = 65536 * 100 / screen.x;
214214
input.mi.dy = 65536 * 100 / screen.y;
215-
IbAhkSendInput(1, &input, sizeof INPUT);
215+
IbSendInput(1, &input, sizeof INPUT);
216216

217217
POINT p1, p2;
218218
GetCursorPos(&p1);
@@ -234,7 +234,7 @@ class MouseTest : public InitTest<TypeV> {
234234
input.mi = {};
235235
input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_MOVE_NOCOALESCE;
236236
input.mi.dx = input.mi.dy = 100;
237-
IbAhkSendInput(1, &input, sizeof INPUT);
237+
IbSendInput(1, &input, sizeof INPUT);
238238

239239
GetCursorPos(&p2);
240240
d1 = { p2.x - p1.x, p2.y - p1.y };

‎AhkDll/IbAhkSend.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ namespace Send {
4040
};
4141
}
4242

43-
DLLAPI Send::Error __stdcall IbAhkSendInit(Send::SendType type, Send::InitFlags flags, void* argument);
44-
DLLAPI void __stdcall IbAhkSendDestroy();
45-
DLLAPI void __stdcall IbAhkSendSyncKeyStates();
46-
DLLAPI UINT WINAPI IbAhkSendInput(UINT cInputs, LPINPUT pInputs, int cbSize);
47-
DLLAPI void __stdcall IbAhkSendInputHook(Send::HookCode code);
43+
DLLAPI Send::Error __stdcall IbSendInit(Send::SendType type, Send::InitFlags flags, void* argument);
44+
DLLAPI void __stdcall IbSendDestroy();
45+
DLLAPI void __stdcall IbSendSyncKeyStates();
46+
DLLAPI UINT WINAPI IbSendInput(UINT cInputs, LPINPUT pInputs, int cbSize);
47+
DLLAPI void __stdcall IbSendInputHook(Send::HookCode code);

‎AhkDll/dllmain.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
1818
case DLL_THREAD_DETACH:
1919
break;
2020
case DLL_PROCESS_DETACH:
21-
IbAhkSendDestroy();
21+
IbSendDestroy();
2222
break;
2323
}
2424
return TRUE;
@@ -63,7 +63,7 @@ class SendInputHook {
6363
};
6464
ib::HolderB<SendInputHook> sendinput_hook;
6565

66-
DLLAPI void __stdcall IbAhkSendInputHook(HookCode code) {
66+
DLLAPI void __stdcall IbSendInputHook(HookCode code) {
6767
switch (code) {
6868
case HookCode::InitOnly:
6969
sendinput_hook.create();
@@ -83,12 +83,12 @@ DLLAPI void __stdcall IbAhkSendInputHook(HookCode code) {
8383
}
8484

8585

86-
DLLAPI Send::Error __stdcall IbAhkSendInit(SendType type, InitFlags flags, void* argument) {
86+
DLLAPI Send::Error __stdcall IbSendInit(SendType type, InitFlags flags, void* argument) {
8787
if (type == SendType::AnyDriver) {
88-
Error error = IbAhkSendInit(SendType::Logitech, flags, nullptr);
88+
Error error = IbSendInit(SendType::Logitech, flags, nullptr);
8989
if (error == Error::Success) return Error::Success;
9090

91-
error = IbAhkSendInit(SendType::DD, flags, nullptr);
91+
error = IbSendInit(SendType::DD, flags, nullptr);
9292
if (error == Error::Success) return Error::Success;
9393

9494
return Error::DeviceNotFound;
@@ -132,19 +132,19 @@ DLLAPI Send::Error __stdcall IbAhkSendInit(SendType type, InitFlags flags, void*
132132
}
133133
}
134134

135-
DLLAPI void __stdcall IbAhkSendDestroy() {
136-
IbAhkSendInputHook(HookCode::Destroy);
135+
DLLAPI void __stdcall IbSendDestroy() {
136+
IbSendInputHook(HookCode::Destroy);
137137

138138
if (!send)
139139
return;
140140
send->destroy();
141141
send.release();
142142
}
143143

144-
DLLAPI void __stdcall IbAhkSendSyncKeyStates() {
144+
DLLAPI void __stdcall IbSendSyncKeyStates() {
145145
send->sync_key_states();
146146
}
147147

148-
DLLAPI UINT WINAPI IbAhkSendInput(UINT cInputs, LPINPUT pInputs, int cbSize) {
148+
DLLAPI UINT WINAPI IbSendInput(UINT cInputs, LPINPUT pInputs, int cbSize) {
149149
return send->send_input(pInputs, cInputs);
150150
}

0 commit comments

Comments
 (0)