libfreerdp-utils: rename internal members of STREAM to match new wStream

cunit/test_freerdp.c

@@ -69,7 +69,7 @@ void assert_stream(STREAM* s, BYTE* data, int length, const char* func, int line
 	int actual_length;
 	BYTE* actual_data;
 
-	actual_data = s->data;
+	actual_data = s->buffer;
 	actual_length = stream_get_length(s);
 
 	if (actual_length != length)

cunit/test_gcc.c

@@ -95,9 +95,9 @@ void test_gcc_write_conference_create_request(void)
 	STREAM* s;
 	STREAM user_data;
 
-	user_data.data = gcc_user_data;
-	user_data.size = sizeof(gcc_user_data);
-	user_data.p = user_data.data + user_data.size;
+	user_data.buffer = gcc_user_data;
+	user_data.capacity = sizeof(gcc_user_data);
+	user_data.pointer = user_data.buffer + user_data.capacity;
 
 	s = stream_new(sizeof(gcc_conference_create_request_expected));
 

cunit/test_license.c

@@ -319,8 +319,8 @@ void test_license(void)
 	memcpy(license->ClientRandom, client_random, sizeof(client_random));
 	memcpy(license->PremasterSecret, premaster_secret, sizeof(premaster_secret));
 
-	s->data = server_license_request;
-	s->p = s->data + LICENSE_PREAMBLE_LENGTH;
+	s->buffer = server_license_request;
+	s->pointer = s->buffer + LICENSE_PREAMBLE_LENGTH;
 	license_read_license_request_packet(license, s);
 
 #if 0
@@ -355,7 +355,7 @@ void test_license(void)
 	printf("\n");
 
 	printf("modulus:\n");
-	winpr_HexDump(license->certificate->cert_info.modulus.data,
+	winpr_HexDump(license->certificate->cert_info.modulus.buffer,
 			license->certificate->cert_info.modulus.length);
 	printf("\n");
 
@@ -364,13 +364,13 @@ void test_license(void)
 	printf("\n");
 
 	printf("encrypted premaster secret:\n");
-	winpr_HexDump(license->EncryptedPremasterSecret->data,
+	winpr_HexDump(license->EncryptedPremasterSecret->buffer,
 			license->EncryptedPremasterSecret->length);
 	printf("\n");
 #endif
 
-	s->data = server_platform_challenge;
-	s->p = s->data + LICENSE_PREAMBLE_LENGTH;
+	s->buffer = server_platform_challenge;
+	s->pointer = s->buffer + LICENSE_PREAMBLE_LENGTH;
 	license_read_platform_challenge_packet(license, s);
 }
 
@@ -432,24 +432,24 @@ void test_license_generate_keys(void)
 	license_generate_keys(license);
 	license_encrypt_premaster_secret(license);
 
-	s->data = license->MasterSecret;
-	s->p = s->data + sizeof(test_master_secret);
+	s->buffer = license->MasterSecret;
+	s->pointer = s->buffer + sizeof(test_master_secret);
 	ASSERT_STREAM(s, test_master_secret, sizeof(test_master_secret));
 
-	s->data = license->SessionKeyBlob;
-	s->p = s->data + sizeof(test_session_key_blob);
+	s->buffer = license->SessionKeyBlob;
+	s->pointer = s->buffer + sizeof(test_session_key_blob);
 	ASSERT_STREAM(s, test_session_key_blob, sizeof(test_session_key_blob));
 
-	s->data = license->MacSaltKey;
-	s->p = s->data + sizeof(test_mac_salt_key);
+	s->buffer = license->MacSaltKey;
+	s->pointer = s->buffer + sizeof(test_mac_salt_key);
 	ASSERT_STREAM(s, test_mac_salt_key, sizeof(test_mac_salt_key));
 
-	s->data = license->LicensingEncryptionKey;
-	s->p = s->data + sizeof(test_licensing_encryption_key);
+	s->buffer = license->LicensingEncryptionKey;
+	s->pointer = s->buffer + sizeof(test_licensing_encryption_key);
 	ASSERT_STREAM(s, test_licensing_encryption_key, sizeof(test_licensing_encryption_key));
 
-	s->data = license->EncryptedPremasterSecret->data;
-	s->p = s->data + sizeof(test_encrypted_premaster_secret);
+	s->buffer = license->EncryptedPremasterSecret->data;
+	s->pointer = s->buffer + sizeof(test_encrypted_premaster_secret);
 	ASSERT_STREAM(s, test_encrypted_premaster_secret, sizeof(test_encrypted_premaster_secret));
 }
 
@@ -463,8 +463,8 @@ void test_license_encrypt_premaster_secret(void)
 	memcpy(license->certificate->cert_info.Modulus, test_modulus, sizeof(test_modulus));
 	license->certificate->cert_info.ModulusLength = sizeof(test_modulus);
 
-	s->data = license->EncryptedPremasterSecret->data;
-	s->p = s->data + sizeof(test_encrypted_premaster_secret);
+	s->buffer = license->EncryptedPremasterSecret->data;
+	s->pointer = s->buffer + sizeof(test_encrypted_premaster_secret);
 	ASSERT_STREAM(s, test_encrypted_premaster_secret, sizeof(test_encrypted_premaster_secret));
 }
 
