Skip to content

Commit 8aa0af4

Browse files
DistroHopper39BDistroHopper39B
authored
Merge branch 'reactos:master' into AppleTV-Desktop
2 parents 7f02717 + c336726 commit 8aa0af4

470 files changed

Lines changed: 12311 additions & 25066 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/labeler.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Win32SS:
4848
- changed-files:
4949
- any-glob-to-any-file:
5050
- base/ctf/**
51+
- base/system/conime/**
5152
- win32ss/user/imm32/**
5253
- win32ss/user/ntuser/ime.c
5354
- win32ss/user/user32/misc/imm.c

‎base/applications/kbswitch/kbswitch.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,14 @@
1111
#include <tchar.h>
1212
#include <strsafe.h>
1313
#include <ime/indicml.h> /* INDICATOR_CLASS, INDICM_... */
14+
#include <cjkcode.h> /* LANGID_... */
1415

1516
#include "resource.h"
1617
#include "indicdll/resource.h"
1718

1819
#define CCH_LAYOUT_ID 8 // Character Count of a layout ID like "00000409"
1920
#define CCH_ULONG_DEC 10 // Maximum Character Count of a ULONG in decimal
2021

21-
// Far East Language IDs
22-
#define LANGID_CHINESE_SIMPLIFIED MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED)
23-
#define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL)
24-
#define LANGID_JAPANESE MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT)
25-
#define LANGID_KOREAN MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT)
26-
2722
#define WM_LANG_CHANGED (WM_USER + 10200)
2823
#define WM_WINDOW_ACTIVATE (WM_USER + 10300)
2924

‎base/ctf/msctfime/msctfime.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Inquire(
103103

104104
switch (LOWORD(hKL)) // Language ID
105105
{
106-
case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese
106+
case LANGID_JAPANESE: // Japanese
107107
{
108108
lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI |
109109
IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY |
@@ -117,7 +117,7 @@ Inquire(
117117
lpIMEInfo->fdwUICaps = UI_CAP_ROT90;
118118
break;
119119
}
120-
case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean
120+
case LANGID_KOREAN: // Korean
121121
{
122122
lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI |
123123
IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY |
@@ -129,8 +129,8 @@ Inquire(
129129
lpIMEInfo->fdwUICaps = UI_CAP_ROT90;
130130
break;
131131
}
132-
case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Simplified Chinese
133-
case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Traditional Chinese
132+
case LANGID_CHINESE_SIMPLIFIED: // Simplified Chinese
133+
case LANGID_CHINESE_TRADITIONAL: // Traditional Chinese
134134
{
135135
lpIMEInfo->fdwProperty = IME_PROP_SPECIAL_UI | IME_PROP_AT_CARET |
136136
IME_PROP_NEED_ALTKEY | IME_PROP_KBD_CHAR_FIRST;

‎base/ctf/msctfime/msctfime.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <ctffunc.h>
2525
#include <shlwapi.h>
2626
#include <strsafe.h>
27+
#include <cjkcode.h>
2728

2829
#include <cicbase.h>
2930
#include <cicarray.h>

‎base/ctf/msutb/msutb.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ CicArray<HKL> *g_prghklSkipRedrawing = NULL;
103103

104104
BOOL IsSkipRedrawHKL(HKL hSkipKL)
105105
{
106-
if (LOWORD(hSkipKL) == MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT))
106+
if (LOWORD(hSkipKL) == LANGID_JAPANESE)
107107
return FALSE; // Japanese HKL will be skipped
108108
if (!g_prghklSkipRedrawing)
109109
return FALSE;
@@ -335,10 +335,10 @@ BOOL IsFELangId(LANGID LangID)
335335
{
336336
switch (LangID)
337337
{
338-
case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Chinese (Simplified)
339-
case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Chinese (Traditional)
340-
case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese
341-
case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean
338+
case LANGID_CHINESE_SIMPLIFIED: // Chinese (Simplified)
339+
case LANGID_CHINESE_TRADITIONAL: // Chinese (Traditional)
340+
case LANGID_JAPANESE: // Japanese
341+
case LANGID_KOREAN: // Korean
342342
return TRUE;
343343
default:
344344
return FALSE;

‎base/ctf/msutb/precomp.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <atlbase.h>
2626
#include <atlcom.h>
2727
#include <strsafe.h>
28+
#include <cjkcode.h>
2829

2930
#include "resource.h"
3031
#include <cicreg.h>

‎base/system/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
add_subdirectory(autochk)
33
add_subdirectory(bootok)
44
add_subdirectory(chkdsk)
5+
add_subdirectory(conime)
56
add_subdirectory(diskpart)
67
add_subdirectory(dllhost)
78
add_subdirectory(expand)

‎base/system/conime/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
add_executable(conime WIN32 conime.c conime.rc)
3+
set_module_type(conime win32gui UNICODE)
4+
target_link_libraries(conime wine ${PSEH_LIB})
5+
add_importlibs(conime imm32 advapi32 user32 gdi32 msvcrt kernel32 ntdll)
6+
add_cd_file(TARGET conime DESTINATION reactos/system32 FOR all)

0 commit comments

Comments
 (0)