From 993756e5752e275af1b94e7ded9ef8b9ae250dbd Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 11 Sep 2024 21:50:30 +0200 Subject: [PATCH 1/3] [client,sdl] fix SDL3 compilation error --- client/SDL/SDL3/sdl_pointer.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/client/SDL/SDL3/sdl_pointer.cpp b/client/SDL/SDL3/sdl_pointer.cpp index 2e6a2a9d7..254dc38a0 100644 --- a/client/SDL/SDL3/sdl_pointer.cpp +++ b/client/SDL/SDL3/sdl_pointer.cpp @@ -186,10 +186,24 @@ static BOOL sdl_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y) BOOL sdl_register_pointer(rdpGraphics* graphics) { - const rdpPointer pointer = { - sizeof(sdlPointer), sdl_Pointer_New, sdl_Pointer_Free, sdl_Pointer_Set, sdl_Pointer_SetNull, - sdl_Pointer_SetDefault, sdl_Pointer_SetPosition, {}, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, - {}; + const rdpPointer pointer = { sizeof(sdlPointer), + sdl_Pointer_New, + sdl_Pointer_Free, + sdl_Pointer_Set, + sdl_Pointer_SetNull, + sdl_Pointer_SetDefault, + sdl_Pointer_SetPosition, + {}, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + nullptr, + nullptr, + {} }; graphics_register_pointer(graphics, &pointer); return TRUE; } From 3682e11e55d9022e5579b66efbd7595c69c5a143 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 11 Sep 2024 22:20:35 +0200 Subject: [PATCH 2/3] [primitives,test] use same parameter names use the same parameter names for declaration and implementation --- libfreerdp/primitives/test/prim_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libfreerdp/primitives/test/prim_test.c b/libfreerdp/primitives/test/prim_test.c index 78efbea66..5aafecb86 100644 --- a/libfreerdp/primitives/test/prim_test.c +++ b/libfreerdp/primitives/test/prim_test.c @@ -80,9 +80,9 @@ void prim_test_setup(BOOL performance) } BOOL speed_test(const char* name, const char* dsc, UINT32 iterations, speed_test_fkt generic, - speed_test_fkt optimised, ...) + speed_test_fkt optimized, ...) { - if (!name || !generic || !optimised || (iterations == 0)) + if (!name || !generic || !optimized || (iterations == 0)) return FALSE; for (UINT32 i = 0; i < iterations; i++) From 2175428df590e45d84828347fb6ba7f015aef6ac Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 11 Sep 2024 22:23:33 +0200 Subject: [PATCH 3/3] [client,SDL] default webview to off The AAD webview is currently not working as expected, disable until resolved. --- client/SDL/common/aad/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/SDL/common/aad/CMakeLists.txt b/client/SDL/common/aad/CMakeLists.txt index 260bb9229..cc46753d0 100644 --- a/client/SDL/common/aad/CMakeLists.txt +++ b/client/SDL/common/aad/CMakeLists.txt @@ -16,9 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. set(WITH_WEBVIEW_DEFAULT OFF) -if (UNIX AND NOT APPLE) - set(WITH_WEBVIEW_DEFAULT ON) -endif() option(WITH_WEBVIEW "Build with WebView support for AAD login popup browser" ${WITH_WEBVIEW_DEFAULT}) if (WITH_WEBVIEW)