libfreerdp-utils: purge old STREAM utils

channels/audin/client/audin_main.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "audin_main.h"
 

channels/audin/server/audin.c

@@ -29,7 +29,7 @@
 
 #include <freerdp/codec/dsp.h>
 #include <freerdp/utils/thread.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/server/audin.h>
 

channels/cliprdr/client/cliprdr_main.h

@@ -21,8 +21,9 @@
 #ifndef __CLIPRDR_MAIN_H
 #define __CLIPRDR_MAIN_H
 
+#include <winpr/stream.h>
+
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 
 struct _CLIPRDR_FORMAT_NAME
 {

channels/drdynvc/client/drdynvc_main.c

@@ -28,7 +28,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
 #include "dvcman.h"

channels/drdynvc/client/dvcman.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/list.h>
 
 #include "drdynvc_types.h"

channels/drive/client/drive_file.c

@@ -41,7 +41,7 @@
 #include <winpr/crt.h>
 #include <winpr/file.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/utils/svc_plugin.h>
 

channels/drive/client/drive_main.c

@@ -41,7 +41,7 @@
 #include <winpr/interlocked.h>
 
 #include <freerdp/utils/list.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/utils/svc_plugin.h>
 

channels/echo/client/echo_main.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "echo_main.h"
 

channels/parallel/client/parallel_main.c

@@ -52,7 +52,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/channels/rdpdr.h>
 

channels/printer/client/printer_main.c

@@ -30,7 +30,7 @@
 #include <winpr/thread.h>
 #include <winpr/interlocked.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/thread.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/channels/rdpdr.h>

channels/rail/client/rail_main.h

@@ -25,9 +25,10 @@
 #include <freerdp/rail.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
+#include <winpr/stream.h>
+
 struct rdp_rail_order
 {
 	rdpSettings* settings;

channels/rdpdr/client/devman.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/client/channels.h>

channels/rdpdr/client/irp.c

@@ -28,7 +28,7 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
 #include "rdpdr_main.h"

channels/rdpdr/client/rdpdr_capabilities.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
 #include "rdpdr_main.h"

channels/rdpdr/client/rdpdr_main.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/utils/svc_plugin.h>
 

channels/rdpei/client/rdpei_main.c

@@ -30,7 +30,7 @@
 
 #include <freerdp/addin.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "rdpei_main.h"
 

channels/rdpsnd/client/rdpsnd_main.c

@@ -41,7 +41,7 @@
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/signal.h>
 #include <freerdp/utils/svc_plugin.h>
 

channels/rdpsnd/server/rdpsnd.c

@@ -31,7 +31,7 @@
 #include <winpr/thread.h>
 
 #include <freerdp/codec/dsp.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/server/rdpsnd.h>
 

channels/sample/client/sample_main.c

@@ -34,7 +34,7 @@
 
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/svc_plugin.h>
 

channels/serial/client/serial_main.c

@@ -50,7 +50,7 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/list.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/channels/rdpdr.h>
 
 typedef struct _SERIAL_DEVICE SERIAL_DEVICE;

channels/serial/client/serial_tty.c

@@ -29,7 +29,7 @@
 #include <winpr/crt.h>
 #include <winpr/print.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/thread.h>
 #include <freerdp/utils/svc_plugin.h>

channels/serial/client/serial_tty.h

@@ -29,7 +29,8 @@
 #endif
 
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _SERIAL_TTY SERIAL_TTY;
 

channels/server/channels.h

@@ -22,12 +22,12 @@
 #define __WTSVC_H
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/debug.h>
 #include <freerdp/channels/wtsvc.h>
 
 #include <winpr/synch.h>
+#include <winpr/stream.h>
 
 #ifdef WITH_DEBUG_DVC
 #define DEBUG_DVC(fmt, ...) DEBUG_CLASS(DVC, fmt, ## __VA_ARGS__)

channels/smartcard/client/smartcard_operations.c

@@ -41,7 +41,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/utils/thread.h>
 #include <freerdp/channels/rdpdr.h>

channels/tsmf/client/tsmf_codec.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <winpr/print.h>
 
 #include "tsmf_constants.h"

channels/tsmf/client/tsmf_ifman.c

@@ -28,7 +28,7 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "tsmf_types.h"
 #include "tsmf_constants.h"

channels/tsmf/client/tsmf_main.c

@@ -28,7 +28,7 @@
 #include <winpr/crt.h>
 #include <winpr/cmdline.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "tsmf_types.h"
 #include "tsmf_constants.h"

channels/tsmf/client/tsmf_media.c

@@ -40,7 +40,7 @@
 #include <winpr/thread.h>
 #include <winpr/collections.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/utils/list.h>
 #include <freerdp/utils/event.h>
 #include <freerdp/client/tsmf.h>
@@ -53,6 +53,8 @@
 #include "tsmf_codec.h"
 #include "tsmf_media.h"
 
+#include <pthread.h>
+
 #define AUDIO_TOLERANCE 10000000LL
 
 struct _TSMF_PRESENTATION
@@ -879,7 +881,7 @@ void tsmf_presentation_set_audio_device(TSMF_PRESENTATION* presentation, const c
 
 static void tsmf_stream_flush(TSMF_STREAM* stream)
 {
-	TSMF_SAMPLE* sample;
+	//TSMF_SAMPLE* sample;
 
 	/* TODO: free lists */
 

channels/urbdrc/client/urbdrc_types.h

@@ -28,13 +28,14 @@
 #include <freerdp/dvc.h>
 #include <freerdp/types.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/utils/msusb.h>
 
 #include <uuid/uuid.h>
 #include <pthread.h>
 #include <semaphore.h>
 
+#include <winpr/stream.h>
+
 #ifdef WITH_DEBUG_DVC
 #define DEBUG_DVC(fmt, ...) DEBUG_CLASS(DVC, fmt, ## __VA_ARGS__)
 #else

client/Windows/wf_cliprdr.c

@@ -24,7 +24,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/event.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/client/cliprdr.h>
 
 #include "wf_cliprdr.h"

client/X11/xf_cliprdr.c

@@ -28,7 +28,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/utils/event.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/client/cliprdr.h>
 
 #include "xf_cliprdr.h"

cunit/test_bitmap.c

@@ -19,7 +19,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/codec/bitmap.h>
 
 #include "test_bitmap.h"

cunit/test_freerdp.h

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <CUnit/CUnit.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
 #include <winpr/print.h>
+#include <winpr/stream.h>
 
 #define add_test_suite(name) \
 	CU_pSuite pSuite; \

cunit/test_gcc.c

@@ -21,7 +21,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "test_gcc.h"
 

cunit/test_license.c

@@ -21,7 +21,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "test_license.h"
 

cunit/test_mcs.c

@@ -21,7 +21,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "test_mcs.h"
 

cunit/test_orders.c

@@ -19,7 +19,7 @@
 
 #include <freerdp/freerdp.h>
 #include <winpr/print.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "test_orders.h"
 #include "libfreerdp/core/orders.h"

include/freerdp/cache/bitmap.h

@@ -24,7 +24,8 @@
 #include <freerdp/types.h>
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _BITMAP_V2_CELL BITMAP_V2_CELL;
 typedef struct rdp_bitmap_cache rdpBitmapCache;

include/freerdp/cache/brush.h

@@ -24,7 +24,8 @@
 #include <freerdp/types.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _BRUSH_ENTRY BRUSH_ENTRY;
 typedef struct rdp_brush_cache rdpBrushCache;

include/freerdp/cache/cache.h

@@ -23,7 +23,8 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #include <freerdp/cache/glyph.h>
 #include <freerdp/cache/brush.h>

include/freerdp/cache/glyph.h

@@ -23,7 +23,8 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _GLYPH_CACHE GLYPH_CACHE;
 typedef struct _FRAGMENT_CACHE_ENTRY FRAGMENT_CACHE_ENTRY;

include/freerdp/cache/nine_grid.h

@@ -24,7 +24,8 @@
 #include <freerdp/types.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _NINE_GRID_ENTRY NINE_GRID_ENTRY;
 typedef struct rdp_nine_grid_cache rdpNineGridCache;

include/freerdp/cache/offscreen.h

@@ -24,7 +24,8 @@
 #include <freerdp/types.h>
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_offscreen_cache rdpOffscreenCache;
 

include/freerdp/cache/palette.h

@@ -24,7 +24,8 @@
 #include <freerdp/types.h>
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct _PALETTE_TABLE_ENTRY PALETTE_TABLE_ENTRY;
 typedef struct rdp_palette_cache rdpPaletteCache;

include/freerdp/cache/pointer.h

@@ -25,7 +25,8 @@
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/graphics.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_pointer_cache rdpPointerCache;
 

include/freerdp/channels/rdpdr.h

@@ -25,10 +25,10 @@
 #include <winpr/file.h>
 #include <winpr/synch.h>
 #include <winpr/thread.h>
+#include <winpr/stream.h>
 #include <winpr/interlocked.h>
 
 #include <freerdp/utils/list.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/utils/svc_plugin.h>
 
 /* RDPDR_HEADER.Component */

include/freerdp/codec/nsc.h

@@ -24,7 +24,8 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #ifdef __cplusplus
 extern "C" {

include/freerdp/codec/rfx.h

@@ -23,7 +23,8 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #ifdef __cplusplus
 extern "C" {

include/freerdp/crypto/ber.h

@@ -22,7 +22,8 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* BER type */
 

include/freerdp/crypto/certificate.h

@@ -28,8 +28,9 @@ typedef struct rdp_certificate_store rdpCertificateStore;
 
 #include <freerdp/api.h>
 #include <freerdp/settings.h>
-#include <freerdp/utils/stream.h>
+
 #include <winpr/print.h>
+#include <winpr/stream.h>
 
 struct rdp_certificate_data
 {

include/freerdp/crypto/er.h

@@ -23,7 +23,9 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+
+#include <winpr/stream.h>
 
 /* ER type */
 

include/freerdp/crypto/per.h

@@ -21,7 +21,8 @@
 #define FREERDP_CRYPTO_PER_H
 
 #include <freerdp/api.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 FREERDP_API BOOL per_read_length(wStream* s, UINT16* length);
 FREERDP_API void per_write_length(wStream* s, int length);

include/freerdp/crypto/tls.h

@@ -31,7 +31,8 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_tls rdpTls;
 

include/freerdp/freerdp.h

@@ -36,7 +36,8 @@ typedef struct rdp_freerdp_peer freerdp_peer;
 #include <freerdp/error.h>
 #include <freerdp/settings.h>
 #include <freerdp/extension.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #include <freerdp/input.h>
 #include <freerdp/update.h>

include/freerdp/rail/icon.h

@@ -24,7 +24,8 @@
 #include <freerdp/rail.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_icon rdpIcon;
 typedef struct rdp_icon_cache rdpIconCache;

include/freerdp/rail/rail.h

@@ -25,9 +25,10 @@
 #include <freerdp/types.h>
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/codec/color.h>
 
+#include <winpr/stream.h>
+
 #include <freerdp/rail/icon.h>
 #include <freerdp/rail/window.h>
 #include <freerdp/rail/window_list.h>

include/freerdp/rail/window.h

@@ -24,7 +24,8 @@
 #include <freerdp/rail.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_window rdpWindow;
 

include/freerdp/rail/window_list.h

@@ -23,7 +23,8 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_window_list rdpWindowList;
 

include/freerdp/update.h

@@ -25,6 +25,7 @@ typedef struct rdp_update rdpUpdate;
 #include <winpr/crt.h>
 #include <winpr/synch.h>
 #include <winpr/thread.h>
+#include <winpr/stream.h>
 #include <winpr/collections.h>
 
 #include <freerdp/rail.h>
@@ -32,7 +33,6 @@ typedef struct rdp_update rdpUpdate;
 #include <freerdp/freerdp.h>
 #include <freerdp/graphics.h>
 #include <freerdp/utils/pcap.h>
-#include <freerdp/utils/stream.h>
 
 #include <freerdp/primary.h>
 #include <freerdp/secondary.h>

include/freerdp/utils/msusb.h

@@ -24,7 +24,7 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 /* a safer free helper */
 #define zfree(p) do { if (p != NULL) {free(p); p = NULL;} } while (0)

include/freerdp/utils/rail.h

@@ -22,7 +22,8 @@
 
 #include <freerdp/api.h>
 #include <freerdp/rail.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #ifdef __cplusplus
 extern "C" {

include/freerdp/utils/stream.h

@@ -1,32 +0,0 @@
-/**
- * FreeRDP: A Remote Desktop Protocol Implementation
- * Stream Utils
- *
- * Copyright 2009-2011 Jay Sorg
- * Copyright 2011 Vic Lee
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *	 http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FREERDP_UTILS_STREAM_H
-#define FREERDP_UTILS_STREAM_H
-
-#include <string.h>
-
-#include <freerdp/api.h>
-#include <freerdp/types.h>
-
-#include <winpr/stream.h>
-
-#endif /* FREERDP_UTILS_STREAM_H */
-

include/freerdp/utils/string.h

@@ -22,7 +22,8 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 struct rdp_string
 {

include/freerdp/utils/svc_plugin.h

@@ -30,11 +30,11 @@
 #include <winpr/crt.h>
 #include <winpr/synch.h>
 #include <winpr/thread.h>
+#include <winpr/stream.h>
 #include <winpr/collections.h>
 
 #include <freerdp/utils/debug.h>
 #include <freerdp/utils/event.h>
-#include <freerdp/utils/stream.h>
 
 typedef struct rdp_svc_plugin rdpSvcPlugin;
 

libfreerdp/cache/bitmap.c

@@ -27,7 +27,7 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/bitmap.h>
 

libfreerdp/cache/brush.c

@@ -27,7 +27,7 @@
 
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/brush.h>
 

libfreerdp/cache/cache.c

@@ -23,7 +23,7 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/cache.h>
 

libfreerdp/cache/glyph.c

@@ -26,7 +26,7 @@
 #include <winpr/crt.h>
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/glyph.h>
 

libfreerdp/cache/nine_grid.c

@@ -27,7 +27,7 @@
 
 #include <freerdp/update.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/nine_grid.h>
 

libfreerdp/cache/offscreen.c

@@ -25,7 +25,7 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/offscreen.h>
 

libfreerdp/cache/pointer.c

@@ -25,7 +25,7 @@
 
 #include <winpr/crt.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/cache/pointer.h>
 

libfreerdp/codec/bitmap.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/codec/color.h>
 
 #include <freerdp/codec/bitmap.h>

libfreerdp/codec/jpeg.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <freerdp/codec/color.h>
 

libfreerdp/codec/rfx_decode.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 #include <freerdp/primitives.h>
 
 #include "rfx_types.h"

libfreerdp/core/capabilities.h

@@ -25,7 +25,8 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/constants.h>
 #include <freerdp/settings.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Capability Set Types */
 #define CAPSET_TYPE_GENERAL			0x0001

libfreerdp/core/certificate.h

@@ -26,8 +26,9 @@
 #include <freerdp/crypto/crypto.h>
 
 #include <freerdp/settings.h>
-#include <freerdp/utils/stream.h>
+
 #include <winpr/print.h>
+#include <winpr/stream.h>
 
 /* Certificate Version */
 #define CERT_CHAIN_VERSION_1		0x00000001

libfreerdp/core/channel.c

@@ -28,7 +28,7 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/peer.h>
 #include <freerdp/constants.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "rdp.h"
 #include "channel.h"

libfreerdp/core/fastpath.c

@@ -29,7 +29,7 @@
 
 #include <freerdp/api.h>
 #include <freerdp/crypto/per.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "orders.h"
 #include "update.h"

libfreerdp/core/fastpath.h

@@ -21,7 +21,8 @@
 #define __FASTPATH_H
 
 #include "rdp.h"
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 typedef struct rdp_fastpath rdpFastPath;
 

libfreerdp/core/gateway/ncacn_http.h

@@ -27,7 +27,8 @@
 #include <freerdp/crypto/crypto.h>
 
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #include "rpc.h"
 

libfreerdp/core/gateway/ntlm.h

@@ -38,8 +38,10 @@ typedef struct rdp_ntlm_http rdpNtlmHttp;
 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/crypto.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/sspi.h>
 #include <winpr/print.h>
+#include <winpr/stream.h>
 
 struct rdp_ntlm
 {

libfreerdp/core/gateway/rpc.h

@@ -77,7 +77,6 @@ typedef struct _RPC_PDU
 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/crypto.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 #include <winpr/print.h>
 
 /**

libfreerdp/core/gcc.h

@@ -21,11 +21,13 @@
 #define FREERDP_CORE_GCC_H
 
 #include "mcs.h"
+
 #include <freerdp/crypto/per.h>
 
 #include <freerdp/freerdp.h>
 #include <freerdp/settings.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 BOOL gcc_read_conference_create_request(wStream* s, rdpSettings* settings);
 void gcc_write_conference_create_request(wStream* s, wStream* user_data);

libfreerdp/core/info.h

@@ -23,7 +23,8 @@
 #include "rdp.h"
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Client Address Family */
 #define ADDRESS_FAMILY_INET		0x0002

libfreerdp/core/input.h

@@ -26,7 +26,8 @@
 
 #include <freerdp/input.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Input Events */
 #define INPUT_EVENT_SYNC		0x0000

libfreerdp/core/license.h

@@ -23,12 +23,14 @@
 typedef struct rdp_license rdpLicense;
 
 #include "rdp.h"
+
 #include <freerdp/crypto/crypto.h>
 #include <freerdp/crypto/certificate.h>
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Licensing Packet Types */
 

libfreerdp/core/mcs.h

@@ -21,10 +21,12 @@
 #define __MCS_H
 
 #include "transport.h"
+
 #include <freerdp/crypto/ber.h>
 
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #define MCS_BASE_CHANNEL_ID	1001
 #define MCS_GLOBAL_CHANNEL_ID	1003

libfreerdp/core/nego.h

@@ -21,10 +21,12 @@
 #define FREERDP_CORE_NEGO_H
 
 #include "transport.h"
+
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Protocol Security Negotiation Protocols */
 enum RDP_NEG_PROTOCOLS

libfreerdp/core/nla.h

@@ -24,9 +24,9 @@ typedef struct rdp_credssp rdpCredssp;
 
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
 
 #include <winpr/sspi.h>
+#include <winpr/stream.h>
 
 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/ber.h>

libfreerdp/core/orders.h

@@ -21,9 +21,11 @@
 #define __ORDERS_H
 
 #include "rdp.h"
+
 #include <freerdp/types.h>
 #include <freerdp/update.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 /* Order Control Flags */
 #define ORDER_STANDARD				0x01

libfreerdp/core/rdp.h

@@ -44,10 +44,11 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/codec/mppc_dec.h>
 #include <freerdp/codec/mppc_enc.h>
 
+#include <winpr/stream.h>
+
 /* Security Header Flags */
 #define SEC_EXCHANGE_PKT					0x0001
 #define SEC_ENCRYPT						0x0008

libfreerdp/core/redirection.h

@@ -24,9 +24,10 @@
 
 #include <freerdp/freerdp.h>
 #include <freerdp/utils/debug.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/utils/string.h>
 
+#include <winpr/stream.h>
+
 struct rdp_redirection
 {
 	UINT32 flags;

libfreerdp/core/security.h

@@ -24,7 +24,8 @@
 #include <freerdp/crypto/crypto.h>
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 void security_master_secret(const BYTE* premaster_secret, const BYTE* client_random, const BYTE* server_random, BYTE* output);
 void security_session_key_blob(const BYTE* master_secret, const BYTE* client_random, const BYTE* server_random, BYTE* output);

libfreerdp/core/surface.h

@@ -21,7 +21,8 @@
 #define __SURFACE
 
 #include "rdp.h"
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #define SURFCMD_SURFACE_BITS_HEADER_LENGTH 22
 #define SURFCMD_FRAME_MARKER_LENGTH 8

libfreerdp/core/tcp.c

@@ -53,7 +53,7 @@
 
 #include <freerdp/utils/tcp.h>
 #include <freerdp/utils/uds.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include "tcp.h"
 

libfreerdp/core/tcp.h

@@ -25,7 +25,8 @@
 
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
-#include <freerdp/utils/stream.h>
+
+#include <winpr/stream.h>
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0

libfreerdp/core/timezone.h

@@ -27,9 +27,10 @@
 #endif
 
 #include <freerdp/freerdp.h>
-#include <freerdp/utils/stream.h>
 #include <freerdp/locale/timezone.h>
 
+#include <winpr/stream.h>
+
 void rdp_read_system_time(wStream* s, SYSTEM_TIME* system_time);
 void rdp_write_system_time(wStream* s, SYSTEM_TIME* system_time);
 void rdp_get_client_time_zone(wStream* s, rdpSettings* settings);

libfreerdp/core/tpdu.h

@@ -20,7 +20,7 @@
 #ifndef __TPDU_H
 #define __TPDU_H
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 enum X224_TPDU_TYPE
 {

libfreerdp/core/tpkt.h

@@ -23,7 +23,7 @@
 #include "tpdu.h"
 #include "transport.h"
 
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #define TPKT_HEADER_LENGTH	4
 

libfreerdp/core/transport.c

@@ -31,7 +31,7 @@
 
 #include <freerdp/error.h>
 #include <freerdp/utils/tcp.h>
-#include <freerdp/utils/stream.h>
+#include <winpr/stream.h>
 
 #include <time.h>
 #include <errno.h>