Merge pull request #3168 from akallabeth/visibility_fixes

Fixed default visibility.

CMakeLists.txt

@@ -122,8 +122,10 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
 	endif()
 endif()
 
-if(NOT DEFINED EXPORT_ALL_SYMBOLS)
-	set(EXPORT_ALL_SYMBOLS TRUE)
+if(BUILD_TESTING)
+    set(EXPORT_ALL_SYMBOLS TRUE)
+elseif(NOT DEFINED EXPORT_ALL_SYMBOLS)
+    set(EXPORT_ALL_SYMBOLS FALSE)
 endif()
 
 # BSD

channels/audin/client/audin_main.c

@@ -771,6 +771,8 @@ static BOOL audin_process_addin_args(IWTSPlugin* pPlugin, ADDIN_ARGV* args)
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry		audin_DVCPluginEntry
+#else
+#define DVCPluginEntry		FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/cliprdr/client/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"cliprdr"
-EXPORTS
-	VirtualChannelEntry		@1

channels/disp/client/disp_main.c

@@ -340,6 +340,8 @@ UINT disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonitors, DI
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry		disp_DVCPluginEntry
+#else
+#define DVCPluginEntry		FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/drive/client/drive_main.c

@@ -859,6 +859,8 @@ out_error:
 
 #ifdef STATIC_CHANNELS
 #define DeviceServiceEntry	drive_DeviceServiceEntry
+#else
+#define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
 #endif
 
 UINT sys_code_page = 0;

channels/drive/client/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"drive"
-EXPORTS
-	DeviceServiceEntry		@1

channels/echo/client/echo_main.c

@@ -162,6 +162,8 @@ static UINT echo_plugin_terminated(IWTSPlugin* pPlugin)
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry		echo_DVCPluginEntry
+#else
+#define DVCPluginEntry		FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/parallel/client/parallel_main.c

@@ -394,6 +394,8 @@ static UINT parallel_free(DEVICE* device)
 
 #ifdef STATIC_CHANNELS
 #define DeviceServiceEntry	parallel_DeviceServiceEntry
+#else
+#define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
 #endif
 
 /**

channels/printer/client/printer_main.c

@@ -452,6 +452,8 @@ error_out:
 
 #ifdef STATIC_CHANNELS
 #define DeviceServiceEntry	printer_DeviceServiceEntry
+#else
+#define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
 #endif
 
 /**

channels/rdpei/client/rdpei_main.c

@@ -957,6 +957,8 @@ UINT rdpei_touch_end(RdpeiClientContext* context, int externalId, int x, int y,
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry		rdpei_DVCPluginEntry
+#else
+#define DVCPluginEntry		FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/rdpgfx/client/rdpgfx_main.c

@@ -1515,6 +1515,8 @@ void* rdpgfx_get_cache_slot_data(RdpgfxClientContext* context, UINT16 cacheSlot)
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry		rdpgfx_DVCPluginEntry
+#else
+#define DVCPluginEntry		FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/serial/client/serial_main.c

@@ -813,6 +813,8 @@ static UINT serial_free(DEVICE* device)
 
 #ifdef STATIC_CHANNELS
 #define DeviceServiceEntry	serial_DeviceServiceEntry
+#else
+#define DeviceServiceEntry	FREERDP_API DeviceServiceEntry
 #endif
 
 /**

channels/tsmf/client/tsmf_main.c

@@ -527,6 +527,8 @@ static UINT tsmf_process_addin_args(IWTSPlugin *pPlugin, ADDIN_ARGV *args)
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry	tsmf_DVCPluginEntry
+#else
+#define DVCPluginEntry	FREERDP_API DVCPluginEntry
 #endif
 
 /**

channels/urbdrc/client/urbdrc_main.c

@@ -1541,6 +1541,8 @@ static UINT urbdrc_process_addin_args(URBDRC_PLUGIN* urbdrc, ADDIN_ARGV* args)
 
 #ifdef STATIC_CHANNELS
 #define DVCPluginEntry urbdrc_DVCPluginEntry
+#else
+#define DVCPluginEntry FREERDP_API DVCPluginEntry
 #endif
 
 /**

client/common/CMakeLists.txt

@@ -39,7 +39,7 @@ foreach(FREERDP_CHANNELS_CLIENT_SRC ${FREERDP_CHANNELS_CLIENT_SRCS})
 endforeach()
 
 if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
 endif()
 
 # On windows create dll version information.

client/common/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"freerdp-client"
-EXPORTS
-

libfreerdp/core/freerdp.c

@@ -398,7 +398,7 @@ BOOL freerdp_shall_disconnect(freerdp* instance)
 	return TRUE;
 }
 
-FREERDP_API BOOL freerdp_focus_required(freerdp* instance)
+BOOL freerdp_focus_required(freerdp* instance)
 {
 	rdpRdp* rdp;
 	BOOL bRetCode = FALSE;
@@ -778,19 +778,19 @@ void freerdp_free(freerdp* instance)
 	free(instance);
 }
 
-FREERDP_API ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount) {
+ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount) {
 	ULONG written = context->rdp->transport->written;
 	if (resetCount)
 		context->rdp->transport->written = 0;
 	return written;
 }
 
-FREERDP_API HANDLE getChannelErrorEventHandle(rdpContext* context)
+HANDLE getChannelErrorEventHandle(rdpContext* context)
 {
 	return context->channelErrorEvent;
 }
 
-FREERDP_API BOOL checkChannelErrorEvent(rdpContext* context)
+BOOL checkChannelErrorEvent(rdpContext* context)
 {
 	if (WaitForSingleObject( context->channelErrorEvent, 0) == WAIT_OBJECT_0)
 	{
@@ -805,24 +805,24 @@ FREERDP_API BOOL checkChannelErrorEvent(rdpContext* context)
  *
  * @return 0 on success, otherwise a Win32 error code
  */
