dfreerdp: fix compilation

diff --git a/client/DirectFB/dfreerdp.h b/client/DirectFB/dfreerdp.h
index 78f8cae..7ec48ee 100644 (file)
--- a/client/DirectFB/dfreerdp.h
+++ b/client/DirectFB/dfreerdp.h
@@ -28,11 +28,11 @@
 #include <freerdp/chanman/chanman.h>
 #include <freerdp/gdi/gdi.h>
 
-#define SET_DFI(_instance, _dfi) (_instance)->param1 = _dfi
-#define GET_DFI(_instance) ((dfInfo*) ((_instance)->param1))
+#define SET_DFI(_instance, _dfi) (_instance)->client = _dfi
+#define GET_DFI(_instance) ((dfInfo*) ((_instance)->client))
 
-#define SET_CHANMAN(_instance, _chanman) (_instance)->param2 = _chanman
-#define GET_CHANMAN(_instance) ((rdpChanMan*) ((_instance)->param2))
+#define SET_CHANMAN(_instance, _chanman) (_instance)->chanman = _chanman
+#define GET_CHANMAN(_instance) ((rdpChanMan*) ((_instance)->chanman))
 
 struct df_info
 {

diff --git a/cunit/test_libgdi.c b/cunit/test_libgdi.c
index 2a33381..fb9d351 100644 (file)
--- a/cunit/test_libgdi.c
+++ b/cunit/test_libgdi.c
@@ -2869,6 +2869,9 @@ void test_gdi_InvalidateRegion(void)
        hdc->hwnd->invalid->null = 1;
        invalid = hdc->hwnd->invalid;
        
+       hdc->hwnd->count = 16;
+       hdc->hwnd->cinvalid = (HGDI_RGN) malloc(sizeof(GDI_RGN) * hdc->hwnd->count);
+
        rgn1 = gdi_CreateRectRgn(0, 0, 0, 0);
        rgn2 = gdi_CreateRectRgn(0, 0, 0, 0);
        rgn1->null = 1;

diff --git a/cunit/test_orders.c b/cunit/test_orders.c
index 44566fc..b6d13c1 100644 (file)
--- a/cunit/test_orders.c
+++ b/cunit/test_orders.c
@@ -611,11 +611,11 @@ void test_read_cache_bitmap_v2_order(void)
        update_read_cache_bitmap_v2_order(s, &cache_bitmap_v2, True, extraFlags);
 
        CU_ASSERT(cache_bitmap_v2.cacheId == 1);
-       CU_ASSERT(cache_bitmap_v2.bitmap_data->bpp == 16);
+       CU_ASSERT(cache_bitmap_v2.bitmap->bpp == 16);
        CU_ASSERT(cache_bitmap_v2.flags == 0x19);
-       CU_ASSERT(cache_bitmap_v2.bitmap_data->width == 32);
-       CU_ASSERT(cache_bitmap_v2.bitmap_data->height == 32);
-       CU_ASSERT(cache_bitmap_v2.bitmap_data->length == 220);
+       CU_ASSERT(cache_bitmap_v2.bitmap->width == 32);
+       CU_ASSERT(cache_bitmap_v2.bitmap->height == 32);
+       CU_ASSERT(cache_bitmap_v2.bitmap->length == 220);
        CU_ASSERT(cache_bitmap_v2.cacheIndex == 32767);
 
        CU_ASSERT(stream_get_length(s) == (sizeof(cache_bitmap_v2_order) - 1));