github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] Invert WITH_FREERDP_3x_DEPRECATED

Browse Source 
API breaking change, with this logic the symbol needs to be manually
defined by an API user. So, to fix this:
* Rename to DROP_FREERDP_3x_DEPRECATED
* Invert logic, so a undefined value enables the symbols
This commit is contained in:
akallabeth 2025-03-06 10:46:25 +01:00
parent 52fec2cd03
commit 3186977e15
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
23 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -163,9 +163,14 @@ if(WITH_FREERDP_DEPRECATED)
add_compile_definitions(WITH_FREERDP_DEPRECATED)
endif()
option(WITH_FREERDP_3x_DEPRECATED "Build FreeRDP 3x deprecated symbols" ON)
option(WITHOUT_FREERDP_3x_DEPRECATED "Build FreeRDP 3x deprecated symbols" OFF)
if(WITH_FREERDP_3x_DEPRECATED)
add_compile_definitions(WITH_FREERDP_3x_DEPRECATED)
message(WARNING "WITH_FREERDP_3x_DEPRECATED has been replaced with WITHOUT_FREERDP_3x_DEPRECATED")
set(WITHOUT_FREERDP_3x_DEPRECATED OFF)
endif()
if(WITHOUT_FREERDP_3x_DEPRECATED)
add_compile_definitions(WITHOUT_FREERDP_3x_DEPRECATED)
endif()
option(WITH_FREERDP_DEPRECATED_COMMANDLINE "Build FreeRDP deprecated command line options" OFF)
@ -397,7 +402,7 @@ if(ANDROID)
set(PCSC_FEATURE_TYPE "DISABLED")
endif()
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAND_FEATURE_DESCRIPTION})
endif()
@ -529,7 +534,7 @@ include(CommonConfigOptions)
if(FREERDP_UNIFIED_BUILD)
add_subdirectory(winpr)
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
if(WITH_WAYLAND)
add_subdirectory(uwac)
endif()

2
client/CMakeLists.txt
View File

@ -47,7 +47,7 @@ if(FREERDP_VENDOR AND WITH_CLIENT)
if(APPLE)
if(IOS)
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/iOS")
message(STATUS "Adding iOS client")
add_subdirectory(iOS)

4
client/SDL/CMakeLists.txt
View File

@ -60,7 +60,7 @@ include(CMakeDependentOption)
find_package(SDL3)
cmake_dependent_option(WITH_CLIENT_SDL_VERSIONED "append sdl version to client binaries" OFF WITH_CLIENT_SDL OFF)
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
# Require 2.0.20 for ubuntu 22.04.
# older versions do not have the SDL2::SDL2 et al targets
find_package(SDL2 2.0.20)
@ -87,7 +87,7 @@ if((WITH_CLIENT_SDL2 AND SDL2_FOUND) OR (WITH_CLIENT_SDL3 AND SDL3_FOUND))
include_directories(common)
endif()
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
if(WITH_CLIENT_SDL2)
if(SDL2_FOUND)
add_subdirectory(SDL2)

4
include/CMakeLists.txt
View File

@ -17,10 +17,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
option(WITH_OPAQUE_SETTINGS "Hide rdpSettings struct definition, only allow getter/setter access" OFF)
else()
set(WITH_OPAQUE_SETTINGS ON CACHE INTERNAL "WITH_FREERDP_3x_DEPRECATED")
set(WITH_OPAQUE_SETTINGS ON CACHE INTERNAL "NOT WITHOUT_FREERDP_3x_DEPRECATED")
endif()
# prepare paths for C

2
include/freerdp/codecs.h
View File

@ -86,7 +86,7 @@ extern "C"
WINPR_ATTR_MALLOC(freerdp_client_codecs_free, 1)
FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
FREERDP_API void codecs_free(rdpCodecs* codecs));

6
include/freerdp/freerdp.h
View File

@ -569,7 +569,7 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_connect(freerdp* instance);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_abort_connect_context instead",
FREERDP_API BOOL freerdp_abort_connect(freerdp* instance));
#endif
@ -577,7 +577,7 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_abort_connect_context(rdpContext* context);
FREERDP_API HANDLE freerdp_abort_event(rdpContext* context);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_shall_disconnect_context instead",
FREERDP_API BOOL freerdp_shall_disconnect(freerdp* instance));
#endif
@ -595,7 +595,7 @@ owned by rdpRdp */
*/
FREERDP_API const char* freerdp_disconnect_reason_string(int reason);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_disconnect_before_reconnect_context instead",
FREERDP_API BOOL freerdp_disconnect_before_reconnect(freerdp* instance));
#endif

2
include/freerdp/locale/keyboard.h
View File

@ -262,7 +262,7 @@ FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardL
*/
FREERDP_API DWORD freerdp_keyboard_get_layout_id_from_name(const char* name);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("since 3.11.0, implement yourself in client",
FREERDP_API DWORD freerdp_keyboard_init(DWORD keyboardLayoutId));

