morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use a client/common context component

Browse Source 
* Allows moving common client code from specific client to a
  generic client/common implementation
This commit is contained in:
akallabeth
2022-01-19 09:27:39 +01:00
committed by akallabeth
parent c4e14f7fd6
commit 7641710f60
41 changed files with 696 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/Android/android_freerdp.c
View File

@@ -71,19 +71,20 @@ static void android_OnChannelConnectedEventHandler(void* context,
}
afc = (androidContext*)context;
settings = afc->rdpCtx.settings;
settings = afc->common.context.settings;
if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) == 0)
{
if (settings->SoftwareGdi)
{
gdi_graphics_pipeline_init(afc->rdpCtx.gdi, (RdpgfxClientContext*)e->pInterface);
}
else
{
WLog_WARN(TAG, "GFX without software GDI requested. "
" This is not supported, add /gdi:sw");
gdi_graphics_pipeline_init(afc->common.context.gdi,
(RdpgfxClientContext*)e->pInterface);
}
else
{
WLog_WARN(TAG, "GFX without software GDI requested. "
" This is not supported, add /gdi:sw");
}
}
else if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0)
{
@@ -104,19 +105,20 @@ static void android_OnChannelDisconnectedEventHandler(void* context,
}
afc = (androidContext*)context;
settings = afc->rdpCtx.settings;
settings = afc->common.context.settings;
if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) == 0)
{
if (settings->SoftwareGdi)
{
gdi_graphics_pipeline_uninit(afc->rdpCtx.gdi, (RdpgfxClientContext*)e->pInterface);
}
else
{
WLog_WARN(TAG, "GFX without software GDI requested. "
" This is not supported, add /gdi:sw");
gdi_graphics_pipeline_uninit(afc->common.context.gdi,
(RdpgfxClientContext*)e->pInterface);
}
else
{
WLog_WARN(TAG, "GFX without software GDI requested. "
" This is not supported, add /gdi:sw");
}
}
else if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0)
{
@@ -153,7 +155,7 @@ static BOOL android_end_paint(rdpContext* context)
if (!gdi || !gdi->primary || !gdi->primary->hdc)
return FALSE;
hwnd = ctx->rdpCtx.gdi->primary->hdc->hwnd;
hwnd = ctx->common.context.gdi->primary->hdc->hwnd;
if (!hwnd)
return FALSE;
@@ -528,7 +530,7 @@ static int android_freerdp_run(freerdp* instance)
count += tmp;
status = WaitForMultipleObjects(count, handles, FALSE, INFINITE);
if ((status == WAIT_FAILED))
if (status == WAIT_FAILED)
{
WLog_ERR(TAG, "WaitForMultipleObjects failed with %" PRIu32 " [%08lX]", status,
GetLastError());

2
client/Android/android_freerdp.h
View File

@@ -23,7 +23,7 @@
typedef struct
{
rdpContext rdpCtx;
rdpClientContext common;
ANDROID_EVENT_QUEUE* event_queue;
HANDLE thread;