Skip to content

Commit 6dd0406

Browse files
authored
[KBSWITCH] Rename kbsdll.dll as indicdll.dll (reactos#8087)
Splitted from reactos#8080. We have confirmed usage of the name of "indicdll.dll" in user32.dll, in reactos#8080. So, we have to rename kbsdll.dll as "indicdll.dll". JIRA issue: CORE-20142
1 parent 21d02b8 commit 6dd0406

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

base/applications/kbswitch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ target_link_libraries(kbswitch wine)
66
add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32 ntdll)
77
add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
88

9-
add_subdirectory(kbsdll)
9+
add_subdirectory(indicdll)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
spec2def(indicdll.dll indicdll.spec)
3+
4+
list(APPEND SOURCE
5+
indicdll.c
6+
indicdll.rc
7+
${CMAKE_CURRENT_BINARY_DIR}/indicdll.def)
8+
9+
add_library(indicdll MODULE ${SOURCE})
10+
set_module_type(indicdll win32dll UNICODE)
11+
add_importlibs(indicdll user32 comctl32 msvcrt kernel32)
12+
add_cd_file(TARGET indicdll DESTINATION reactos/system32 FOR all)
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define REACTOS_VERSION_DLL
22
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Keyboard Layout Switcher"
3-
#define REACTOS_STR_INTERNAL_NAME "kbsdll"
4-
#define REACTOS_STR_ORIGINAL_FILENAME "kbsdll.dll"
3+
#define REACTOS_STR_INTERNAL_NAME "indicdll"
4+
#define REACTOS_STR_ORIGINAL_FILENAME "indicdll.dll"
55
#include <reactos/version.rc>
File renamed without changes.

base/applications/kbswitch/kbsdll/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

base/applications/kbswitch/kbswitch.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(internat);
2323
* process boundary, so we cannot activate the IME keyboard layout from the outer process.
2424
* It needs special care.
2525
*
26-
* We use global hook by our kbsdll.dll, to watch the shell and the windows.
26+
* We use global hook by our indicdll.dll, to watch the shell and the windows.
2727
*
2828
* It might not work correctly on Vista+ because keyboard layout change notification
2929
* won't be generated in Vista+.
@@ -549,7 +549,7 @@ BuildLeftPopupMenu(VOID)
549549
static BOOL
550550
SetHooks(VOID)
551551
{
552-
g_hHookDLL = LoadLibrary(_T("kbsdll.dll"));
552+
g_hHookDLL = LoadLibrary(_T("indicdll.dll"));
553553
if (!g_hHookDLL)
554554
{
555555
return FALSE;
@@ -832,10 +832,10 @@ WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
832832
KbSwitch_OnTimer(hwnd, (UINT_PTR)wParam);
833833
break;
834834

835-
case WM_LANG_CHANGED: /* Comes from kbsdll.dll and this module */
835+
case WM_LANG_CHANGED: /* Comes from indicdll.dll and this module */
836836
return KbSwitch_OnLangChanged(hwnd, (HWND)wParam, (HKL)lParam);
837837

838-
case WM_WINDOW_ACTIVATE: /* Comes from kbsdll.dll and this module */
838+
case WM_WINDOW_ACTIVATE: /* Comes from indicdll.dll and this module */
839839
return KbSwitch_OnWindowActivate(hwnd, (HWND)wParam, lParam);
840840

841841
case WM_NOTIFYICONMSG:

0 commit comments

Comments
 (0)