@@ -492,8 +492,8 @@ void test_license_decrypt_platform_challenge(void)
 
 	license_decrypt_platform_challenge(license);
 
-	s->data = license->PlatformChallenge->data;
-	s->p = s->data + sizeof(test_platform_challenge);
+	s->buffer = license->PlatformChallenge->data;
+	s->pointer = s->buffer + sizeof(test_platform_challenge);
 
 	ASSERT_STREAM(s, test_platform_challenge, sizeof(test_platform_challenge));
 }

cunit/test_mcs.c

@@ -103,8 +103,8 @@ void test_mcs_write_connect_initial(void)
 	mcs = mcs_new((rdpTransport*) NULL);
 
 	user_data = &_user_data;
-	user_data->data = gcc_CCrq;
-	user_data->p = user_data->data + sizeof(gcc_CCrq);
+	user_data->buffer = gcc_CCrq;
+	user_data->pointer = user_data->buffer + sizeof(gcc_CCrq);
 
 	s = stream_new(512);
 	mcs_write_connect_initial(s, mcs, user_data);

cunit/test_orders.c

@@ -77,7 +77,7 @@ void test_read_dstblt_order(void)
 	DSTBLT_ORDER dstblt;
 
 	s = &_s;
-	s->p = s->data = dstblt_order;
+	s->pointer = s->buffer = dstblt_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x0C;
@@ -102,7 +102,7 @@ void test_read_patblt_order(void)
 	PATBLT_ORDER patblt;
 
 	s = &_s;
-	s->p = s->data = patblt_order;
+	s->pointer = s->buffer = patblt_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x027F;
@@ -132,7 +132,7 @@ void test_read_scrblt_order(void)
 	SCRBLT_ORDER scrblt;
 
 	s = &_s;
-	s->p = s->data = scrblt_order;
+	s->pointer = s->buffer = scrblt_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x7D;
@@ -159,7 +159,7 @@ void test_read_opaque_rect_order(void)
 	OPAQUE_RECT_ORDER opaque_rect;
 
 	s = &_s;
-	s->p = s->data = opaque_rect_order;
+	s->pointer = s->buffer = opaque_rect_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x7C;
@@ -184,7 +184,7 @@ void test_read_draw_nine_grid_order(void)
 	DRAW_NINE_GRID_ORDER draw_nine_grid;
 
 	s = &_s;
-	s->p = s->data = draw_nine_grid_order;
+	s->pointer = s->buffer = draw_nine_grid_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x1C;
@@ -217,7 +217,7 @@ void test_read_multi_opaque_rect_order(void)
 	MULTI_OPAQUE_RECT_ORDER multi_opaque_rect;
 
 	s = &_s;
-	s->p = s->data = multi_opaque_rect_order;
+	s->pointer = s->buffer = multi_opaque_rect_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x01BF;
@@ -264,7 +264,7 @@ void test_read_line_to_order(void)
 	LINE_TO_ORDER line_to;
 
 	s = &_s;
-	s->p = s->data = line_to_order;
+	s->pointer = s->buffer = line_to_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x021E;
@@ -307,7 +307,7 @@ void test_read_polyline_order(void)
 	POLYLINE_ORDER polyline;
 
 	s = &_s;
-	s->p = s->data = polyline_order;
+	s->pointer = s->buffer = polyline_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x73;
@@ -375,7 +375,7 @@ void test_read_glyph_index_order(void)
 	GLYPH_INDEX_ORDER glyph_index;
 
 	s = &_s;
-	s->p = s->data = glyph_index_order_1;
+	s->pointer = s->buffer = glyph_index_order_1;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x200100;
@@ -389,7 +389,7 @@ void test_read_glyph_index_order(void)
 
 	CU_ASSERT(stream_get_length(s) == (sizeof(glyph_index_order_1) - 1));
 
-	s->p = s->data = glyph_index_order_2;
+	s->pointer = s->buffer = glyph_index_order_2;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x383FE8;
@@ -426,7 +426,7 @@ void test_read_fast_index_order(void)
 	FAST_INDEX_ORDER fast_index;
 
 	s = &_s;
-	s->p = s->data = fast_index_order;
+	s->pointer = s->buffer = fast_index_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x70FF;
@@ -464,7 +464,7 @@ void test_read_fast_glyph_order(void)
 	FAST_GLYPH_ORDER fast_glyph;
 
 	s = &_s;