-FREERDP_API UINT getChannelError(rdpContext* context)
+UINT getChannelError(rdpContext* context)
 {
 	return context->channelErrorNum;
 }
 
-FREERDP_API const char* getChannelErrorDescription(rdpContext* context)
+const char* getChannelErrorDescription(rdpContext* context)
 {
 	return context->errorDescription;
 }
 
-FREERDP_API void clearChannelError(rdpContext* context)
+void clearChannelError(rdpContext* context)
 {
 	context->channelErrorNum = 0;
 	memset(context->errorDescription, 0, 500);
 	ResetEvent(context->channelErrorEvent);
 }
 
-FREERDP_API void setChannelError(rdpContext* context, UINT errorNum, char* description)
+void setChannelError(rdpContext* context, UINT errorNum, char* description)
 {
 	context->channelErrorNum = errorNum;
 	strncpy(context->errorDescription, description, 499);

libfreerdp/crypto/crypto.c

@@ -334,7 +334,7 @@ char* crypto_cert_subject_common_name(X509* xcert, int* length)
 	return (char*) common_name;
 }
 
-FREERDP_API void crypto_cert_subject_alt_name_free(int count, int *lengths,
+void crypto_cert_subject_alt_name_free(int count, int *lengths,
 						   char** alt_name)
 {
 	int i;

server/Windows/wf_interface.c

@@ -212,7 +212,7 @@ void wfreerdp_server_free(wfServer* server)
 	WSACleanup();
 }
 
-FREERDP_API BOOL wfreerdp_server_is_running(wfServer* server)
+BOOL wfreerdp_server_is_running(wfServer* server)
 {
 	DWORD tStatus;
 	BOOL bRet;
@@ -229,7 +229,7 @@ FREERDP_API BOOL wfreerdp_server_is_running(wfServer* server)
 	return FALSE;
 }
 
-FREERDP_API UINT32 wfreerdp_server_num_peers()
+UINT32 wfreerdp_server_num_peers()
 {
 	wfInfo* wfi;
 
@@ -239,7 +239,7 @@ FREERDP_API UINT32 wfreerdp_server_num_peers()
 	return wfi->peerCount;
 }
 
-FREERDP_API UINT32 wfreerdp_server_get_peer_hostname(int pId, wchar_t * dstStr)
+UINT32 wfreerdp_server_get_peer_hostname(int pId, wchar_t * dstStr)
 {
 	wfInfo* wfi;
 	freerdp_peer* peer;
@@ -264,7 +264,7 @@ FREERDP_API UINT32 wfreerdp_server_get_peer_hostname(int pId, wchar_t * dstStr)
 	}
 }
 
