Merge branch 'master' of github.com:FreeRDP/FreeRDP

CMakeLists.txt

@@ -612,3 +612,30 @@ endif()
 #message("VENDOR: ${VENDOR} CLIENT_VENDOR_PATH: ${CLIENT_VENDOR_PATH} CMAKE_CPACK_INCLUDE_FILE: ${CMAKE_CPACK_INCLUDE_FILE}")
 
 include(${CMAKE_CPACK_INCLUDE_FILE})
+
+if(MONOLITHIC_BUILD)
+	set(FREERDP_PC_LIBS "-lfreerdp -lfreerdp-client")
+	set(WINPR_PC_LIBS "-lwinpr")
+	if (WITH_SERVER)
+		set(FREERDP_PC_LIBS "${FREERDP_PC_LIBS} -lfreerdp-server")
+	endif()
+else(MONOLITHIC_BUILD)
+	# freerdp exports
+	get_property(MEXPORTS GLOBAL PROPERTY "freerdp_EXPORTS")
+	foreach(EXPORT_MODULE ${MEXPORTS})
+			list(APPEND FREERDP_PC_LIBS "-lfreerdp-${EXPORT_MODULE}")
+	endforeach()
+	string(REPLACE ";" " " FREERDP_PC_LIBS "${FREERDP_PC_LIBS}")
+
+	# winpr exports
+	get_property(MEXPORTS GLOBAL PROPERTY "winpr_EXPORTS")
+	foreach(EXPORT_MODULE ${MEXPORTS})
+			list(APPEND WINPR_PC_LIBS "-lwinpr-${EXPORT_MODULE}")
+	endforeach()
+	string(REPLACE ";" " " WINPR_PC_LIBS "${WINPR_PC_LIBS}")
+endif(MONOLITHIC_BUILD)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/winpr.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

channels/audin/client/alsa/CMakeLists.txt

@@ -36,5 +36,5 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${ALSA_LIBRARIES})
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT FreeRDPTargets)
+install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH} EXPORT FreeRDPTargets)
 

channels/audin/server/CMakeLists.txt

@@ -27,7 +27,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE freerdp
-	MODULES freerdp-codec freerdp-utils winpr-wtsapi)
+	MODULES freerdp-codec freerdp-utils)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 

channels/audin/server/audin.c

@@ -49,7 +49,6 @@ typedef struct _audin_server
 
 	BOOL opened;
 
-	HANDLE event;
 	HANDLE stopEvent;
 
 	HANDLE thread;
@@ -284,26 +283,35 @@ static void* audin_server_thread_func(void* arg)
 	void* fd;
 	wStream* s;
 	void* buffer;
+	DWORD nCount;
 	BYTE MessageId;
+	HANDLE events[8];
 	BOOL ready = FALSE;
+	HANDLE ChannelEvent;
 	DWORD BytesReturned = 0;
 	audin_server* audin = (audin_server*) arg;
 