-	s->p = s->data = fast_glyph_order;
+	s->pointer = s->buffer = fast_glyph_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x7EFB;
@@ -499,7 +499,7 @@ void test_read_polygon_cb_order(void)
 	POLYGON_CB_ORDER polygon_cb;
 
 	s = &_s;
-	s->p = s->data = polygon_cb_order;
+	s->pointer = s->buffer = polygon_cb_order;
 
 	memset(orderInfo, 0, sizeof(ORDER_INFO));
 	orderInfo->fieldFlags = 0x1BEF;
@@ -533,7 +533,7 @@ void test_read_cache_bitmap_order(void)
 
 	s = &_s;
 	extraFlags = 0x0400;
-	s->p = s->data = cache_bitmap_order;
+	s->pointer = s->buffer = cache_bitmap_order;
 
 	memset(&cache_bitmap, 0, sizeof(CACHE_BITMAP_ORDER));
 
@@ -574,7 +574,7 @@ void test_read_cache_bitmap_v2_order(void)
 
 	s = &_s;
 	extraFlags = 0x0CA1;
-	s->p = s->data = cache_bitmap_v2_order;
+	s->pointer = s->buffer = cache_bitmap_v2_order;
 
 	memset(&cache_bitmap_v2, 0, sizeof(CACHE_BITMAP_V2_ORDER));
 
@@ -605,7 +605,7 @@ void test_read_cache_bitmap_v3_order(void)
 
 	s = &_s;
 	extraFlags = 0x0C30;
-	s->p = s->data = cache_bitmap_v3_order;
+	s->pointer = s->buffer = cache_bitmap_v3_order;
 
 	memset(&cache_bitmap_v3, 0, sizeof(CACHE_BITMAP_V3_ORDER));
 
@@ -633,7 +633,7 @@ void test_read_cache_brush_order(void)
 	CACHE_BRUSH_ORDER cache_brush;
 
 	s = &_s;
-	s->p = s->data = cache_brush_order;
+	s->pointer = s->buffer = cache_brush_order;
 
 	memset(&cache_brush, 0, sizeof(CACHE_BRUSH_ORDER));
 
@@ -658,7 +658,7 @@ void test_read_create_offscreen_bitmap_order(void)
 	CREATE_OFFSCREEN_BITMAP_ORDER create_offscreen_bitmap;
 
 	s = &_s;
-	s->p = s->data = create_offscreen_bitmap_order;
+	s->pointer = s->buffer = create_offscreen_bitmap_order;
 
 	memset(&create_offscreen_bitmap, 0, sizeof(CREATE_OFFSCREEN_BITMAP_ORDER));
 
@@ -685,7 +685,7 @@ void test_read_switch_surface_order(void)
 	SWITCH_SURFACE_ORDER switch_surface;
 
 	s = &_s;
-	s->p = s->data = switch_surface_order;
+	s->pointer = s->buffer = switch_surface_order;
 
 	memset(&switch_surface, 0, sizeof(SWITCH_SURFACE_ORDER));
 
@@ -751,8 +751,8 @@ void test_update_recv_orders(void)
 	update->primary->Polyline = test_polyline;
 	update->primary->PatBlt = test_patblt;
 
-	s->p = s->data = orders_update_1;
-	s->size = sizeof(orders_update_1);
+	s->pointer = s->buffer = orders_update_1;
+	s->capacity = sizeof(orders_update_1);
 
 	CU_ASSERT(update_recv(update, s));
 
@@ -760,8 +760,8 @@ void test_update_recv_orders(void)
 	CU_ASSERT(polyline_count == 2);
 
 	update->primary->order_info.orderType = ORDER_TYPE_PATBLT;
-	s->p = s->data = orders_update_2;
-	s->size = sizeof(orders_update_2);
+	s->pointer = s->buffer = orders_update_2;
+	s->capacity = sizeof(orders_update_2);
 
 	CU_ASSERT(update_recv(update, s));
 

cunit/test_rail.c

@@ -523,10 +523,10 @@ static void save_dump(void* data, size_t size)
 	if (p->in_streams_number < ARRAYSIZE(p->in_streams))
 	{
 		STREAM* s = &p->in_streams[p->in_streams_number];
-		s->data = malloc(size);
-		s->size = size;
+		s->buffer = malloc(size);
+		s->capacity = size;
 
-		memcpy(s->data, data, size);
+		memcpy(s->buffer, data, size);
 		p->in_streams_number++;
 	}
 }

cunit/test_rfx.c

@@ -401,7 +401,7 @@ void test_message(void)
 		stream_seal(s);
 		/*hexdump(buffer, size);*/
 		stream_set_pos(s, 0);
-		message = rfx_process_message(context, s->p, s->size);
+		message = rfx_process_message(context, s->pointer, s->capacity);
 		if (i == 0)
 		{
 			for (j = 0; j < message->num_tiles; j++)