September 2021 - Wine-Commits

Hans Leidekker : secur32: Don't allocate new handles in the wrapper.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: ddf8c92721d230a880ae2171224e1785e6f29817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf8c92721d230a880ae2171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 14:13:10 2021 +0200 secur32: Don't allocate new handles in the wrapper. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 292 +++++++++---------------------------------------- 1 file changed, 52 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddf8c92721d230a880ae…

1 0

Hans Leidekker : secur32: Store LSA package and handle in the credential/context handle's dwLower field.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 54c3cc0819494ba1305066ffb93b7fffe5d24064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c3cc0819494ba1305066ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 14:13:09 2021 +0200 secur32: Store LSA package and handle in the credential/context handle's dwLower field. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 207 ++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c3cc0819494ba13050…

1 0

Jacek Caban : gdi32: Use single get_cptable implementation.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 9c9f2294867a3e1f40b8fdfb2ec87ab42ee3e077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c9f2294867a3e1f40b8fdfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:09:28 2021 +0200 gdi32: Use single get_cptable implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0a2a39d3da8..5864eb88498 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3208,7 +3208,7 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) return index; } -static CPTABLEINFO *get_cptable( WORD cp ) +CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; unsigned int i; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a3679d854a4..2a67fa76062 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -730,21 +730,6 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_AZERI,SUBLANG_AZERI_LATIN), /* TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT */ }; -static CPTABLEINFO *get_cptable( WORD cp ) -{ - static CPTABLEINFO tables[100]; - unsigned int i; - USHORT *ptr; - SIZE_T size; - - for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) - if (tables[i].CodePage == cp) return &tables[i]; - if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; - if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); - RtlInitCodePageTable( ptr, &tables[i] ); - return &tables[i]; -} - static CPTABLEINFO *get_mac_code_page( const FT_SfntName *name ) { int id = name->encoding_id; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index e2211ad80eb..1b55b5ad458 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -334,6 +334,7 @@ extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, const struct bitmap_font_size *size ) DECLSPEC_HIDDEN; extern UINT font_init(void) DECLSPEC_HIDDEN; extern UINT get_acp(void) DECLSPEC_HIDDEN; +extern CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN; extern const struct font_backend_funcs *init_freetype_lib(void) DECLSPEC_HIDDEN; /* opentype.c */

1 0

Jacek Caban : gdi32: Use NtGdiOpenDCW for CreateDCW.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 09362dbf75e4e5654774de95bea33b364fdc8f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09362dbf75e4e5654774de95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:36 2021 +0200 gdi32: Use NtGdiOpenDCW for CreateDCW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 62 ++++++------- dlls/gdi32/driver.c | 188 ++++----------------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09362dbf75e4e5654774…

1 0