2
include/freerdp/server/proxy/proxy_config.h
View File

@ -86,7 +86,7 @@ extern "C"
size_t InterceptCount;
/* clipboard specific settings */
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", BOOL TextOnly);
WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", UINT32 MaxTextLength);

4
include/freerdp/server/shadow.h
View File

@ -303,7 +303,7 @@ extern "C"
FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR(
"[since 3.4.0] Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data(
@ -349,7 +349,7 @@ extern "C"
FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.4.0] Use shadow_capture_compare_with_format",
FREERDP_API int shadow_capture_compare(
const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,

4
libfreerdp/common/settings_getters.c
View File

@ -2002,7 +2002,7 @@ UINT32 freerdp_settings_get_uint32(WINPR_ATTR_UNUSED const rdpSettings* settings
case FreeRDP_VCFlags:
return settings->VCFlags;
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
// API Compatibility section, remove with FreeRDP 4.x
case (FreeRDP_Settings_Keys_UInt32)FreeRDP_MonitorLocalShiftX:
return (UINT32)settings->MonitorLocalShiftX;
@ -2533,7 +2533,7 @@ BOOL freerdp_settings_set_uint32(WINPR_ATTR_UNUSED rdpSettings* settings,
settings->VCFlags = cnv.c;
break;
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
// API Compatibility section, remove with FreeRDP 4.x
case FreeRDP_MonitorLocalShiftX:
settings->MonitorLocalShiftX = (int32_t)cnv.c;

2
libfreerdp/core/codecs.c
View File

@ -239,7 +239,7 @@ BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags, UINT32 width,
return rc;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
rdpCodecs* codecs_new(rdpContext* context)
{
if (!context || !context->settings)

6
libfreerdp/core/freerdp.c
View File

@ -299,7 +299,7 @@ freerdp_connect_finally:
return status;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
BOOL freerdp_abort_connect(freerdp* instance)
{
if (!instance)
@ -638,7 +638,7 @@ BOOL freerdp_disconnect(freerdp* instance)
return rc;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
BOOL freerdp_disconnect_before_reconnect(freerdp* instance)
{
WINPR_ASSERT(instance);
@ -673,7 +673,7 @@ BOOL freerdp_reconnect(freerdp* instance)
return rdp_client_reconnect(rdp);
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
BOOL freerdp_shall_disconnect(freerdp* instance)
{
if (!instance)

6
libfreerdp/locale/CMakeLists.txt
View File

@ -20,7 +20,7 @@ set(MODULE_PREFIX "FREERDP_LOCALE")
set(SRCS keyboard_layout.c keyboard.c locale.c liblocale.h)
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
set(X11_SRCS keyboard_x11.c keyboard_x11.h xkb_layout_ids.c xkb_layout_ids.h)
set(XKBFILE_SRCS keyboard_xkbfile.c keyboard_xkbfile.h)
@ -54,7 +54,7 @@ if(APPLE)
freerdp_library_add(${CORE_FOUNDATION})
endif()
if(WITH_X11 AND WITH_FREERDP_3x_DEPRECATED)
if(WITH_X11 AND NOT WITHOUT_FREERDP_3x_DEPRECATED)
find_package(X11 REQUIRED)
freerdp_definition_add(WITH_X11)
@ -77,7 +77,7 @@ if(WITH_X11 AND WITH_FREERDP_3x_DEPRECATED)
endif()
endif()
if(WITH_WAYLAND AND WITH_FREERDP_3x_DEPRECATED)
if(WITH_WAYLAND AND NOT WITHOUT_FREERDP_3x_DEPRECATED)
freerdp_definition_add(WITH_WAYLAND)
endif()

8
libfreerdp/locale/keyboard.c
View File

@ -35,7 +35,7 @@
#include "liblocale.h"
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
#define TAG FREERDP_TAG("locale.keyboard")
#if defined(__MACOSX__)
@ -52,7 +52,7 @@
#endif
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
static WINPR_KEYCODE_TYPE maptype = WINPR_KEYCODE_TYPE_NONE;
static DWORD VIRTUAL_SCANCODE_TO_X11_KEYCODE[256][2] = { 0 };
static DWORD X11_KEYCODE_TO_VIRTUAL_SCANCODE[256] = { 0 };
@ -230,7 +230,7 @@ static const struct scancode_map_entry RDP_SCANCODE_MAP[] = {
{ RDP_SCANCODE_LAUNCH_APP2, "VK_LAUNCH_APP2" },
};
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
static int freerdp_detect_keyboard(DWORD* keyboardLayoutId)
{
#if defined(_WIN32)
@ -401,7 +401,7 @@ fail:
return remap_table;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId, const char* keyboardRemappingList)
{
DWORD res = freerdp_keyboard_init(keyboardLayoutId);

2
libfreerdp/locale/keyboard_x11.h
View File

@ -22,7 +22,7 @@
#include <freerdp/api.h>
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
FREERDP_LOCAL int freerdp_detect_keyboard_layout_from_xkb(DWORD* keyboardLayoutId);
#endif

6
libfreerdp/locale/test/TestLocaleKeyboard.c
View File

@ -248,7 +248,7 @@ static DWORD get_random(DWORD offset)
return x;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
static BOOL test_scancode_cnv(void)
{
for (DWORD x = 0; x < UINT8_MAX; x++)
@ -327,7 +327,7 @@ static BOOL test_codepages(void)
static BOOL test_init(void)
{
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
const DWORD kbd = freerdp_keyboard_init(0);
if (kbd == 0)
{
@ -386,7 +386,7 @@ int TestLocaleKeyboard(int argc, char* argv[])
~(RDP_KEYBOARD_LAYOUT_TYPE_STANDARD | RDP_KEYBOARD_LAYOUT_TYPE_VARIANT |
RDP_KEYBOARD_LAYOUT_TYPE_IME)))
return -1;
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
if (!test_scancode_cnv())
return -1;
#endif

2
libfreerdp/locale/xkb_layout_ids.h
View File

@ -23,7 +23,7 @@
#include <freerdp/types.h>
#include <freerdp/api.h>
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
FREERDP_LOCAL UINT32 find_keyboard_layout_in_xorg_rules(const char* layout, const char* variant);
#endif

2
server/shadow/shadow_capture.c
View File

@ -76,7 +76,7 @@ int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip)
return 1;
}
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
int shadow_capture_compare(const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,
UINT32 nHeight, const BYTE* WINPR_RESTRICT pData2, UINT32 nStep2,
RECTANGLE_16* WINPR_RESTRICT rect)

2
server/shadow/shadow_subsystem.c
View File

@ -189,7 +189,7 @@ UINT32 shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors)
* and andmask data and fill into SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE
* Caller should free the andMaskData and xorMaskData later.
*/
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
int shadow_subsystem_pointer_convert_alpha_pointer_data(
const BYTE* WINPR_RESTRICT pixels, BOOL premultiplied, UINT32 width, UINT32 height,
SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor)

4
tools/update-settings-tests
View File

@ -101,7 +101,7 @@ def write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, e
cast = '(void*)'
write_getter_case(f, val, cast, None)
if compat_values:
f.write('#if defined(WITH_FREERDP_3x_DEPRECATED)\n')
f.write('#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)\n')
for i in range(len(compat_values)):
val = compat_values[i]
cast = '(' + entry_type + ')'
@ -219,7 +219,7 @@ def write_setter(f, entry_dict, entry_type, entry_name, postfix, compat_dict):
cast = '(' + k + ')'
write_setter_case(f, val, postfix, isPointer, cast)
if compat_values:
f.write('#if defined(WITH_FREERDP_3x_DEPRECATED)\n')
f.write('#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)\n')
for val in compat_values:
cast = '(int32_t)'
f.write('\t\t// API Compatibility section, remove with FreeRDP 4.x\n')

2
winpr/include/winpr/custom-crypto.h
View File

@ -264,7 +264,7 @@ extern "C"
WINPR_API void winpr_Cipher_Free(WINPR_CIPHER_CTX* ctx);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.10.0] use winpr_Cipher_NewEx",
WINPR_ATTR_MALLOC(winpr_Cipher_Free, 1)
WINPR_API WINPR_CIPHER_CTX* winpr_Cipher_New(WINPR_CIPHER_TYPE cipher,

2
winpr/libwinpr/crypto/cipher.c
View File

@ -574,7 +574,7 @@ mbedtls_cipher_type_t winpr_mbedtls_get_cipher_type(int cipher)
}
#endif
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_CIPHER_CTX* winpr_Cipher_New(WINPR_CIPHER_TYPE cipher, WINPR_CRYPTO_OPERATION op,
const void* key, const void* iv)
{

4
winpr/libwinpr/crypto/test/TestCryptoCipher.c
View File

@ -23,7 +23,7 @@ static BOOL test_crypto_cipher_aes_128_cbc(BOOL ex)
if (ex)
ctx = winpr_Cipher_NewEx(WINPR_CIPHER_AES_128_CBC, WINPR_ENCRYPT, key, sizeof(key), iv,
sizeof(iv));
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
else
ctx = winpr_Cipher_New(WINPR_CIPHER_AES_128_CBC, WINPR_ENCRYPT, key, iv);
#endif
@ -69,7 +69,7 @@ static BOOL test_crypto_cipher_aes_128_cbc(BOOL ex)
if (ex)
ctx = winpr_Cipher_NewEx(WINPR_CIPHER_AES_128_CBC, WINPR_DECRYPT, key, sizeof(key), iv,
sizeof(iv));
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
else
ctx = winpr_Cipher_New(WINPR_CIPHER_AES_128_CBC, WINPR_DECRYPT, key, iv);