-	if (WTSVirtualChannelQuery(audin->audin_channel, WTSVirtualFileHandle, &buffer, &BytesReturned) == TRUE)
-	{
-		fd = *((void**) buffer);
-		WTSFreeMemory(buffer);
+	buffer = NULL;
+	BytesReturned = 0;
+	ChannelEvent = NULL;
 
-		audin->event = CreateWaitObjectEvent(NULL, TRUE, FALSE, fd);
+	if (WTSVirtualChannelQuery(audin->audin_channel, WTSVirtualEventHandle, &buffer, &BytesReturned) == TRUE)
+	{
+		if (BytesReturned == sizeof(HANDLE))
+			CopyMemory(&ChannelEvent, buffer, sizeof(HANDLE));
+
+		WTSFreeMemory(buffer);
 	}
 
+	nCount = 0;
+	events[nCount++] = audin->stopEvent;
+	events[nCount++] = ChannelEvent;
+
 	/* Wait for the client to confirm that the Audio Input dynamic channel is ready */
 
 	while (1)
 	{
-		WaitForSingleObject(audin->event, INFINITE);
-
-		if (WaitForSingleObject(audin->stopEvent, 0) == WAIT_OBJECT_0)
+		if (WaitForMultipleObjects(nCount, events, FALSE, 100) == WAIT_OBJECT_0)
 			break;
 
 		if (WTSVirtualChannelQuery(audin->audin_channel, WTSVirtualChannelReady, &buffer, &BytesReturned) == FALSE)
@@ -326,9 +334,7 @@ static void* audin_server_thread_func(void* arg)
 
 	while (ready)
 	{
-		WaitForSingleObject(audin->event, INFINITE);
-
-		if (WaitForSingleObject(audin->stopEvent, 0) == WAIT_OBJECT_0)
+		if (WaitForMultipleObjects(nCount, events, FALSE, INFINITE) == WAIT_OBJECT_0)
 			break;
 
 		Stream_SetPosition(s, 0);

channels/cliprdr/server/CMakeLists.txt

@@ -28,7 +28,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE freerdp
-	MODULES freerdp-utils winpr-wtsapi)
+	MODULES freerdp-utils)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 

channels/drdynvc/server/CMakeLists.txt

@@ -28,7 +28,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE freerdp
-	MODULES freerdp-utils winpr-wtsapi)
+	MODULES freerdp-utils)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 

channels/rdpdr/server/CMakeLists.txt

@@ -28,7 +28,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE freerdp
-	MODULES freerdp-utils winpr-wtsapi)
+	MODULES freerdp-utils)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 

channels/rdpsnd/server/CMakeLists.txt

@@ -28,7 +28,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE freerdp
-	MODULES freerdp-codec freerdp-utils winpr-wtsapi)
+	MODULES freerdp-codec freerdp-utils)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 

channels/serial/client/serial_tty.c

@@ -425,8 +425,10 @@ BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, UINT32* Length)
 
 		ptermios = (struct termios*) calloc(1, sizeof(struct termios));
 
