diff --git a/sdk/include/psdk/ntgdi.h b/sdk/include/psdk/ntgdi.h
index 7c18f7e8449..d5d651020d4 100644
--- a/sdk/include/psdk/ntgdi.h
+++ b/sdk/include/psdk/ntgdi.h
@@ -2500,10 +2500,10 @@ NtGdiExtTextOutW(
     _In_ INT x,
     _In_ INT y,
     _In_ UINT flOpts,
-    _In_opt_ LPRECT prcl,
-    _In_reads_opt_(cwc) LPWSTR pwsz,
-    _In_range_(0, 0xffff) INT cwc,
-    _In_reads_opt_(_Inexpressible_(cwc)) LPINT pdx,
+    _In_opt_ LPCRECT prcl,
+    _In_reads_opt_(cwc) LPCWSTR pwsz,
+    _In_range_(0, 0xffff) UINT cwc,
+    _In_reads_opt_(_Inexpressible_(cwc)) const INT *pdx,
     _In_ DWORD dwCodePage);
 
 __kernel_entry
diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c
index 0f5ac46630e..9b3320c2ae9 100644
--- a/win32ss/gdi/gdi32/objects/text.c
+++ b/win32ss/gdi/gdi32/objects/text.c
@@ -70,7 +70,7 @@ TextOutW(
     _In_reads_(cchString) LPCWSTR lpString,
     _In_ INT cchString)
 {
-    return ExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL);
+    return ExtTextOutW(hdc, nXStart, nYStart, 0, NULL, lpString, cchString, NULL);
 }
 
 
@@ -647,10 +647,10 @@ ExtTextOutW(
                             x,
                             y,
                             fuOptions,
-                            (LPRECT)lprc,
-                            (LPWSTR)lpString,
+                            lprc,
+                            lpString,
                             cwc,
-                            (LPINT)lpDx,
+                            lpDx,
                             0);
 }
 
diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 6c6af75eaa1..4a98a6de7a5 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -7360,10 +7360,10 @@ NtGdiExtTextOutW(
     IN INT XStart,
     IN INT YStart,
     IN UINT fuOptions,
-    IN OPTIONAL LPRECT UnsafeRect,
-    IN LPWSTR UnsafeString,
-    IN INT Count,
-    IN OPTIONAL LPINT UnsafeDx,
+    IN OPTIONAL LPCRECT UnsafeRect,
+    IN LPCWSTR UnsafeString,
+    IN UINT Count,
+    IN OPTIONAL const INT *UnsafeDx,
     IN DWORD dwCodePage)
 {
     BOOL Result = FALSE;