Jacek Caban : gdi32: Get codepages and OS version directly from PEB.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: bdebdbafe95cc495e6afd7282b411cab3c42888e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdebdbafe95cc495e6afd728… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:19 2021 +0200 gdi32: Get codepages and OS version directly from PEB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 115de908cf6..9436a91a43f 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -435,7 +435,7 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) { NtGdiCombineRgn( hRgn, dc->hVisRgn, 0, RGN_COPY ); /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ - if (!(GetVersion() & 0x80000000)) + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32s) NtGdiOffsetRgn( hRgn, dc->attr->vis_rect.left, dc->attr->vis_rect.top ); } else if (!is_rect_empty( &dc->device_rect )) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index dc0ad84242b..305bc087b18 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -202,6 +202,16 @@ static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } +UINT get_acp(void) +{ + return ((const WORD *)NtCurrentTeb()->Peb->AnsiCodePageData)[1]; +} + +static UINT get_oemcp(void) +{ + return ((const WORD *)NtCurrentTeb()->Peb->OemCodePageData)[1]; +} + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -272,7 +282,7 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) static inline BOOL is_win9x(void) { - return GetVersion() & 0x80000000; + return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } static inline WCHAR *strdupW( const WCHAR *p ) @@ -1864,7 +1874,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO corresponding to the current ansi codepage */ if (!csi->fs.fsCsb[0]) { - INT acp = GetACP(); + INT acp = get_acp(); if (!translate_charset_info( (DWORD *)(INT_PTR)acp, csi, TCI_SRCCODEPAGE )) { FIXME( "TCI failed on codepage %d\n", acp ); @@ -2464,7 +2474,7 @@ static void create_child_font_list( struct gdi_font *font ) * if not SYMBOL or OEM then we also get all the fonts for Microsoft * Sans Serif. This is how asian windows get default fallbacks for fonts */ - if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && + if (is_dbcs_ansi_cp(get_acp()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && facename_compare( font_name, microsoft_sans_serifW, -1 ) != 0) { if ((font_link = find_gdi_font_link( microsoft_sans_serifW ))) @@ -2725,8 +2735,8 @@ static void update_codepage( UINT screen_dpi ) if (size == sizeof(DWORD) && info->Type == REG_DWORD) font_dpi = *(DWORD *)info->Data; - ansi_cp = GetACP(); - oem_cp = GetOEMCP(); + ansi_cp = get_acp(); + oem_cp = get_oemcp(); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); asciiz_to_unicode( cpbufW, cpbuf ); @@ -2897,7 +2907,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset *list) } else /* charset is DEFAULT_CHARSET or invalid. */ { - int acp = GetACP(); + int acp = get_acp(); DWORD mask = 0; /* Set the current codepage's charset as the first element. */ @@ -3884,7 +3894,7 @@ static void get_nearest_charset( const WCHAR *family_name, struct gdi_font_face int i; - if (translate_charset_info( (DWORD*)(INT_PTR)GetACP(), csi, TCI_SRCCODEPAGE )) + if (translate_charset_info( (DWORD*)(INT_PTR)get_acp(), csi, TCI_SRCCODEPAGE )) { const struct gdi_font_link *font_link; @@ -3904,7 +3914,7 @@ static void get_nearest_charset( const WCHAR *family_name, struct gdi_font_face FIXME("returning DEFAULT_CHARSET face->fs.fsCsb[0] = %08x file = %s\n", face->fs.fsCsb[0], debugstr_w(face->file)); - csi->ciACP = GetACP(); + csi->ciACP = get_acp(); csi->ciCharset = DEFAULT_CHARSET; } @@ -4497,10 +4507,10 @@ static void update_font_code_page( DC *dc, HANDLE font ) else { switch(charset) { case OEM_CHARSET: - dc->attr->font_code_page = GetOEMCP(); + dc->attr->font_code_page = get_oemcp(); break; case DEFAULT_CHARSET: - dc->attr->font_code_page = GetACP(); + dc->attr->font_code_page = get_acp(); break; case VISCII_CHARSET: diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 62bd2c4bd59..c0912c3ad2d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -497,7 +497,7 @@ static UINT get_default_charset( void ) CHARSETINFO csi; UINT uACP; - uACP = GetACP(); + uACP = get_acp(); csi.ciCharset = ANSI_CHARSET; if ( !translate_charset_info( ULongToPtr(uACP), &csi, TCI_SRCCODEPAGE ) ) { diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 9f0f1d44240..c342bcf3a7c 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -339,6 +339,7 @@ struct font_callback_funcs }; extern UINT font_init(void) DECLSPEC_HIDDEN; +extern UINT get_acp(void) DECLSPEC_HIDDEN; /* opentype.c */

1 0

Rémi Bernon : include: Add HID Physical Interface Device usage page.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: b3630bddb591b71c4aa2d390fa944331aeb34550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3630bddb591b71c4aa2d390… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:53 2021 +0200 include: Add HID Physical Interface Device usage page. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00)

1 0

Jacek Caban : gdi32: Move ntgdi functions to Unix library.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 6857cb56957d691bee76cfe28ef88714cca00f29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6857cb56957d691bee76cfe2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:09:21 2021 +0200 gdi32: Move ntgdi functions to Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 4 + dlls/gdi32/bitmap.c | 4 + dlls/gdi32/brush.c | 6 +- dlls/gdi32/clipping.c | 4 + dlls/gdi32/dc.c | 6 +- dlls/gdi32/dib.c | 4 + dlls/gdi32/dibdrv/bitblt.c | 4 + dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 4 + dlls/gdi32/dibdrv/objects.c | 4 + dlls/gdi32/dibdrv/opengl.c | 11 +- dlls/gdi32/dibdrv/primitives.c | 4 + dlls/gdi32/driver.c | 14 +- dlls/gdi32/emfdrv.c | 6 +- dlls/gdi32/font.c | 20 +- dlls/gdi32/freetype.c | 28 +- dlls/gdi32/gdi_private.h | 12 +- dlls/gdi32/gdiobj.c | 237 +++++++++- dlls/gdi32/mapping.c | 4 + dlls/gdi32/ntgdi_private.h | 19 +- dlls/gdi32/objects.c | 18 + dlls/gdi32/painting.c | 4 + dlls/gdi32/palette.c | 4 + dlls/gdi32/path.c | 4 + dlls/gdi32/pen.c | 4 + dlls/gdi32/printdrv.c | 4 + dlls/gdi32/region.c | 4 + dlls/gdi32/vertical.c | 4 + dlls/gdi32/vulkan.c | 4 + dlls/gdi32/win32u_private.h | 273 +++++++++++ dlls/gdi32/wrappers.c | 1018 +++++++++++++++++++++++++++++++++++++++- tools/make_unicode | 14 +- 33 files changed, 1667 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6857cb56957d691bee76…

1 0

Jacek Caban : gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: ca7998faff3e88dc9451413be3351da4b861d5a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca7998faff3e88dc9451413b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:08:14 2021 +0200 gdi32: Avoid using CRT wide char functions in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index cafd06b03f1..8bc40b37abf 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -38,4 +38,94 @@ struct user_callbacks HWND (WINAPI *pWindowFromDC)( HDC ); }; +static inline WCHAR *win32u_wcsrchr( const WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; +} + +static inline WCHAR win32u_towupper( WCHAR ch ) +{ + return RtlUpcaseUnicodeChar( ch ); +} + +static inline WCHAR *win32u_wcschr( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; +} + +static inline int win32u_wcsicmp( const WCHAR *str1, const WCHAR *str2 ) +{ + int ret; + for (;;) + { + if ((ret = win32u_towupper( *str1 ) - win32u_towupper( *str2 )) || !*str1) return ret; + str1++; + str2++; + } +} + +static inline int win32u_wcscmp( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (*s == ' ' || *s == '\t') s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + +#define towupper(c) win32u_towupper(c) +#define wcschr(s,c) win32u_wcschr(s,c) +#define wcscmp(s1,s2) win32u_wcscmp(s1,s2) +#define wcsicmp(s1,s2) win32u_wcsicmp(s1,s2) +#define wcsrchr(s,c) win32u_wcsrchr(s,c) +#define wcstol(s,e,b) win32u_wcstol(s,e,b) + #endif /* __WINE_WIN32U_PRIVATE */

1 0

Jacek Caban : gdi32: Don't use WideCharToMultiByte in font.c.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 8ebd516f9b9ec15d2c4c54c83b784426ac24e05b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ebd516f9b9ec15d2c4c54c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:45 2021 +0200 gdi32: Don't use WideCharToMultiByte in font.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3cf8c03b7b8..d8f5ceb7c5c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3204,11 +3204,52 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) return index; } +static CPTABLEINFO *get_cptable( WORD cp ) +{ + static CPTABLEINFO tables[100]; + unsigned int i; + USHORT *ptr; + SIZE_T size; + + for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) + if (tables[i].CodePage == cp) return &tables[i]; + if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; + if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); + RtlInitCodePageTable( ptr, &tables[i] ); + return &tables[i]; +} + +static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) +{ + const CPTABLEINFO *info; + + if (!(info = get_cptable( cp ))) return FALSE; + + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + if (uni2cp[wc] & 0xff00) return FALSE; + *dst = uni2cp[wc]; + } + else + { + char *uni2cp = info->WideCharTable; + *dst = uni2cp[wc]; + } + + if (info->MultiByteTable[*dst] != wc) + { + if (!allow_default) return FALSE; + *dst = info->DefaultChar; + } + + return TRUE; +} + static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) { WCHAR wc = glyph; - char ch; - BOOL used; + unsigned char ch; if (font_funcs->get_glyph_index( font, &glyph, TRUE )) return glyph; @@ -3217,11 +3258,11 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = get_glyph_index_symbol( font, wc ); if (!glyph) { - if (WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, NULL )) + if (wc_to_index( CP_ACP, wc, &ch, TRUE )) glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } } - else if (WideCharToMultiByte( font->codepage, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, &used ) && !used) + else if (wc_to_index( font->codepage, wc, &ch, FALSE )) { glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); @@ -3505,8 +3546,8 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun { struct font_physdev *physdev = get_font_dev( dev ); UINT default_char; - char ch; - BOOL used, got_default = FALSE; + unsigned char ch; + BOOL got_default = FALSE; int i; if (!physdev->font) @@ -3535,8 +3576,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, - &ch, 1, NULL, &used ) && !used) + else if (wc_to_index( physdev->font->codepage, str[i], &ch, FALSE )) glyph = (unsigned char)ch; } if (!glyph)

1 0

Jacek Caban : gdi32: Remove unused argument from CreateDC driver entry point.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 6342e9217d79656dc1937144dc00b4443c047b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6342e9217d79656dc1937144… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:26 2021 +0200 gdi32: Remove unused argument from CreateDC driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/dibdrv/dc.c | 12 ++++++------ dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/path.c | 8 ++++---- dlls/wineandroid.drv/init.c | 4 ++-- dlls/winemac.drv/gdi.c | 9 ++++----- dlls/wineps.drv/init.c | 7 +++---- dlls/winex11.drv/init.c | 6 +++--- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6342e9217d79656dc193…

1 0