Jacek Caban : gdi32: Use ntgdi name for GetTextCharsetInfo.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 387be3d9a380b82a1932ec9072651a8649b5ab8d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=387be3d9a380b82a1932ec907...

Author: Jacek Caban 
Date:   Tue Aug 10 07:37:47 2021 +0100

gdi32: Use ntgdi name for GetTextCharsetInfo.

Signed-off-by: Jacek Caban 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/gdi32/font.c            | 8 ++++----
 dlls/gdi32/gdi32.spec        | 2 +-
 dlls/gdi32/uniscribe/shape.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 2e49f19b461..7e087d68db3 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -4205,9 +4205,9 @@ static UINT get_text_charset_info(DC *dc, FONTSIGNATURE *fs, DWORD flags)
 }

/***********************************************************************
- *           GetTextCharsetInfo    (GDI32.@)
+ *           NtGdiGetTextCharsetInfo    (win32u.@)
  */
-UINT WINAPI GetTextCharsetInfo(HDC hdc, FONTSIGNATURE *fs, DWORD flags)
+UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags )
 {
     UINT ret = DEFAULT_CHARSET;
     DC *dc = get_dc_ptr(hdc);
@@ -6977,7 +6977,7 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc)

DWORD result=0;

-	GetTextCharsetInfo( hdc, &fontsig, 0 );
+	NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 );
    /* We detect each flag we return using a bitmask on the Codepage Bitfields */

if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 )
@@ -8083,7 +8083,7 @@ BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD
 UINT WINAPI GetTextCharset(HDC hdc)
 {
     /* MSDN docs say this is equivalent */
-    return GetTextCharsetInfo(hdc, NULL, 0);
+    return NtGdiGetTextCharsetInfo( hdc, NULL, 0 );
 }

/***********************************************************************
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 7ff32c58c26..6b8ed856ffa 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -345,7 +345,7 @@
 @ stdcall GetTextAlign(long)
 @ stdcall GetTextCharacterExtra(long)
 @ stdcall GetTextCharset(long)
-@ stdcall GetTextCharsetInfo(long ptr long)
+@ stdcall GetTextCharsetInfo(long ptr long) NtGdiGetTextCharsetInfo
 @ stdcall GetTextColor(long)
 @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr)
 @ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr)
diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c
index 843d670f1e9..d65476f67b4 100644
--- a/dlls/gdi32/uniscribe/shape.c
+++ b/dlls/gdi32/uniscribe/shape.c
@@ -23,7 +23,7 @@

#include "windef.h"
 #include "winbase.h"
-#include "wingdi.h"
+#include "ntgdi.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "usp10.h"
@@ -594,7 +594,7 @@ static OPENTYPE_TAG get_opentype_script(HDC hdc, const SCRIPT_ANALYSIS *psa,
     /*
      * fall back to the font charset
      */
-    charset = GetTextCharsetInfo(hdc, NULL, 0x0);
+    charset = NtGdiGetTextCharsetInfo(hdc, NULL, 0x0);
     switch (charset)
     {
         case ANSI_CHARSET: