diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c06531e2..99f50fd89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,10 @@ if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS ON) endif() +if(NOT DEFINED EXPORT_ALL_SYMBOLS) + set(EXPORT_ALL_SYMBOLS TRUE) +endif() + # Configure MSVC Runtime if(MSVC) include(MSVCRuntime) @@ -95,6 +99,10 @@ if(CMAKE_COMPILER_IS_GNUCC) if(Wno-deprecated-declarations) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") endif() + if(NOT EXPORT_ALL_SYMBOLS) + message(STATUS "GCC default symbol visibility: hidden") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") + endif() if(BUILD_TESTING) CHECK_C_COMPILER_FLAG(-Wno-format Wno-format) if(Wno-format) diff --git a/include/freerdp/codec/jpeg.h b/include/freerdp/codec/jpeg.h index fdbe549ad..637cdc62d 100644 --- a/include/freerdp/codec/jpeg.h +++ b/include/freerdp/codec/jpeg.h @@ -17,12 +17,12 @@ * limitations under the License. */ -#ifndef __JPEG_H -#define __JPEG_H +#ifndef FREERDP_CODEC_JPEG_H +#define FREERDP_CODEC_JPEG_H +#include #include -BOOL -jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp); +FREERDP_API BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp); -#endif /* __BITMAP_H */ +#endif /* FREERDP_CODEC_JPEG_H */ diff --git a/libfreerdp/codec/jpeg.c b/libfreerdp/codec/jpeg.c index 58ebeb239..13b1fbcdc 100644 --- a/libfreerdp/codec/jpeg.c +++ b/libfreerdp/codec/jpeg.c @@ -23,8 +23,11 @@ #include #include + #include +#include + #ifdef WITH_JPEG #define XMD_H @@ -122,8 +125,7 @@ do_decompress(char* comp_data, int comp_data_bytes, } /* jpeg decompress */ -BOOL -jpeg_decompress(BYTE * input, BYTE * output, int width, int height, int size, int bpp) +BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp) { int lwidth; int lheight; @@ -149,8 +151,7 @@ jpeg_decompress(BYTE * input, BYTE * output, int width, int height, int size, in #else -BOOL -jpeg_decompress(BYTE * input, BYTE * output, int width, int height, int size, int bpp) +BOOL jpeg_decompress(BYTE* input, BYTE* output, int width, int height, int size, int bpp) { return 0; } diff --git a/winpr/include/winpr/file.h b/winpr/include/winpr/file.h index a25f5d85b..1f205e778 100644 --- a/winpr/include/winpr/file.h +++ b/winpr/include/winpr/file.h @@ -243,18 +243,18 @@ WINPR_API BOOL UnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffse WINPR_API BOOL UnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped); -HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData); -HANDLE FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData); +WINPR_API HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData); +WINPR_API HANDLE FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData); -HANDLE FindFirstFileExA(LPCSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, LPVOID lpFindFileData, +WINPR_API HANDLE FindFirstFileExA(LPCSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, LPVOID lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, LPVOID lpSearchFilter, DWORD dwAdditionalFlags); -HANDLE FindFirstFileExW(LPCWSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, LPVOID lpFindFileData, +WINPR_API HANDLE FindFirstFileExW(LPCWSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, LPVOID lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, LPVOID lpSearchFilter, DWORD dwAdditionalFlags); -BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData); -BOOL FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData); +WINPR_API BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData); +WINPR_API BOOL FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData); -BOOL FindClose(HANDLE hFindFile); +WINPR_API BOOL FindClose(HANDLE hFindFile); #ifdef UNICODE #define CreateFile CreateFileW diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h index 6320472e8..1f1194b84 100644 --- a/winpr/include/winpr/sspi.h +++ b/winpr/include/winpr/sspi.h @@ -905,8 +905,8 @@ typedef PSecurityFunctionTableW (SEC_ENTRY * INIT_SECURITY_INTERFACE_W)(void); WINPR_API SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(ULONG* pcPackages, PSecPkgInfoA* ppPackageInfo); WINPR_API SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesW(ULONG* pcPackages, PSecPkgInfoW* ppPackageInfo); -PSecurityFunctionTableA SEC_ENTRY InitSecurityInterfaceA(void); -PSecurityFunctionTableW SEC_ENTRY InitSecurityInterfaceW(void); +WINPR_API PSecurityFunctionTableA SEC_ENTRY InitSecurityInterfaceA(void); +WINPR_API PSecurityFunctionTableW SEC_ENTRY InitSecurityInterfaceW(void); WINPR_API SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoA(SEC_CHAR* pszPackageName, PSecPkgInfoA* ppPackageInfo); WINPR_API SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageName, PSecPkgInfoW* ppPackageInfo); diff --git a/winpr/libwinpr/file/test/TestFileFindFirstFile.c b/winpr/libwinpr/file/test/TestFileFindFirstFile.c index 1e17e1a6f..ff39da9b2 100644 --- a/winpr/libwinpr/file/test/TestFileFindFirstFile.c +++ b/winpr/libwinpr/file/test/TestFileFindFirstFile.c @@ -7,8 +7,6 @@ #include static TCHAR testFile1[] = _T("TestFile1"); -static TCHAR testFile2[] = _T("TestFile2"); -static TCHAR testFile3[] = _T("TestFile3"); int TestFileFindFirstFile(int argc, char* argv[]) { diff --git a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt index f66d29a09..b02369682 100644 --- a/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt +++ b/winpr/libwinpr/library/test/TestLibraryA/CMakeLists.txt @@ -27,7 +27,6 @@ endif() add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") - -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "${TEST_AREA}/${MODULE_NAME}/") +set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}/${TEST_AREA}/${MODULE_NAME}") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test/Extra") diff --git a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt index 1c095d55b..45f4c70b8 100644 --- a/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt +++ b/winpr/libwinpr/library/test/TestLibraryB/CMakeLists.txt @@ -27,7 +27,7 @@ endif() add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "") - -set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "${TEST_AREA}/${MODULE_NAME}/") +set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}/${TEST_AREA}/${MODULE_NAME}") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test/Extra") +