-FREERDP_API BOOL wfreerdp_server_peer_is_local(int pId)
+BOOL wfreerdp_server_peer_is_local(int pId)
 {
 	wfInfo* wfi;
 	freerdp_peer* peer;
@@ -284,7 +284,7 @@ FREERDP_API BOOL wfreerdp_server_peer_is_local(int pId)
 	}
 }
 
-FREERDP_API BOOL wfreerdp_server_peer_is_connected(int pId)
+BOOL wfreerdp_server_peer_is_connected(int pId)
 {
 	wfInfo* wfi;
 	freerdp_peer* peer;
@@ -305,7 +305,7 @@ FREERDP_API BOOL wfreerdp_server_peer_is_connected(int pId)
 	}
 }
 
-FREERDP_API BOOL wfreerdp_server_peer_is_activated(int pId)
+BOOL wfreerdp_server_peer_is_activated(int pId)
 {
 	wfInfo* wfi;
 	freerdp_peer* peer;
@@ -325,7 +325,7 @@ FREERDP_API BOOL wfreerdp_server_peer_is_activated(int pId)
 	}
 }
 
-FREERDP_API BOOL wfreerdp_server_peer_is_authenticated(int pId)
+BOOL wfreerdp_server_peer_is_authenticated(int pId)
 {
 	wfInfo* wfi;
 	freerdp_peer* peer;
@@ -345,7 +345,7 @@ FREERDP_API BOOL wfreerdp_server_peer_is_authenticated(int pId)
 	}
 }
 
-FREERDP_API void wfreerdp_server_register_callback_event(cbCallback cb)
+void wfreerdp_server_register_callback_event(cbCallback cb)
 {
 	cbEvent = cb;
 }

server/common/CMakeLists.txt

@@ -33,7 +33,7 @@ foreach(FREERDP_CHANNELS_SERVER_SRC ${FREERDP_CHANNELS_SERVER_SRCS})
 endforeach()
 
 if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
 endif()
 
 

server/common/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"freerdp-server"
-EXPORTS
-

server/shadow/Mac/mac_shadow.c

@@ -660,7 +660,7 @@ macShadowSubsystem* mac_shadow_subsystem_new()
 	return subsystem;
 }
 
-int Mac_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
+FREERDP_API int Mac_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
 {
 	pEntryPoints->New = (pfnShadowSubsystemNew) mac_shadow_subsystem_new;
 	pEntryPoints->Free = (pfnShadowSubsystemFree) mac_shadow_subsystem_free;

server/shadow/Win/win_shadow.c

@@ -519,7 +519,7 @@ winShadowSubsystem* win_shadow_subsystem_new()
 	return subsystem;
 }
 
-int Win_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
+FREERDP_API int Win_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
 {
 	pEntryPoints->New = (pfnShadowSubsystemNew) win_shadow_subsystem_new;
 	pEntryPoints->Free = (pfnShadowSubsystemFree) win_shadow_subsystem_free;

server/shadow/X11/x11_shadow.c

@@ -1437,7 +1437,7 @@ void x11_shadow_subsystem_free(x11ShadowSubsystem* subsystem)
 	free(subsystem);
 }
 
