Merge github.com:FreeRDP/FreeRDP

mgariepy · Nov 17, 2012 · 598cfb3 · 598cfb3
2 parents 860f324 + b8dbfd4
commit 598cfb3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,8 +50,13 @@ include(GNUInstallDirsWrapper)
 set(FREERDP_VERSION_MAJOR "1")
 set(FREERDP_VERSION_MINOR "1")
 set(FREERDP_VERSION_REVISION "0")
+set(FREERDP_VERSION_SUFFIX "dev")
 set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}")
-set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}")
+if (FREERDP_VERSION_SUFFIX)
+	set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}-${FREERDP_VERSION_SUFFIX}")
+else()
+	set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}")
+endif()
 include(GetGitRevisionDescription)
 git_describe(GIT_REVISION --match "[0-9]*" --abbrev=4 --tags --always)
 message(STATUS "Git Revision ${GIT_REVISION}")

diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c
@@ -715,18 +715,19 @@ static int urb_control_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data,
 static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYTE* data,
 	UINT32 data_sizem, UINT32 MessageId, IUDEVMAN* udevman, UINT32 UsbDevice, int transferDir)
 {
-	IUDEVICE *	pdev;
-	UINT32		out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle;
-	UINT32		TransferFlags, OutputBufferSize, usbd_status = 0;
-	BYTE *		Buffer;
-	BYTE *		out_data;
-	int			offset;
+	int offset;
+	BYTE* Buffer;
+	IUDEVICE* pdev;
+	BYTE* out_data;
+	UINT32 out_size, RequestId, InterfaceId, EndpointAddress, PipeHandle;
+	UINT32 TransferFlags, OutputBufferSize, usbd_status = 0;
 
 	pdev = udevman->get_udevice_by_UsbDevice(udevman, UsbDevice);
+
 	if (pdev == NULL)
 		return 0;
 
-	InterfaceId = ((STREAM_ID_PROXY<<30) | pdev->get_ReqCompletion(pdev));
+	InterfaceId = ((STREAM_ID_PROXY << 30) | pdev->get_ReqCompletion(pdev));
 
 	data_read_UINT32(data + 0, RequestId);
 	data_read_UINT32(data + 4, PipeHandle);
@@ -740,18 +741,21 @@ static int urb_bulk_or_interrupt_transfer(URBDRC_CHANNEL_CALLBACK* callback, BYT
 	else
 		out_size = 36 + OutputBufferSize;
 
-	out_data = (BYTE *) malloc(out_size);
+	Buffer = NULL;
+	out_data = (BYTE*) malloc(out_size);
 	memset(out_data, 0, out_size);
 
 	switch (transferDir)
 	{
 		case USBD_TRANSFER_DIRECTION_OUT:
 			Buffer = data + offset;
 			break;
+
 		case USBD_TRANSFER_DIRECTION_IN:
 			Buffer = out_data + 36;
 			break;
 	}
+
 	/**  process URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER */
 	pdev->bulk_or_interrupt_transfer(
 		pdev, RequestId, EndpointAddress,

diff --git a/config.h.in b/config.h.in
@@ -1,11 +1,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define FREERDP_VERSION "${FREERDP_VERSION}"
-#define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}"
 #define FREERDP_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}
 #define FREERDP_VERSION_MINOR ${FREERDP_VERSION_MINOR}
 #define FREERDP_VERSION_REVISION ${FREERDP_VERSION_REVISION}
+#define FREERDP_VERSION_SUFFIX "${FREERDP_VERSION_SUFFIX}"
+#define FREERDP_VERSION "${FREERDP_VERSION}"
+#define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}"
 #define GIT_REVISION "${GIT_REVISION}"
 
 #define FREERDP_DATA_PATH "${FREERDP_DATA_PATH}"

diff --git a/include/freerdp/utils/msusb.h b/include/freerdp/utils/msusb.h
@@ -21,6 +21,7 @@
 #ifndef __MSCONFIG_H
 #define __MSCONFIG_H
 
+#include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/stream.h>