Skip to content

Commit 3660920

Browse files
authored
[GDI32][NTGDI][SDK] ExtTextOut: Fix some type problems (reactos#7856)
JIRA issue: CORE-19898 - Modify NtGdiExtTextOutW prototype. - Add const to some paramters. - Make Count parameter unsigned. - Delete needless type casts.
1 parent 7afcd2a commit 3660920

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

sdk/include/psdk/ntgdi.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,10 +2500,10 @@ NtGdiExtTextOutW(
25002500
_In_ INT x,
25012501
_In_ INT y,
25022502
_In_ UINT flOpts,
2503-
_In_opt_ LPRECT prcl,
2504-
_In_reads_opt_(cwc) LPWSTR pwsz,
2505-
_In_range_(0, 0xffff) INT cwc,
2506-
_In_reads_opt_(_Inexpressible_(cwc)) LPINT pdx,
2503+
_In_opt_ LPCRECT prcl,
2504+
_In_reads_opt_(cwc) LPCWSTR pwsz,
2505+
_In_range_(0, 0xffff) UINT cwc,
2506+
_In_reads_opt_(_Inexpressible_(cwc)) const INT *pdx,
25072507
_In_ DWORD dwCodePage);
25082508

25092509
__kernel_entry

win32ss/gdi/gdi32/objects/text.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ TextOutW(
7070
_In_reads_(cchString) LPCWSTR lpString,
7171
_In_ INT cchString)
7272
{
73-
return ExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL);
73+
return ExtTextOutW(hdc, nXStart, nYStart, 0, NULL, lpString, cchString, NULL);
7474
}
7575

7676

@@ -647,10 +647,10 @@ ExtTextOutW(
647647
x,
648648
y,
649649
fuOptions,
650-
(LPRECT)lprc,
651-
(LPWSTR)lpString,
650+
lprc,
651+
lpString,
652652
cwc,
653-
(LPINT)lpDx,
653+
lpDx,
654654
0);
655655
}
656656

win32ss/gdi/ntgdi/freetype.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7360,10 +7360,10 @@ NtGdiExtTextOutW(
73607360
IN INT XStart,
73617361
IN INT YStart,
73627362
IN UINT fuOptions,
7363-
IN OPTIONAL LPRECT UnsafeRect,
7364-
IN LPWSTR UnsafeString,
7365-
IN INT Count,
7366-
IN OPTIONAL LPINT UnsafeDx,
7363+
IN OPTIONAL LPCRECT UnsafeRect,
7364+
IN LPCWSTR UnsafeString,
7365+
IN UINT Count,
7366+
IN OPTIONAL const INT *UnsafeDx,
73677367
IN DWORD dwCodePage)
73687368
{
73697369
BOOL Result = FALSE;

0 commit comments

Comments
 (0)