-int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
+FREERDP_API int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
 {
 	pEntryPoints->New = (pfnShadowSubsystemNew) x11_shadow_subsystem_new;
 	pEntryPoints->Free = (pfnShadowSubsystemFree) x11_shadow_subsystem_free;

uwac/include/uwac/uwac-tools.h

@@ -40,13 +40,13 @@ typedef struct uwac_touch_automata UwacTouchAutomata;
  *
  * @param automata
  */
-void UwacTouchAutomataInit(UwacTouchAutomata *automata);
+UWAC_API void UwacTouchAutomataInit(UwacTouchAutomata *automata);
 
 /**
  *
  * @param automata
  */
-void UwacTouchAutomataReset(UwacTouchAutomata *automata);
+UWAC_API void UwacTouchAutomataReset(UwacTouchAutomata *automata);
 
 
 /**
@@ -55,6 +55,6 @@ void UwacTouchAutomataReset(UwacTouchAutomata *automata);
  * @param event
  * @return
  */
-bool UwacTouchAutomataInjectEvent(UwacTouchAutomata *automata, UwacEvent *event);
+UWAC_API bool UwacTouchAutomataInjectEvent(UwacTouchAutomata *automata, UwacEvent *event);
 
 #endif /* __UWAC_TOOLS_H_ */

uwac/include/uwac/uwac.h

@@ -26,6 +26,12 @@
 #include <wayland-client.h>
 #include <stdbool.h>
 
+#if __GNUC__ >= 4
+	#define UWAC_API   __attribute__ ((visibility("default")))
+#else
+	#define UWAC_API
+#endif
+
 typedef struct uwac_size UwacSize;
 typedef struct uwac_display UwacDisplay;
 typedef struct uwac_output UwacOutput;
@@ -238,7 +244,7 @@ extern "C" {
  *
  * @param handler
  */
-void UwacInstallErrorHandler(UwacErrorHandler handler);
+UWAC_API void UwacInstallErrorHandler(UwacErrorHandler handler);
 
 
 /**
@@ -248,7 +254,7 @@ void UwacInstallErrorHandler(UwacErrorHandler handler);
  * @param name the name of the display to open
  * @return the created UwacDisplay object
  */
-UwacDisplay *UwacOpenDisplay(const char *name, UwacReturnCode *err);
+UWAC_API UwacDisplay *UwacOpenDisplay(const char *name, UwacReturnCode *err);
 
 /**
  *	closes the corresponding UwacDisplay
@@ -256,7 +262,7 @@ UwacDisplay *UwacOpenDisplay(const char *name, UwacReturnCode *err);
  * @param pdisplay a pointer on the display to close
  * @return UWAC_SUCCESS if the operation was successful, the corresponding error otherwise
  */
-UwacReturnCode UwacCloseDisplay(UwacDisplay **pdisplay);
+UWAC_API UwacReturnCode UwacCloseDisplay(UwacDisplay **pdisplay);
 
 /**
  * Returns the file descriptor associated with the UwacDisplay, this is useful when
@@ -265,7 +271,7 @@ UwacReturnCode UwacCloseDisplay(UwacDisplay **pdisplay);
  * @param display an opened UwacDisplay
  * @return the corresponding descriptor
  */
-int UwacDisplayGetFd(UwacDisplay *display);
+UWAC_API int UwacDisplayGetFd(UwacDisplay *display);
 
 /**
  *	Returns a human readable form of a Uwac error code
@@ -273,7 +279,7 @@ int UwacDisplayGetFd(UwacDisplay *display);
  * @param error the error number
  * @return the associated string
  */
-const char *UwacErrorString(UwacReturnCode error);
+UWAC_API const char *UwacErrorString(UwacReturnCode error);
 
 /**
  * returns the last error that occurred on a display
@@ -281,7 +287,7 @@ const char *UwacErrorString(UwacReturnCode error);
  * @param display the display
  * @return the last error that have been set for this display
  */
-UwacReturnCode UwacDisplayGetLastError(const UwacDisplay *display);
+UWAC_API UwacReturnCode UwacDisplayGetLastError(const UwacDisplay *display);
 
 /**
  * retrieves the version of a given interface
@@ -291,7 +297,7 @@ UwacReturnCode UwacDisplayGetLastError(const UwacDisplay *display);
  * @param version the output variable for the version
  * @return UWAC_SUCCESS if the interface was found, UWAC_NOT_FOUND otherwise
  */
-UwacReturnCode UwacDisplayQueryInterfaceVersion(const UwacDisplay *display, const char *name, uint32_t *version);
+UWAC_API UwacReturnCode UwacDisplayQueryInterfaceVersion(const UwacDisplay *display, const char *name, uint32_t *version);
 
 /**
  *	returns the number SHM formats that have been reported by the compositor
@@ -299,7 +305,7 @@ UwacReturnCode UwacDisplayQueryInterfaceVersion(const UwacDisplay *display, cons
  * @param display a connected UwacDisplay
  * @return the number of SHM formats supported
  */
-uint32_t UwacDisplayQueryGetNbShmFormats(UwacDisplay *display);
+UWAC_API uint32_t UwacDisplayQueryGetNbShmFormats(UwacDisplay *display);
 
 /**
  *	returns the supported ShmFormats
@@ -310,7 +316,7 @@ uint32_t UwacDisplayQueryGetNbShmFormats(UwacDisplay *display);
  * @param filled the number of filled entries in the formats array
  * @return UWAC_SUCCESS on success, an error otherwise
  */
-UwacReturnCode UwacDisplayQueryShmFormats(const UwacDisplay *display, enum wl_shm_format *formats, int formats_size, int *filled);
+UWAC_API UwacReturnCode UwacDisplayQueryShmFormats(const UwacDisplay *display, enum wl_shm_format *formats, int formats_size, int *filled);
 
 /**
  *	returns the number of registered outputs
@@ -318,7 +324,7 @@ UwacReturnCode UwacDisplayQueryShmFormats(const UwacDisplay *display, enum wl_sh
  * @param display the display to query
  * @return the number of outputs
  */
-uint32_t UwacDisplayGetNbOutputs(UwacDisplay *display);
+UWAC_API uint32_t UwacDisplayGetNbOutputs(UwacDisplay *display);
 
 /**
  *	retrieve a particular UwacOutput object
@@ -327,7 +333,7 @@ uint32_t UwacDisplayGetNbOutputs(UwacDisplay *display);
  * @param index index of the output
  * @return the given UwacOutput, NULL if something failed (so you should query UwacDisplayGetLastError() to have the reason)
  */
-UwacOutput *UwacDisplayGetOutput(UwacDisplay *display, int index);
+UWAC_API UwacOutput *UwacDisplayGetOutput(UwacDisplay *display, int index);
 
 /**
  * retrieve the resolution of a given UwacOutput
@@ -336,7 +342,7 @@ UwacOutput *UwacDisplayGetOutput(UwacDisplay *display, int index);
  * @param resolution a pointer on the
  * @return UWAC_SUCCESS on success
  */
-UwacReturnCode UwacOutputGetResolution(UwacOutput *output, UwacSize *resolution);
+UWAC_API UwacReturnCode UwacOutputGetResolution(UwacOutput *output, UwacSize *resolution);
 
 
 /**
@@ -348,7 +354,7 @@ UwacReturnCode UwacOutputGetResolution(UwacOutput *output, UwacSize *resolution)
  * @param format format to use for the SHM surface
  * @return the created UwacWindow, NULL if something failed (use UwacDisplayGetLastError() to know more about this)
  */
-UwacWindow *UwacCreateWindowShm(UwacDisplay *display, uint32_t width, uint32_t height, enum wl_shm_format format);
+UWAC_API UwacWindow *UwacCreateWindowShm(UwacDisplay *display, uint32_t width, uint32_t height, enum wl_shm_format format);
 
 /**
  *	destroys the corresponding UwacWindow
@@ -356,7 +362,7 @@ UwacWindow *UwacCreateWindowShm(UwacDisplay *display, uint32_t width, uint32_t h
  * @param window a pointer on the UwacWindow to destroy
  * @return if the operation completed successfully
  */
-UwacReturnCode UwacDestroyWindow(UwacWindow **window);
+UWAC_API UwacReturnCode UwacDestroyWindow(UwacWindow **window);
 
 /**
  *	Sets the region that should be considered opaque to the compositor.
@@ -368,7 +374,7 @@ UwacReturnCode UwacDestroyWindow(UwacWindow **window);
  * @param height
  * @return UWAC_SUCCESS on success, an error otherwise
  */
-UwacReturnCode UwacWindowSetOpaqueRegion(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
+UWAC_API UwacReturnCode UwacWindowSetOpaqueRegion(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
 
 /**
  *	Sets the region of the window that can trigger input events
@@ -380,14 +386,14 @@ UwacReturnCode UwacWindowSetOpaqueRegion(UwacWindow *window, uint32_t x, uint32_
  * @param height
  * @return
  */
-UwacReturnCode UwacWindowSetInputRegion(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
+UWAC_API UwacReturnCode UwacWindowSetInputRegion(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
 
 /**
  *	retrieves a pointer on the current window content to draw a frame
  * @param window the UwacWindow
  * @return a pointer on the current window content
  */
-void *UwacWindowGetDrawingBuffer(UwacWindow *window);
+UWAC_API void *UwacWindowGetDrawingBuffer(UwacWindow *window);
 
 /**
  *	sets a rectangle as dirty for the next frame of a window
@@ -399,7 +405,7 @@ void *UwacWindowGetDrawingBuffer(UwacWindow *window);
  * @param height the height of the dirty rectangle
  * @return UWAC_SUCCESS on success, an Uwac error otherwise
  */
-UwacReturnCode UwacWindowAddDamage(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
+UWAC_API UwacReturnCode UwacWindowAddDamage(UwacWindow *window, uint32_t x, uint32_t y, uint32_t width, uint32_t height);
 
 /**
  *	Sends a frame to the compositor with the content of the drawing buffer
@@ -408,7 +414,7 @@ UwacReturnCode UwacWindowAddDamage(UwacWindow *window, uint32_t x, uint32_t y, u
  * @param copyContentForNextFrame if true the content to display is copied in the next drawing buffer
  * @return UWAC_SUCCESS if the operation was successful
  */
-UwacReturnCode UwacWindowSubmitBuffer(UwacWindow *window, bool copyContentForNextFrame);
+UWAC_API UwacReturnCode UwacWindowSubmitBuffer(UwacWindow *window, bool copyContentForNextFrame);
 
 /**
  *	returns the geometry of the given UwacWindows
@@ -417,7 +423,7 @@ UwacReturnCode UwacWindowSubmitBuffer(UwacWindow *window, bool copyContentForNex
  * @param geometry the geometry to fill
  * @return UWAC_SUCCESS on success, an Uwac error otherwise
  */
-UwacReturnCode UwacWindowGetGeometry(UwacWindow *window, UwacSize *geometry);
+UWAC_API UwacReturnCode UwacWindowGetGeometry(UwacWindow *window, UwacSize *geometry);
 
 /**
  *	Sets or unset the fact that the window is set fullscreen. After this call the
@@ -429,7 +435,7 @@ UwacReturnCode UwacWindowGetGeometry(UwacWindow *window, UwacSize *geometry);
  * @param isFullscreen set or unset fullscreen
  * @return UWAC_SUCCESS if the operation was a success
  */
-UwacReturnCode UwacWindowSetFullscreenState(UwacWindow *window, UwacOutput *output, bool isFullscreen);
+UWAC_API UwacReturnCode UwacWindowSetFullscreenState(UwacWindow *window, UwacOutput *output, bool isFullscreen);
 
 /**
  *	When possible (depending on the shell) sets the title of the UwacWindow
@@ -437,7 +443,7 @@ UwacReturnCode UwacWindowSetFullscreenState(UwacWindow *window, UwacOutput *outp
  * @param window the UwacWindow
  * @param name title
  */
-void UwacWindowSetTitle(UwacWindow *window, const char *name);
+UWAC_API void UwacWindowSetTitle(UwacWindow *window, const char *name);
 
 /**
  *
@@ -445,7 +451,7 @@ void UwacWindowSetTitle(UwacWindow *window, const char *name);
  * @param timeout
  * @return
  */
-int UwacDisplayDispatch(UwacDisplay *display, int timeout);
+UWAC_API int UwacDisplayDispatch(UwacDisplay *display, int timeout);
 
 /**
  *	Returns if you have some pending events, and you can UwacNextEvent() without blocking
@@ -453,7 +459,7 @@ int UwacDisplayDispatch(UwacDisplay *display, int timeout);
  * @param display the UwacDisplay
  * @return if there's some pending events
  */
-bool UwacHasEvent(UwacDisplay *display);
+UWAC_API bool UwacHasEvent(UwacDisplay *display);
 
 /** Waits until an event occurs, and when it's there copy the event from the queue to
  * event.
@@ -462,7 +468,7 @@ bool UwacHasEvent(UwacDisplay *display);
  * @param event the event to fill
  * @return if the operation completed successfully
  */
-UwacReturnCode UwacNextEvent(UwacDisplay *display, UwacEvent *event);
+UWAC_API UwacReturnCode UwacNextEvent(UwacDisplay *display, UwacEvent *event);
 
 
 /**
@@ -471,7 +477,7 @@ UwacReturnCode UwacNextEvent(UwacDisplay *display, UwacEvent *event);
  * @param seat the UwacSeat
  * @return the name of the seat
  */
-const char *UwacSeatGetName(const UwacSeat *seat);
+UWAC_API const char *UwacSeatGetName(const UwacSeat *seat);
 
 #ifdef __cplusplus
 }

winpr/include/winpr/comm.h

@@ -523,37 +523,37 @@ static const _SERIAL_IOCTL_NAME _SERIAL_IOCTL_NAMES[] =
 /**
  * FIXME: got a proper function name and place
  */
-const char* _comm_serial_ioctl_name(ULONG number);
+WINPR_API const char* _comm_serial_ioctl_name(ULONG number);
 
 /**
  * FIXME: got a proper function name and place
  */
-void _comm_setServerSerialDriver(HANDLE hComm, SERIAL_DRIVER_ID);
+WINPR_API void _comm_setServerSerialDriver(HANDLE hComm, SERIAL_DRIVER_ID);
 
 /**
  * FIXME: got a proper function name and place
  *
  * permissive mode is disabled by default.
  */
-BOOL _comm_set_permissive(HANDLE hDevice, BOOL permissive);
+WINPR_API BOOL _comm_set_permissive(HANDLE hDevice, BOOL permissive);
 
 
 /**
  * FIXME: to be moved in comm_ioctl.h
  */
-BOOL CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize,
+WINPR_API BOOL CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize,
 			LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
 
 /**
  * FIXME: to be moved in comm_io.h
  */
-BOOL CommReadFile(HANDLE hDevice, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
+WINPR_API BOOL CommReadFile(HANDLE hDevice, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
 		LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped);
 
 /**
  * FIXME: to be moved in comm_io.h
  */
-BOOL CommWriteFile(HANDLE hDevice, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite,
+WINPR_API BOOL CommWriteFile(HANDLE hDevice, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite,
 		LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped);
 
 #ifdef __cplusplus

winpr/include/winpr/crypto.h

@@ -500,9 +500,9 @@ WINPR_API PCCERT_CONTEXT CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD
 
 WINPR_API PCCERT_CONTEXT CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pPrevCertContext);
 
-DWORD CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,
+WINPR_API DWORD CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,
 		DWORD dwFlags, void* pvTypePara, LPWSTR pszNameString, DWORD cchNameString);
-DWORD CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType,
+WINPR_API DWORD CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType,
 		DWORD dwFlags, void* pvTypePara, LPSTR pszNameString, DWORD cchNameString);
 
 #ifdef __cplusplus

winpr/libwinpr/asn1/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-asn1"
-EXPORTS
-

winpr/libwinpr/com/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-com"
-EXPORTS

winpr/libwinpr/comm/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr"
-EXPORTS
-

winpr/libwinpr/credentials/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-credentials"
-EXPORTS

winpr/libwinpr/credui/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-credui"
-EXPORTS

winpr/libwinpr/crt/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-crt"
-EXPORTS

winpr/libwinpr/crypto/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-crypto"
-EXPORTS
-

winpr/libwinpr/dsparse/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-dsparse"
-EXPORTS
-

winpr/libwinpr/environment/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-environment"
-EXPORTS

winpr/libwinpr/error/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-error"
-EXPORTS
-

winpr/libwinpr/handle/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-handle"
-EXPORTS
-

winpr/libwinpr/heap/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-heap"
-EXPORTS

winpr/libwinpr/interlocked/module.def

@@ -1,14 +0,0 @@
-LIBRARY		"libwinpr-interlocked"
-EXPORTS
-	; Not required on windows > 5.1
-	; InterlockedCompareExchange64		@1
-	InitializeListHead			@2
-	IsListEmpty				@3
-	RemoveEntryList				@4
-	InsertHeadList				@5
-	RemoveHeadList				@6
-	InsertTailList				@7
-	RemoveTailList				@8
-	AppendTailList				@9
-	PushEntryList				@10
-	PopEntryList				@11

winpr/libwinpr/io/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-io"
-EXPORTS

winpr/libwinpr/library/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-library"
-EXPORTS
-

winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt

@@ -21,7 +21,7 @@ set(MODULE_PREFIX "TEST_LIBRARY_A")
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryA.c)
 
 if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
 endif()
 
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

winpr/libwinpr/library/test/TestLibraryA/module.def

@@ -1,4 +0,0 @@
-LIBRARY		"TestLibraryA"
-EXPORTS
-	FunctionA				@1
-	FunctionB				@2

winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt

@@ -21,7 +21,7 @@ set(MODULE_PREFIX "TEST_LIBRARY_B")
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} TestLibraryB.c)
 
 if(MSVC)
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS})
 endif()
 
 add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

