backport bidi text_out to winxp

dk · Nov 3, 2015 · 11e0575 · 11e0575
1 parent 60fed55
commit 11e0575
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/include/win32/win32guts.h b/include/win32/win32guts.h
@@ -214,6 +214,7 @@ typedef struct _WinGuts
     HANDLE         socketThread;       // thread id
     Bool           socketPostSync;     // semaphore
     Bool           dont_xlate_message; // one-time stopper to TranslateMessage() call
+    WCHAR *      (*alloc_utf8_to_wchar_visual)(const char*,int,int*);
 } WinGuts, *PWinGuts;
 
 typedef struct _WindowData

diff --git a/win32/global.c b/win32/global.c
@@ -92,8 +92,14 @@ window_subsystem_init( char * error_buf)
    WNDCLASSW wc;
    HDC dc;
    HBITMAP hbm;
+   OSVERSIONINFO os = { sizeof( OSVERSIONINFO)};
 
    guts. version  = GetVersion();
+   GetVersionEx( &os);
+   guts. alloc_utf8_to_wchar_visual = 
+   	(( os.dwMajorVersion > 5) || (os.dwMajorVersion == 5 && os.dwMinorVersion > 1)) ?
+		alloc_utf8_to_wchar_visual :
+		alloc_utf8_to_wchar;
    guts. mainThreadId = GetCurrentThreadId();
    guts. errorMode = SetErrorMode( SEM_FAILCRITICALERRORS);
    guts. desktopWindow = GetDesktopWindow();

diff --git a/win32/gp.c b/win32/gp.c
@@ -907,7 +907,7 @@ apc_gp_text_out( Handle self, const char * text, int x, int y, int len, Bool utf
 
    if ( utf8) {
       int mb_len;
-      if ( !( text = ( char *) alloc_utf8_to_wchar_visual( text, len, &mb_len))) return false;
+      if ( !( text = ( char *) guts.alloc_utf8_to_wchar_visual( text, len, &mb_len))) return false;
       len = mb_len;
    }      
 
@@ -1577,7 +1577,7 @@ apc_gp_get_text_width( Handle self, const char* text, int len, Bool addOverhang,
    int ret;
    if ( utf8) {
       int mb_len;
-      if ( !( text = ( char *) alloc_utf8_to_wchar_visual( text, len, &mb_len))) return 0;
+      if ( !( text = ( char *) guts.alloc_utf8_to_wchar_visual( text, len, &mb_len))) return 0;
       len = mb_len;
    }      
    ret = gp_get_text_width( self, text, len, addOverhang, utf8);
@@ -1596,7 +1596,7 @@ apc_gp_get_text_box( Handle self, const char* text, int len, Bool utf8)
 
    if ( utf8) {
       int mb_len;
-      if ( !( text = ( char *) alloc_utf8_to_wchar_visual( text, len, &mb_len))) {
+      if ( !( text = ( char *) guts.alloc_utf8_to_wchar_visual( text, len, &mb_len))) {
          free( pt);
          return nil;
       }