mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[shadow,subsystem] refactor builtin loader

Browse Source
This commit is contained in:
Armin Novak 2023-06-12 21:29:19 +02:00 committed by akallabeth
parent 53023a0627
commit 3648c05c56
5 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/shadow/Mac/mac_shadow.c
View File

@ -656,7 +656,12 @@ static macShadowSubsystem* mac_shadow_subsystem_new(void)
return subsystem;
}
FREERDP_API int Mac_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
FREERDP_API const char* ShadowSubsystemName(void)
{
return "Mac";
}
FREERDP_API int ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
{
pEntryPoints->New = (pfnShadowSubsystemNew)mac_shadow_subsystem_new;
pEntryPoints->Free = (pfnShadowSubsystemFree)mac_shadow_subsystem_free;

1
server/shadow/Win/CMakeLists.txt
View File

@ -11,6 +11,7 @@ add_library(freerdp-shadow-subsystem-impl STATIC
win_wds.h
)
target_link_libraries(freerdp-shadow-subsystem-impl PRIVATE
freerdp-client
freerdp
winpr
)

7
server/shadow/Win/win_shadow.c
View File

@ -537,7 +537,12 @@ static rdpShadowSubsystem* win_shadow_subsystem_new(void)
return &subsystem->base;
}
FREERDP_API int Win_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
FREERDP_API const char* ShadowSubsystemName(void)
{
return "Win";
}
FREERDP_API int ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
{
pEntryPoints->New = win_shadow_subsystem_new;
pEntryPoints->Free = win_shadow_subsystem_free;

7
server/shadow/X11/x11_shadow.c
View File

@ -1483,7 +1483,12 @@ static void x11_shadow_subsystem_free(rdpShadowSubsystem* subsystem)
free(subsystem);
}
FREERDP_API int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
FREERDP_API const char* ShadowSubsystemName(void)
{
return "X11";
}
FREERDP_API int ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints)
{
if (!pEntryPoints)
return -1;

55
server/shadow/shadow_subsystem_builtin.c
View File

@ -22,60 +22,43 @@
typedef struct
{
const char* name;
const char* (*name)(void);
pfnShadowSubsystemEntry entry;
} RDP_SHADOW_SUBSYSTEM;
#ifdef WITH_SHADOW_X11
extern int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints);
#endif
#ifdef WITH_SHADOW_MAC
extern int Mac_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints);
#endif
#ifdef WITH_SHADOW_WIN
extern int Win_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints);
#endif
extern int ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints);
extern const char* ShadowSubsystemName(void);
static RDP_SHADOW_SUBSYSTEM g_Subsystems[] = {
#ifdef WITH_SHADOW_X11
{ "X11", X11_ShadowSubsystemEntry },
#endif
#ifdef WITH_SHADOW_MAC
{ "Mac", Mac_ShadowSubsystemEntry },
#endif
#ifdef WITH_SHADOW_WIN
{ "Win", Win_ShadowSubsystemEntry },
#endif
{ "", NULL }
{ ShadowSubsystemName, ShadowSubsystemEntry }
};
static int g_SubsystemCount = (sizeof(g_Subsystems) / sizeof(g_Subsystems[0]));
static size_t g_SubsystemCount = ARRAYSIZE(g_Subsystems);
static pfnShadowSubsystemEntry shadow_subsystem_load_static_entry(const char* name)
{
int index;
if (!name)
{
for (index = 0; index < g_SubsystemCount; index++)
for (size_t index = 0; index < g_SubsystemCount; index++)
{
if (g_Subsystems[index].name)
return g_Subsystems[index].entry;
const RDP_SHADOW_SUBSYSTEM* cur = &g_Subsystems[index];
WINPR_ASSERT(cur->entry);
return cur->entry;
}
return NULL;
}
for (index = 0; index < g_SubsystemCount; index++)
for (size_t index = 0; index < g_SubsystemCount; index++)
{
if (strcmp(name, g_Subsystems[index].name) == 0)
return g_Subsystems[index].entry;
const RDP_SHADOW_SUBSYSTEM* cur = &g_Subsystems[index];
WINPR_ASSERT(cur->name);
WINPR_ASSERT(cur->entry);
if (strcmp(name, cur->name()) == 0)
return cur->entry;
}
return NULL;
@ -83,9 +66,7 @@ static pfnShadowSubsystemEntry shadow_subsystem_load_static_entry(const char* na
void shadow_subsystem_set_entry_builtin(const char* name)
{
pfnShadowSubsystemEntry entry;
entry = shadow_subsystem_load_static_entry(name);
pfnShadowSubsystemEntry entry = shadow_subsystem_load_static_entry(name);
if (entry)
shadow_subsystem_set_entry(entry);