Skip to content

Commit 67a4cf9

Browse files
authored
[NTUSER] ime.c: Add SAL2 annotations and tracing (reactos#8070)
Refactoring and improving trace. JIRA issue: CORE-19455 - Add SAL2 annotations to function parameters. - Add and improve tracing (TRACE and ERR) for easier debugging.
1 parent 0947a64 commit 67a4cf9

File tree

5 files changed

+277
-151
lines changed

5 files changed

+277
-151
lines changed

win32ss/include/ntuser.h

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,11 +1244,18 @@ typedef struct _IMEWND
12441244

12451245
DWORD
12461246
NTAPI
1247-
NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags);
1247+
NtUserAssociateInputContext(
1248+
_In_ HWND hWnd,
1249+
_In_opt_ HIMC hIMC,
1250+
_In_ DWORD dwFlags);
12481251

12491252
NTSTATUS
12501253
NTAPI
1251-
NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount);
1254+
NtUserBuildHimcList(
1255+
_In_ DWORD dwThreadId,
1256+
_In_ DWORD dwCount,
1257+
_Out_ HIMC *phList,
1258+
_Out_ PDWORD pdwCount);
12521259

12531260
DWORD
12541261
NTAPI
@@ -1768,8 +1775,8 @@ NtUserCheckWindowThreadDesktop(
17681775
DWORD
17691776
NTAPI
17701777
NtUserCheckImeHotKey(
1771-
UINT uVirtualKey,
1772-
LPARAM lParam);
1778+
_In_ UINT uVirtualKey,
1779+
_In_ LPARAM lParam);
17731780

17741781
HWND NTAPI
17751782
NtUserChildWindowFromPointEx(
@@ -1861,7 +1868,7 @@ NtUserCreateDesktop(
18611868

18621869
HIMC
18631870
NTAPI
1864-
NtUserCreateInputContext(ULONG_PTR dwClientImcData);
1871+
NtUserCreateInputContext(_In_ ULONG_PTR dwClientImcData);
18651872

18661873
NTSTATUS
18671874
NTAPI
@@ -1955,7 +1962,7 @@ NtUserDestroyCursor(
19551962

19561963
BOOL
19571964
NTAPI
1958-
NtUserDestroyInputContext(HIMC hIMC);
1965+
NtUserDestroyInputContext(_In_ HIMC hIMC);
19591966

19601967
BOOLEAN
19611968
NTAPI
@@ -1965,7 +1972,7 @@ NtUserDestroyWindow(
19651972
BOOL
19661973
NTAPI
19671974
NtUserDisableThreadIme(
1968-
DWORD dwThreadID);
1975+
_In_ DWORD dwThreadID);
19691976

19701977
LRESULT
19711978
NTAPI
@@ -2148,7 +2155,7 @@ NtUserGetAncestor(
21482155

21492156
DWORD
21502157
NTAPI
2151-
NtUserGetAppImeLevel(HWND hWnd);
2158+
NtUserGetAppImeLevel(_In_ HWND hWnd);
21522159

21532160
SHORT
21542161
NTAPI
@@ -2312,16 +2319,17 @@ NtUserGetIconSize(
23122319

23132320
BOOL
23142321
NTAPI
2315-
NtUserGetImeHotKey(DWORD dwHotKeyId,
2316-
LPUINT lpuModifiers,
2317-
LPUINT lpuVirtualKey,
2318-
LPHKL lphKL);
2322+
NtUserGetImeHotKey(
2323+
_In_ DWORD dwHotKeyId,
2324+
_Out_ PUINT lpuModifiers,
2325+
_Out_ PUINT lpuVirtualKey,
2326+
_Out_ LPHKL lphKL);
23192327

23202328
BOOL
23212329
NTAPI
23222330
NtUserGetImeInfoEx(
2323-
PIMEINFOEX pImeInfoEx,
2324-
IMEINFOEXCLASS SearchType);
2331+
_Inout_ PIMEINFOEX pImeInfoEx,
2332+
_In_ IMEINFOEXCLASS SearchType);
23252333

23262334
DWORD
23272335
NTAPI
@@ -2703,7 +2711,10 @@ NtUserMoveWindow(
27032711

27042712
DWORD
27052713
NTAPI
2706-
NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion);
2714+
NtUserNotifyIMEStatus(
2715+
_In_ HWND hwnd,
2716+
_In_ BOOL fOpen,
2717+
_In_ DWORD dwConversion);
27072718

27082719
BOOL
27092720
NTAPI
@@ -3120,20 +3131,20 @@ NtUserSetFocus(
31203131
BOOL
31213132
NTAPI
31223133
NtUserSetImeHotKey(
3123-
DWORD dwHotKeyId,
3124-
UINT uModifiers,
3125-
UINT uVirtualKey,
3126-
HKL hKL,
3127-
DWORD dwAction);
3134+
_In_ DWORD dwHotKeyId,
3135+
_In_ UINT uModifiers,
3136+
_In_ UINT uVirtualKey,
3137+
_In_ HKL hKL,
3138+
_In_ DWORD dwAction);
31283139

31293140
BOOL
31303141
NTAPI
31313142
NtUserSetImeInfoEx(
3132-
PIMEINFOEX pImeInfoEx);
3143+
_In_ const IMEINFOEX *pImeInfoEx);
31333144

31343145
BOOL
31353146
NTAPI
3136-
NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus);
3147+
NtUserSetImeOwnerWindow(_In_ HWND hImeWnd, _In_opt_ HWND hwndFocus);
31373148

31383149
DWORD
31393150
NTAPI
@@ -3257,7 +3268,9 @@ NtUserSetSystemTimer(
32573268

32583269
DWORD
32593270
NTAPI
3260-
NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL);
3271+
NtUserSetThreadLayoutHandles(
3272+
_In_ HKL hNewKL,
3273+
_In_ HKL hOldKL);
32613274

32623275
UINT_PTR
32633276
NTAPI

0 commit comments

Comments
 (0)