-		if (tcgetattr(tty->fd, ptermios) < 0)
+		if (tcgetattr(tty->fd, ptermios) < 0) {
+			free(ptermios);
 			return FALSE;
+		}
 
 		/**
 		 * If a timeout is set, do a blocking read, which times out after some time.
@@ -447,6 +449,7 @@ BOOL serial_tty_read(SERIAL_TTY* tty, BYTE* buffer, UINT32* Length)
 
 		tcsetattr(tty->fd, TCSANOW, ptermios);
 		tty->timeout = timeout;
+		free(ptermios);
 	}
 
 	ZeroMemory(buffer, *Length);

channels/server/CMakeLists.txt

@@ -40,7 +40,7 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE winpr
-	MODULES winpr-crt winpr-synch winpr-interlocked winpr-error)
+	MODULES winpr-crt winpr-synch winpr-interlocked winpr-error winpr-wtsapi)
 
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} PARENT_SCOPE)
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE)

client/common/CMakeLists.txt

@@ -71,4 +71,4 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common")
 if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
-
+export_complex_library(LIBNAME ${MODULE_NAME})

client/common/file.c

@@ -674,6 +674,7 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u
 	if (freerdp_client_write_rdp_file_buffer(file, buffer, length + 1) != length)
 	{
 		fprintf(stderr, "freerdp_client_write_rdp_file: error writing to output buffer\n");
+		free(buffer);
 		return FALSE;
 	}
 

client/iOS/Controllers/RDPSessionViewController.h

@@ -57,7 +57,7 @@
     AdvancedKeyboardView* _advanced_keyboard_view;
     BOOL _advanced_keyboard_visible;
     BOOL _requesting_advanced_keyboard;
-    CGFloat _keyboard_height_delta;
+    CGFloat _keyboard_last_height;
     
     // delayed mouse move event sending
     NSTimer* _mouse_move_event_timer;

client/iOS/Controllers/RDPSessionViewController.m

@@ -51,7 +51,7 @@
         _advanced_keyboard_view = nil;
         _advanced_keyboard_visible = NO;
         _requesting_advanced_keyboard = NO;
-        _keyboard_height_delta = 0;
+		_keyboard_last_height = 0;
 
         _session_toolbar_visible = NO;
         
@@ -549,25 +549,46 @@
 #pragma mark -
 #pragma mark iOS Keyboard Notification Handlers
 
-- (void)keyboardWillShow:(NSNotification *)notification
-{
-	CGRect keyboardEndFrame = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-    CGRect keyboardFrame = [[self view] convertRect:keyboardEndFrame toView:nil];
+// the keyboard is given in a portrait frame of reference
+- (BOOL)isLandscape {
+	
+	UIInterfaceOrientation ori = [[UIApplication sharedApplication] statusBarOrientation];
+	return ( ori == UIInterfaceOrientationLandscapeLeft || ori == UIInterfaceOrientationLandscapeRight );
+	
+}
 
-    CGFloat newHeightDelta = (keyboardFrame.size.height - _keyboard_height_delta);
-    if (newHeightDelta < 0.1 && newHeightDelta > -0.1)
-        return; // nothing changed
-    
-    [UIView beginAnimations:nil context:NULL];
+- (void)shiftKeyboard: (NSNotification*)notification {
+	
+	CGRect keyboardEndFrame = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+	
+	CGFloat previousHeight = _keyboard_last_height;
+	
+	if( [self isLandscape] ) {
+		// landscape has the keyboard based on x, so x can go negative
+		_keyboard_last_height = keyboardEndFrame.size.width + keyboardEndFrame.origin.x;
+	} else {
+		// portrait has the keyboard based on the difference of the height and the frames y.
+		CGFloat height = [[UIScreen mainScreen] bounds].size.height;
+		_keyboard_last_height = height - keyboardEndFrame.origin.y;
+	}
+	
+	CGFloat shiftHeight = _keyboard_last_height - previousHeight;
+	
+	[UIView beginAnimations:nil context:NULL];
     [UIView setAnimationCurve:[[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
     [UIView setAnimationDuration:[[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]];
 	CGRect frame = [_session_scrollview frame];
-	frame.size.height -= newHeightDelta;
-    _keyboard_height_delta += newHeightDelta;
+	frame.size.height -= shiftHeight;
 	[_session_scrollview setFrame:frame];
-    [_touchpointer_view setFrame:frame];    
+    [_touchpointer_view setFrame:frame];
 	[UIView commitAnimations];
+	
+}
 
+- (void)keyboardWillShow:(NSNotification *)notification
+{
+	[self shiftKeyboard: notification];
+	
     [_touchpointer_view ensurePointerIsVisible];
 }
 
@@ -583,17 +604,9 @@
 
 - (void)keyboardWillHide:(NSNotification *)notification
 {
-	CGRect keyboardEndFrame = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-    
-    [UIView beginAnimations:nil context:NULL];
-    [UIView setAnimationCurve:[[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
-    [UIView setAnimationDuration:[[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]];
-	CGRect frame = [_session_scrollview frame];
-	frame.size.height += [[self view] convertRect:keyboardEndFrame toView:nil].size.height;
-    [_session_scrollview setFrame:frame];
-    [_touchpointer_view setFrame:frame];
-    [UIView commitAnimations];
-    _keyboard_height_delta = 0;
+	
+	[self shiftKeyboard: notification];
+	
 }
 
 - (void)keyboardDidHide:(NSNotification*)notification

cmake/ComplexLibrary.cmake

@@ -31,12 +31,45 @@ macro(set_complex_link_libraries)
 	
 endmacro(set_complex_link_libraries)
 
+# - add a new library to a module for export
+#  MODULE - module the library belongs to
+#  LIBNAME - name of the library
+#   - if MODULE isn't set the NAME should must be in the form MODULE-NAME
+function(export_complex_library)
+	set(PREFIX "EXPORT_COMPLEX_LIBRARY")
+	cmake_parse_arguments(${PREFIX}
+			""
+			"LIBNAME;MODULE"
+			""
+			${ARGN})
+
+	if (NOT ${PREFIX}_LIBNAME)
+		message(FATAL_ERROR "export_complex_library requires a name to be set")
+	endif()
+	if (NOT ${PREFIX}_MODULE)
+		# get the module prefix and remove it from libname
+		string(REPLACE "-" ";" LIBNAME_LIST "${${PREFIX}_LIBNAME}")
+		list(GET LIBNAME_LIST 0 MODULE)
+		list(REMOVE_AT LIBNAME_LIST 0)
+		string(REPLACE ";" "-" LIBNAME "${LIBNAME_LIST}")
+	else()
+		set(MODULE ${${PREFIX}_MODULE})
+		set(LIBNAME ${${PREFIX}_LIBNAME})
+	endif()
+	if (NOT MODULE)
+		message(FATAL_ERROR "export_complex_library couldn't identify MODULE")
+	endif()
+	get_property(MEXPORTS GLOBAL PROPERTY ${MODULE}_EXPORTS)
+	list(APPEND MEXPORTS ${LIBNAME})
+	set_property(GLOBAL PROPERTY ${MODULE}_EXPORTS "${MEXPORTS}")
+endfunction(export_complex_library)
+
 macro(add_complex_library)
 
 	set(PREFIX "COMPLEX_LIBRARY")
 	
 	cmake_parse_arguments(${PREFIX}
-		""
+		"EXPORT"
 		"MODULE;TYPE;MONOLITHIC"
 		"SOURCES"
 		${ARGN})
@@ -46,6 +79,9 @@ macro(add_complex_library)
 	else()
 		add_library(${${PREFIX}_MODULE} ${${PREFIX}_SOURCES})
 	endif()
+	if (${PREFIX}_EXPORT)
+		export_complex_library(LIBNAME ${${PREFIX}_MODULE})
+	endif()
 
 endmacro(add_complex_library)
 

freerdp.pc.in

@@ -9,5 +9,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation
 URL: http://www.freerdp.com/
 Version: @FREERDP_VERSION_FULL@
 Requires: 
+Requires.private: winpr zlib libssl
 Libs: -L${libdir} ${libs}
+Libs.private: -ldl -lpthread
 Cflags: -I${includedir}

libfreerdp/CMakeLists.txt

@@ -66,9 +66,4 @@ if(MONOLITHIC_BUILD)
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 	
 	set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp")
-endif()
-
-set(FREERDP_PC_LIBS "-lfreerdp -lwinpr")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif(MONOLITHIC_BUILD)

libfreerdp/cache/CMakeLists.txt

@@ -30,7 +30,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/codec/CMakeLists.txt

@@ -84,7 +84,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/codec/region.c

@@ -737,8 +737,10 @@ BOOL region16_intersect_rect(REGION16 *dst, const REGION16 *src, const RECTANGLE
 		free(dst->data);
 
 	dst->data = realloc(newItems, newItems->size);
-	if (!dst->data)
+	if (!dst->data) {
+		free(newItems);
 		return FALSE;
+	}
 
 	dst->extents = newExtents;
 	return region16_simplify_bands(dst);

libfreerdp/common/CMakeLists.txt

@@ -24,7 +24,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 

libfreerdp/core/CMakeLists.txt

@@ -126,7 +126,8 @@ set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_GATEWAY_SR
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/core/gateway/ncacn_http.c

@@ -329,6 +329,7 @@ rdpNtlmHttp* ntlm_http_new()
 out_free_ntlm:
 	ntlm_free(ntlm_http->ntlm);
 out_free:
+	free(ntlm_http);
 	return NULL;
 }
 

libfreerdp/core/gateway/tsg.c

@@ -360,6 +360,10 @@ BOOL TsProxyCreateTunnelReadResponse(rdpTsg* tsg, RPC_PDU* pdu)
 				if (MsgBytes > TSG_MESSAGING_MAX_MESSAGE_LENGTH)
 				{
 					fprintf(stderr, "Out of Spec Message Length %d", MsgBytes);
+					free(tsgCaps);
+					free(versionCaps);
+					free(packetCapsResponse);
+					free(packet);
 					return FALSE;
 				}
 				offset += MsgBytes;
@@ -373,6 +377,10 @@ BOOL TsProxyCreateTunnelReadResponse(rdpTsg* tsg, RPC_PDU* pdu)
 
 			default:
 				fprintf(stderr, "Unexpected Message Type: 0x%X\n", (int) MessageSwitchValue);
+				free(tsgCaps);
+				free(versionCaps);
+				free(packetCapsResponse);
+				free(packet);
 				return FALSE;
 
 		}
@@ -619,6 +627,7 @@ BOOL TsProxyAuthorizeTunnelReadResponse(rdpTsg* tsg, RPC_PDU* pdu)
 	{
 		fprintf(stderr, "status: E_PROXY_NAP_ACCESSDENIED (0x%08X)\n", E_PROXY_NAP_ACCESSDENIED);
 		fprintf(stderr, "Ensure that the Gateway Connection Authorization Policy is correct\n");
+		free(packet);
 		return FALSE;
 	}
 

libfreerdp/core/license.c

@@ -1057,6 +1057,7 @@ void license_send_platform_challenge_response_packet(rdpLicense* license)
 	if (!rc4)
 	{
 		fprintf(stderr, "%s: unable to allocate a rc4\n", __FUNCTION__);
+		free(buffer);
 		return;
 	}
 	crypto_rc4(rc4, HWID_LENGTH, license->HardwareId, buffer);

libfreerdp/core/server.c

@@ -866,7 +866,7 @@ HANDLE WINAPI FreeRDP_WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualNam
 	WTSVirtualChannelWrite(vcm->drdynvc_channel, (PCHAR) Stream_Buffer(s), Stream_GetPosition(s), NULL);
 	Stream_Free(s, TRUE);
 
-	return NULL;
+	return channel;
 }
 
 BOOL WINAPI FreeRDP_WTSVirtualChannelClose(HANDLE hChannelHandle)

libfreerdp/crypto/CMakeLists.txt

@@ -30,7 +30,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})

libfreerdp/gdi/CMakeLists.txt

@@ -41,7 +41,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/locale/CMakeLists.txt

@@ -72,7 +72,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/primitives/CMakeLists.txt

@@ -69,7 +69,8 @@ set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_OPT_SRCS})
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/rail/CMakeLists.txt

@@ -27,7 +27,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

libfreerdp/utils/CMakeLists.txt

@@ -38,7 +38,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")
 

server/common/CMakeLists.txt

@@ -42,3 +42,4 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/Common")
+export_complex_library(LIBNAME ${MODULE_NAME})

winpr.pc.in

@@ -9,5 +9,7 @@ Description: WinPR: Windows Portable Runtime
 URL: http://www.freerdp.com/
 Version: @WINPR_VERSION_FULL@
 Requires: 
+Requires.private: zlib libssl
 Libs: -L${libdir} ${libs}
+Libs.private: -ldl -lrt -lm -lpthread
 Cflags: -I${includedir}

winpr/libwinpr/CMakeLists.txt

@@ -58,20 +58,5 @@ if(MONOLITHIC_BUILD)
 
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
 	
-	set(WINPR_PC_LIBS "-lwinpr")
-	
-	foreach(WINPR_LIB ${WINPR_LIBS})
-		if(${WINPR_LIB} MATCHES "^-l.*")
-			set(WINPR_PC_LIBS "${WINPR_PC_LIBS} ${WINPR_LIB}")
-		elseif(${WINPR_LIB} MATCHES "^/.*")
-			
-		else()
-			set(WINPR_PC_LIBS "${WINPR_PC_LIBS} -l${WINPR_LIB}")
-		endif()
-	endforeach()
-	
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/winpr.pc @ONLY)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
 	set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")
 endif()

winpr/libwinpr/asn1/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/bcrypt/CMakeLists.txt

@@ -23,7 +23,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})

winpr/libwinpr/com/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/credentials/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/credui/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/crt/CMakeLists.txt

@@ -34,7 +34,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/crypto/CMakeLists.txt

@@ -29,7 +29,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 	
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${OPENSSL_INCLUDE_DIR})

winpr/libwinpr/dsparse/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/environment/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/error/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/file/CMakeLists.txt

@@ -24,7 +24,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/handle/CMakeLists.txt

@@ -29,7 +29,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/heap/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/input/CMakeLists.txt

@@ -25,7 +25,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/interlocked/CMakeLists.txt

@@ -31,7 +31,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/io/CMakeLists.txt

@@ -29,7 +29,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/library/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/locale/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/memory/CMakeLists.txt

@@ -28,7 +28,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/nt/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/path/CMakeLists.txt

@@ -24,7 +24,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/pipe/CMakeLists.txt

@@ -28,7 +28,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/pipe/pipe.c

@@ -145,7 +145,7 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD
 	if (pNamedPipe->serverfd == -1)
 	{
 		fprintf(stderr, "CreateNamedPipeA: socket error, %s\n", strerror(errno));
-		return INVALID_HANDLE_VALUE;
+		goto err_out;
 	}
 
 	ZeroMemory(&s, sizeof(struct sockaddr_un));
@@ -157,7 +157,7 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD
 	if (status != 0)
 	{
 		fprintf(stderr, "CreateNamedPipeA: bind error, %s\n", strerror(errno));
-		return INVALID_HANDLE_VALUE;
+		goto err_out;
 	}
 
 	status = listen(pNamedPipe->serverfd, 2);
@@ -165,7 +165,7 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD
 	if (status != 0)
 	{
 		fprintf(stderr, "CreateNamedPipeA: listen error, %s\n", strerror(errno));
-		return INVALID_HANDLE_VALUE;
+		goto err_out;
 	}
 
 	UnixChangeFileMode(pNamedPipe->lpFilePath, 0xFFFF);
@@ -181,6 +181,13 @@ HANDLE CreateNamedPipeA(LPCSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD
 	}
 
 	return hNamedPipe;
+err_out:
+	if (pNamedPipe) {
+		if (pNamedPipe->serverfd != -1)
+			close(pNamedPipe->serverfd);
+		free(pNamedPipe);
+	}
+	return INVALID_HANDLE_VALUE;
 }
 
 HANDLE CreateNamedPipeW(LPCWSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD nMaxInstances,

winpr/libwinpr/pool/CMakeLists.txt

@@ -36,7 +36,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/pool/pool.c

@@ -103,6 +103,11 @@ static void* thread_pool_work_func(void* arg)
 	return NULL;
 }
 
+static void threads_close(void *thread)
+{
+	CloseHandle(thread);
+}
+
 void InitializeThreadpool(PTP_POOL pool)
 {
 	int index;
@@ -114,6 +119,7 @@ void InitializeThreadpool(PTP_POOL pool)
 		pool->Maximum = 500;
 
 		pool->Threads = ArrayList_New(TRUE);
+		pool->Threads->object.fnObjectFree = threads_close;
 
 		pool->PendingQueue = Queue_New(TRUE, -1, -1);
 		pool->WorkComplete = CountdownEvent_New(0);

winpr/libwinpr/registry/CMakeLists.txt

@@ -29,7 +29,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 	
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/rpc/CMakeLists.txt

@@ -47,7 +47,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})

winpr/libwinpr/rpc/ndr.c

@@ -241,7 +241,6 @@ CLIENT_CALL_RETURN NdrClientCall(PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING
 	MIDL_STUB_MESSAGE stubMsg;
 	INTERPRETER_FLAGS flags;
 	INTERPRETER_OPT_FLAGS optFlags;
-	INTERPRETER_OPT_FLAGS2 extFlags;
 	NDR_PROC_HEADER* procHeader;
 	NDR_OI2_PROC_HEADER* oi2ProcHeader;
 	CLIENT_CALL_RETURN client_call_return;
@@ -297,6 +296,7 @@ CLIENT_CALL_RETURN NdrClientCall(PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING
 
 	if (optFlags.HasExtensions)
 	{
+		INTERPRETER_OPT_FLAGS2 extFlags;
 		NDR_PROC_HEADER_EXTS* extensions = (NDR_PROC_HEADER_EXTS*) pFormat;
 
 		pFormat += extensions->Size;
@@ -324,14 +324,13 @@ CLIENT_CALL_RETURN NdrClientCall(PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING
 			}
 		}
 #endif
+		fprintf(stderr, "ExtFlags: ");
+		NdrPrintExtFlags(extFlags);
+		fprintf(stderr, "\n");
 	}
 
 	stubMsg.StackTop = (unsigned char*) stackTop;
 
-	fprintf(stderr, "ExtFlags: ");
-	NdrPrintExtFlags(extFlags);
-	fprintf(stderr, "\n");
-
 	NdrProcessParams(&stubMsg, pFormat, NDR_PHASE_SIZE, fpuStack, numberParams);
 
 	fprintf(stderr, "stubMsg BufferLength: %d\n", (int) stubMsg.BufferLength);

winpr/libwinpr/security/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/smartcard/CMakeLists.txt

@@ -37,7 +37,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/sspi/CMakeLists.txt

@@ -61,7 +61,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${OPENSSL_INCLUDE_DIR})

winpr/libwinpr/sspicli/CMakeLists.txt

@@ -23,7 +23,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/synch/CMakeLists.txt

@@ -42,7 +42,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/synch/timer.c

@@ -648,12 +648,15 @@ BOOL CreateTimerQueueTimer(PHANDLE phNewTimer, HANDLE TimerQueue,
 	WINPR_TIMER_QUEUE* timerQueue;
 	WINPR_TIMER_QUEUE_TIMER* timer;
 
+	if (!TimerQueue)
+		return FALSE;
+
 	timespec_gettimeofday(&CurrentTime);
 
 	timerQueue = (WINPR_TIMER_QUEUE*) TimerQueue;
 	timer = (WINPR_TIMER_QUEUE_TIMER*) malloc(sizeof(WINPR_TIMER_QUEUE_TIMER));
 
-	if (!timer || !TimerQueue)
+	if (!timer)
 		return FALSE;
 
 	WINPR_HANDLE_SET_TYPE(timer, HANDLE_TYPE_TIMER_QUEUE_TIMER);

winpr/libwinpr/sysinfo/CMakeLists.txt

@@ -27,7 +27,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/thread/CMakeLists.txt

@@ -32,7 +32,8 @@ endif()
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/timezone/CMakeLists.txt

@@ -23,7 +23,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 	
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/utils/CMakeLists.txt

@@ -92,7 +92,8 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/utils/collections/BufferPool.c

@@ -277,6 +277,9 @@ void* BufferPool_Take(wBufferPool* pool, int size)
 	return buffer;
 
 out_error:
+	if (buffer)
+		free(buffer);
+
 	if (pool->synchronized)
 		LeaveCriticalSection(&pool->lock);
 	return NULL;

winpr/libwinpr/utils/collections/ListDictionary.c

@@ -144,8 +144,8 @@ int ListDictionary_GetKeys(wListDictionary* listDictionary, ULONG_PTR** ppKeys)
 		}
 	}
 
-	pKeys = (ULONG_PTR*) malloc(sizeof(ULONG_PTR*) * count);
-	ZeroMemory(pKeys, sizeof(ULONG_PTR*) * count);
+	pKeys = (ULONG_PTR*) malloc(sizeof(ULONG_PTR) * count);
+	ZeroMemory(pKeys, sizeof(ULONG_PTR) * count);
 
 	index = 0;
 

winpr/libwinpr/winhttp/CMakeLists.txt

@@ -23,7 +23,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/winsock/CMakeLists.txt

@@ -23,7 +23,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/libwinpr/wtsapi/CMakeLists.txt

@@ -24,7 +24,8 @@ set(${MODULE_PREFIX}_SRCS
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
-	SOURCES ${${MODULE_PREFIX}_SRCS})
+	SOURCES ${${MODULE_PREFIX}_SRCS}
+	EXPORT)
 
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
 

winpr/tools/makecert/CMakeLists.txt

@@ -43,4 +43,4 @@ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
 add_subdirectory(cli)
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
-
+export_complex_library(LIBNAME ${MODULE_NAME})