gdi32: Use usp10 to optionally generate glyphs for bidi strings.

dlls/gdi32/font.c

@@ -1704,20 +1704,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
     {
         reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR));
 
-        BIDI_Reorder( str, count, GCP_REORDER,
+        BIDI_Reorder( hdc, str, count, GCP_REORDER,
                       ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)?
                       WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR,
-                      reordered_str, count, NULL );
+                      reordered_str, count, NULL, &glyphs );
     
         flags |= ETO_IGNORELANGUAGE;
+        if (glyphs)
+            flags |= ETO_GLYPH_INDEX;
     }
+    else if(flags & ETO_GLYPH_INDEX)
+        glyphs = reordered_str;
 
     TRACE("%p, %d, %d, %08x, %p, %s, %d, %p)\n", hdc, x, y, flags,
           lprect, debugstr_wn(str, count), count, lpDx);
 
-    if(flags & ETO_GLYPH_INDEX)
-        glyphs = reordered_str;
-
     if(lprect)
         TRACE("rect: %d,%d - %d,%d\n", lprect->left, lprect->top, lprect->right,
               lprect->bottom);
@@ -2872,8 +2873,8 @@ GetCharacterPlacementW(
 		}
 	} else
 	{
-            BIDI_Reorder( lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
-                          nSet, lpResults->lpOrder );
+            BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
+                          nSet, lpResults->lpOrder, NULL );
 	}
 
 	/* FIXME: Will use the placement chars */

dlls/gdi32/gdi_private.h

@@ -355,8 +355,8 @@ typedef struct tagBITMAPOBJ
 #define WINE_GCPW_DIR_MASK 3
 #define WINE_GCPW_LOOSE_MASK 2
 
-extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags,
-                          LPWSTR lpOutString, INT uCountOut, UINT *lpOrder ) DECLSPEC_HIDDEN;
+extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags,
+                          LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN;
 
 /* bitmap.c */
 extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;