Osirium glyph cache modifications

Author: veryhappythings

common/xrdp_constants.h

@@ -256,6 +256,9 @@
 #define RDP_CAPSET_BRUSHCACHE          15
 #define RDP_CAPLEN_BRUSHCACHE          0x08
 
+#define RDP_CAPSET_GLYPHCACHE          16
+#define RDP_CAPLEN_GLYPHCACHE          0x34
+
 #define RDP_CAPSET_BITMAP_OFFSCREEN    18
 #define RDP_CAPLEN_BITMAP_OFFSCREEN    0x08
 

neutrinordp/xrdp-neutrinordp.c

@@ -991,15 +991,13 @@ lfreerdp_cache_glyph(rdpContext *context, CACHE_GLYPH_ORDER *cache_glyph_order)
 
     for (index = 0; index < cache_glyph_order->cGlyphs; index++)
     {
-        gd = cache_glyph_order->glyphData[index];
-        LLOGLN(10, ("  %d %d %d %d %d", gd->cacheIndex, gd->x, gd->y,
+        gd = &cache_glyph_order->glyphData[index];
+        LLOGLN(10, ("Index %d TL:%d,%d WH:%d,%d", gd->cacheIndex, gd->x, gd->y,
                     gd->cx, gd->cy));
         mod->server_add_char(mod, cache_glyph_order->cacheId, gd->cacheIndex,
                              gd->x, gd->y, gd->cx, gd->cy, (char *)(gd->aj));
         free(gd->aj);
         gd->aj = 0;
-        free(gd);
-        cache_glyph_order->glyphData[index] = 0;
     }
 
     free(cache_glyph_order->unicodeCharacters);
@@ -1065,9 +1063,6 @@ lfreerdp_cache_brush(rdpContext *context, CACHE_BRUSH_ORDER *cache_brush_order)
     LLOGLN(10, ("lfreerdp_cache_brush: out bpp %d cx %d cy %d idx %d bytes %d",
                 bpp, cx, cy, idx, bytes));
 
-    free(cache_brush_order->data);
-    cache_brush_order->data = 0;
-
 }
 
 /******************************************************************************/
@@ -1401,8 +1396,8 @@ lfreerdp_pre_connect(freerdp *instance)
 
     instance->settings->glyph_cache = true;
     /* GLYPH_SUPPORT_FULL and GLYPH_SUPPORT_PARTIAL seem to be the same */
-    instance->settings->glyphSupportLevel = GLYPH_SUPPORT_FULL;
-    instance->settings->order_support[NEG_GLYPH_INDEX_INDEX] = 1;
+    instance->settings->glyphSupportLevel = GLYPH_SUPPORT_NONE;
+    instance->settings->order_support[NEG_GLYPH_INDEX_INDEX] = 0;
     instance->settings->order_support[NEG_FAST_GLYPH_INDEX] = 0;
     instance->settings->order_support[NEG_FAST_INDEX_INDEX] = 0;
     instance->settings->order_support[NEG_SCRBLT_INDEX] = 1;