winpr/libwinpr/library/test/TestLibraryB/module.def

@@ -1,4 +0,0 @@
-LIBRARY		"TestLibraryB"
-EXPORTS
-	FunctionA				@1
-	FunctionB				@2

winpr/libwinpr/locale/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-locale"
-EXPORTS

winpr/libwinpr/memory/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-memory"
-EXPORTS
-

winpr/libwinpr/nt/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-nt"
-EXPORTS
-

winpr/libwinpr/pipe/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-pipe"
-EXPORTS
-

winpr/libwinpr/pool/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-pool"
-EXPORTS
-

winpr/libwinpr/registry/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-registry"
-EXPORTS

winpr/libwinpr/rpc/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-rpc"
-EXPORTS
-

winpr/libwinpr/security/module.def

@@ -1,2 +0,0 @@
-LIBRARY		"libwinpr-security"
-EXPORTS

winpr/libwinpr/smartcard/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-smartcard"
-EXPORTS
-

winpr/libwinpr/sspi/module.def

@@ -1,34 +0,0 @@
-LIBRARY		"libwinpr-sspi"
-EXPORTS
-	AcceptSecurityContext
-	AcquireCredentialsHandleA
-	AcquireCredentialsHandleW
-	ApplyControlToken
-	CompleteAuthToken
-	DecryptMessage
-	DeleteSecurityContext
-	EncryptMessage
-	EnumerateSecurityPackagesA
-	EnumerateSecurityPackagesW
-	ExportSecurityContext
-	FreeContextBuffer
-	FreeCredentialsHandle
-	ImpersonateSecurityContext
-	ImportSecurityContextA
-	ImportSecurityContextW
-	InitSecurityInterfaceA
-	InitSecurityInterfaceW
-	InitializeSecurityContextA
-	InitializeSecurityContextW
-	MakeSignature
-	QueryContextAttributesA
-	QueryContextAttributesW
-	QueryCredentialsAttributesA
-	QueryCredentialsAttributesW
-	QuerySecurityContextToken
-	QuerySecurityPackageInfoA
-	QuerySecurityPackageInfoW
-	RevertSecurityContext
-	VerifySignature
-	InitSecurityInterfaceExA
-	InitSecurityInterfaceExW

winpr/libwinpr/sysinfo/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-sysinfo"
-EXPORTS
-

winpr/libwinpr/thread/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-thread"
-EXPORTS
-

winpr/libwinpr/utils/wlog/BinaryAppender.h

@@ -22,6 +22,6 @@
 
 #include "wlog.h"
 
-WINPR_API wLogAppender* WLog_BinaryAppender_New(wLog* log);
+wLogAppender* WLog_BinaryAppender_New(wLog* log);
 
 #endif /* WINPR_WLOG_BINARY_APPENDER_PRIVATE_H */

winpr/libwinpr/winsock/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-winsock"
-EXPORTS
-

winpr/libwinpr/wnd/module.def

@@ -1,3 +0,0 @@
-LIBRARY		"libwinpr-wnd"
-EXPORTS
-