uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

rail: proxy rail

Browse Source
master
Jay Sorg 13 years ago
parent 7dc5a77116
commit dc6be76b11
9 changed files with 911 additions and 182 deletions
Show Stats Download Patch File Download Diff File

147
common/xrdp_rail.h
Unescape View File

@ -0,0 +1,147 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
* Copyright (C) Jay Sorg 2012
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(_RAIL_H)
#define _RAIL_H
/*
ORDER_TYPE_WINDOW
WINDOW_ORDER_TYPE_WINDOW
WINDOW_ORDER_ICON
WINDOW_ORDER_CACHED_ICON
WINDOW_ORDER_STATE_DELETED
WINDOW_ORDER_STATE_NEW on
WINDOW_ORDER_STATE_NEW off
WINDOW_ORDER_TYPE_NOTIFY
WINDOW_ORDER_STATE_DELETED
WINDOW_ORDER_STATE_NEW on
WINDOW_ORDER_STATE_NEW off
WINDOW_ORDER_TYPE_DESKTOP
WINDOW_ORDER_FIELD_DESKTOP_NONE on
WINDOW_ORDER_FIELD_DESKTOP_NONE off
*/
/* Window Order Header Flags */
#define WINDOW_ORDER_TYPE_WINDOW 0x01000000
#define WINDOW_ORDER_TYPE_NOTIFY 0x02000000
#define WINDOW_ORDER_TYPE_DESKTOP 0x04000000
#define WINDOW_ORDER_STATE_NEW 0x10000000
#define WINDOW_ORDER_STATE_DELETED 0x20000000
#define WINDOW_ORDER_FIELD_OWNER 0x00000002
#define WINDOW_ORDER_FIELD_STYLE 0x00000008
#define WINDOW_ORDER_FIELD_SHOW 0x00000010
#define WINDOW_ORDER_FIELD_TITLE 0x00000004
#define WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET 0x00004000
#define WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE 0x00010000
#define WINDOW_ORDER_FIELD_RP_CONTENT 0x00020000
#define WINDOW_ORDER_FIELD_ROOT_PARENT 0x00040000
#define WINDOW_ORDER_FIELD_WND_OFFSET 0x00000800
#define WINDOW_ORDER_FIELD_WND_CLIENT_DELTA 0x00008000
#define WINDOW_ORDER_FIELD_WND_SIZE 0x00000400
#define WINDOW_ORDER_FIELD_WND_RECTS 0x00000100
#define WINDOW_ORDER_FIELD_VIS_OFFSET 0x00001000
#define WINDOW_ORDER_FIELD_VISIBILITY 0x00000200
#define WINDOW_ORDER_FIELD_ICON_BIG 0x00002000
#define WINDOW_ORDER_ICON 0x40000000
#define WINDOW_ORDER_CACHED_ICON 0x80000000
#define WINDOW_ORDER_FIELD_NOTIFY_VERSION 0x00000008
#define WINDOW_ORDER_FIELD_NOTIFY_TIP 0x00000001
#define WINDOW_ORDER_FIELD_NOTIFY_INFO_TIP 0x00000002
#define WINDOW_ORDER_FIELD_NOTIFY_STATE 0x00000004
#define WINDOW_ORDER_FIELD_DESKTOP_NONE 0x00000001
#define WINDOW_ORDER_FIELD_DESKTOP_HOOKED 0x00000002
#define WINDOW_ORDER_FIELD_DESKTOP_ARC_COMPLETED 0x00000004
#define WINDOW_ORDER_FIELD_DESKTOP_ARC_BEGAN 0x00000008
#define WINDOW_ORDER_FIELD_DESKTOP_ZORDER 0x00000010
#define WINDOW_ORDER_FIELD_DESKTOP_ACTIVE_WND 0x00000020
struct rail_icon_info
{
int bpp;
int width;
int height;
int cmap_bytes;
int mask_bytes;
int data_bytes;
char* mask;
char* cmap;
char* data;
};
struct rail_window_rect
{
short left;
short top;
short right;
short bottom;
};
struct rail_notify_icon_infotip
{
int timeout;
int flags;
char* text;
char* title;
};
struct rail_window_state_order
{
int owner_window_id;
int style;
int extended_style;
int show_state;
char* title_info;
int client_offset_x;
int client_offset_y;
int client_area_width;
int client_area_height;
int rp_content;
int root_parent_handle;
int window_offset_x;
int window_offset_y;
int window_client_delta_x;
int window_client_delta_y;
int window_width;
int window_height;
int num_window_rects;
struct rail_window_rect* window_rects;
int visible_offset_x;
int visible_offset_y;
int num_visibility_rects;
struct rail_window_rect* visibility_rects;
};
struct rail_notify_state_order
{
int version;
char* tool_tip;
struct rail_notify_icon_infotip infotip;
int state;
int icon_cache_entry;
int icon_cache_id;
struct rail_icon_info icon_info;
};
struct rail_monitored_desktop_order
{
int active_window_id;
int num_window_ids;
int* window_ids;
};
#endif

321
freerdp1/xrdp-freerdp.c
Unescape View File

@ -19,6 +19,7 @@
#include "xrdp-freerdp.h" #include "xrdp-freerdp.h"
#include "xrdp-color.h" #include "xrdp-color.h"
#include "xrdp_rail.h"
#define LOG_LEVEL 1 #define LOG_LEVEL 1
#define LLOG(_level, _args) \ #define LLOG(_level, _args) \
@ -228,8 +229,8 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
*/ */
rectangle->left = (param1 >> 16) & 0xffff; rectangle->left = (param1 >> 16) & 0xffff;
rectangle->top = param1 & 0xffff; rectangle->top = param1 & 0xffff;
rectangle->right = (param2 >> 16) & 0xffff + rectangle->left - 1; rectangle->right = (((param2 >> 16) & 0xffff) + rectangle->left) - 1;
rectangle->bottom = param2 & 0xffff + rectangle->top - 1; rectangle->bottom = ((param2 & 0xffff) + rectangle->top) - 1;
if (mod->inst->settings->refresh_rect) if (mod->inst->settings->refresh_rect)
{ {
if (mod->inst->update != NULL) if (mod->inst->update != NULL)
@ -279,13 +280,14 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
switch (flags & 3) switch (flags & 3)
{ {
case 3: case 3:
mod->inst->SendChannelData(mod->inst, lchid, data, total_size); mod->inst->SendChannelData(mod->inst, lchid, (tui8*)data, total_size);
break; break;
case 2: case 2:
/* end */ /* end */
g_memcpy(mod->chan_buf + mod->chan_buf_valid, data, size); g_memcpy(mod->chan_buf + mod->chan_buf_valid, data, size);
mod->chan_buf_valid += size; mod->chan_buf_valid += size;
mod->inst->SendChannelData(mod->inst, lchid, mod->chan_buf, total_size); mod->inst->SendChannelData(mod->inst, lchid, (tui8*)(mod->chan_buf),
total_size);
g_free(mod->chan_buf); g_free(mod->chan_buf);
mod->chan_buf = 0; mod->chan_buf = 0;
mod->chan_buf_bytes = 0; mod->chan_buf_bytes = 0;
@ -391,6 +393,7 @@ lxrdp_set_param(struct mod* mod, char* name, char* value)
} }
else if (g_strcmp(name, "client_info") == 0) else if (g_strcmp(name, "client_info") == 0)
{ {
g_memcpy(&(mod->client_info), value, sizeof(mod->client_info));
/* This is a Struct and cannot be printed in next else*/ /* This is a Struct and cannot be printed in next else*/
LLOGLN(10, ("Client_info struct ignored")); LLOGLN(10, ("Client_info struct ignored"));
} }
@ -509,10 +512,10 @@ lfreerdp_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap)
int j; int j;
int line_bytes; int line_bytes;
BITMAP_DATA* bd; BITMAP_DATA* bd;
tui8* dst_data; char* dst_data;
tui8* dst_data1; char* dst_data1;
tui8* src; char* src;
tui8* dst; char* dst;
mod = ((struct mod_context*)context)->modi; mod = ((struct mod_context*)context)->modi;
LLOGLN(10, ("lfreerdp_bitmap_update: %d %d", bitmap->number, bitmap->count)); LLOGLN(10, ("lfreerdp_bitmap_update: %d %d", bitmap->number, bitmap->count));
@ -527,15 +530,15 @@ lfreerdp_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap)
cx = (bd->destRight - bd->destLeft) + 1; cx = (bd->destRight - bd->destLeft) + 1;
cy = (bd->destBottom - bd->destTop) + 1; cy = (bd->destBottom - bd->destTop) + 1;
line_bytes = server_Bpp * bd->width; line_bytes = server_Bpp * bd->width;
dst_data = (tui8*)g_malloc(bd->height * line_bytes + 16, 0); dst_data = (char*)g_malloc(bd->height * line_bytes + 16, 0);
if (bd->compressed) if (bd->compressed)
{ {
bitmap_decompress(bd->bitmapDataStream, dst_data, bd->width, bitmap_decompress(bd->bitmapDataStream, (tui8*)dst_data, bd->width,
bd->height, bd->bitmapLength, server_bpp, server_bpp); bd->height, bd->bitmapLength, server_bpp, server_bpp);
} }
else else
{ /* bitmap is upside down */ { /* bitmap is upside down */
src = bd->bitmapDataStream; src = (char*)(bd->bitmapDataStream);
dst = dst_data + bd->height * line_bytes; dst = dst_data + bd->height * line_bytes;
for (j = 0; j < bd->height; j++) for (j = 0; j < bd->height; j++)
{ {
@ -614,7 +617,8 @@ lfreerdp_pat_blt(rdpContext* context, PATBLT_ORDER* patblt)
else else
{ {
mod->server_set_brush(mod, patblt->brush.x, patblt->brush.y, mod->server_set_brush(mod, patblt->brush.x, patblt->brush.y,
patblt->brush.style, patblt->brush.p8x8); patblt->brush.style,
(char*)(patblt->brush.p8x8));
} }
mod->server_fill_rect(mod, patblt->nLeftRect, patblt->nTopRect, mod->server_fill_rect(mod, patblt->nLeftRect, patblt->nTopRect,
patblt->nWidth, patblt->nHeight); patblt->nWidth, patblt->nHeight);
@ -728,7 +732,7 @@ lfreerdp_glyph_index(rdpContext* context, GLYPH_INDEX_ORDER* glyph_index)
glyph_index->opLeft, glyph_index->opTop, glyph_index->opLeft, glyph_index->opTop,
glyph_index->opRight, glyph_index->opBottom, glyph_index->opRight, glyph_index->opBottom,
glyph_index->x, glyph_index->y, glyph_index->x, glyph_index->y,
glyph_index->data, glyph_index->cbData); (char*)(glyph_index->data), glyph_index->cbData);
} }
/******************************************************************************/ /******************************************************************************/
@ -845,14 +849,14 @@ lfreerdp_cache_bitmapV2(rdpContext* context,
if (cache_bitmap_v2_order->compressed) if (cache_bitmap_v2_order->compressed)
{ {
bitmap_decompress(cache_bitmap_v2_order->bitmapDataStream, bitmap_decompress(cache_bitmap_v2_order->bitmapDataStream,
dst_data, width, height, (tui8*)dst_data, width, height,
cache_bitmap_v2_order->bitmapLength, cache_bitmap_v2_order->bitmapLength,
server_bpp, server_bpp); server_bpp, server_bpp);
} }
else else
{ {
/* Uncompressed bitmaps are upside down */ /* Uncompressed bitmaps are upside down */
lfreerdp_upsidedown(dst_data, cache_bitmap_v2_order, server_Bpp); lfreerdp_upsidedown((tui8*)dst_data, cache_bitmap_v2_order, server_Bpp);
LLOGLN(10, ("lfreerdp_cache_bitmapV2: upside down progressed")); LLOGLN(10, ("lfreerdp_cache_bitmapV2: upside down progressed"));
} }
dst_data1 = convert_bitmap(server_bpp, client_bpp, dst_data, dst_data1 = convert_bitmap(server_bpp, client_bpp, dst_data,
@ -883,7 +887,7 @@ lfreerdp_cache_glyph(rdpContext* context, CACHE_GLYPH_ORDER* cache_glyph_order)
LLOGLN(10, (" %d %d %d %d %d", gd->cacheIndex, gd->x, gd->y, LLOGLN(10, (" %d %d %d %d %d", gd->cacheIndex, gd->x, gd->y,
gd->cx, gd->cy)); gd->cx, gd->cy));
mod->server_add_char(mod, cache_glyph_order->cacheId, gd->cacheIndex, mod->server_add_char(mod, cache_glyph_order->cacheId, gd->cacheIndex,
gd->x, gd->y, gd->cx, gd->cy, gd->aj); gd->x, gd->y, gd->cx, gd->cy, (char*)(gd->aj));
xfree(gd->aj); xfree(gd->aj);
gd->aj = 0; gd->aj = 0;
xfree(gd); xfree(gd);
@ -1089,14 +1093,14 @@ lfreerdp_pointer_new(rdpContext* context,
mod->pointer_cache[index].hotx = pointer_new->colorPtrAttr.xPos; mod->pointer_cache[index].hotx = pointer_new->colorPtrAttr.xPos;
mod->pointer_cache[index].hoty = pointer_new->colorPtrAttr.yPos; mod->pointer_cache[index].hoty = pointer_new->colorPtrAttr.yPos;
dst = mod->pointer_cache[index].data; dst = (tui8*)(mod->pointer_cache[index].data);
dst += 32 * 32 * 3 - 32 * 3; dst += 32 * 32 * 3 - 32 * 3;
src = pointer_new->colorPtrAttr.xorMaskData; src = pointer_new->colorPtrAttr.xorMaskData;
lfreerdp_convert_color_image(dst, 32, 32, 24, 32 * -3, lfreerdp_convert_color_image(dst, 32, 32, 24, 32 * -3,
src, 32, 32, 1, 32 / 8); src, 32, 32, 1, 32 / 8);
dst = mod->pointer_cache[index].mask; dst = (tui8*)(mod->pointer_cache[index].mask);
dst += 32 * 32 / 8 - 32 / 8; dst +=( 32 * 32 / 8) - (32 / 8);
src = pointer_new->colorPtrAttr.andMaskData; src = pointer_new->colorPtrAttr.andMaskData;
lfreerdp_convert_color_image(dst, 32, 32, 1, 32 / -8, lfreerdp_convert_color_image(dst, 32, 32, 1, 32 / -8,
src, 32, 32, 1, 32 / 8); src, 32, 32, 1, 32 / 8);
@ -1205,6 +1209,14 @@ lfreerdp_pre_connect(freerdp* instance)
instance->settings->username = g_strdup(mod->username); instance->settings->username = g_strdup(mod->username);
instance->settings->password = g_strdup(mod->password); instance->settings->password = g_strdup(mod->password);
if (mod->client_info.rail_support_level > 0)
{
instance->settings->remote_app = true;
instance->settings->rail_langbar_supported = true;
instance->settings->workarea = true;
instance->settings->performance_flags = PERF_DISABLE_WALLPAPER | PERF_DISABLE_FULLWINDOWDRAG;
}
// here // here
//instance->settings->rdp_version = 4; //instance->settings->rdp_version = 4;
@ -1245,6 +1257,263 @@ lfreerdp_pre_connect(freerdp* instance)
return true; return true;
} }
/*****************************************************************************/
void DEFAULT_CC
lrail_WindowCreate(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
WINDOW_STATE_ORDER* window_state)
{
int index;
struct mod* mod;
struct rail_window_state_order wso;
UNICONV* uniconv;
LLOGLN(0, ("llrail_WindowCreate:"));
uniconv = freerdp_uniconv_new();
mod = ((struct mod_context*)context)->modi;
memset(&wso, 0, sizeof(wso));
/* copy the window state order */
wso.owner_window_id = window_state->ownerWindowId;
wso.style = window_state->style;
wso.extended_style = window_state->extendedStyle;
wso.show_state = window_state->showState;
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_TITLE)
{
wso.title_info = freerdp_uniconv_in(uniconv,
window_state->titleInfo.string, window_state->titleInfo.length);
}
LLOGLN(0, ("lrail_WindowCreate: %s", wso.title_info));
wso.client_offset_x = window_state->clientOffsetX;
wso.client_offset_y = window_state->clientOffsetY;
wso.client_area_width = window_state->clientAreaWidth;
wso.client_area_height = window_state->clientAreaHeight;
wso.rp_content = window_state->RPContent;
wso.root_parent_handle = window_state->rootParentHandle;
wso.window_offset_x = window_state->windowOffsetX;
wso.window_offset_y = window_state->windowOffsetY;
wso.window_client_delta_x = window_state->windowClientDeltaX;
wso.window_client_delta_y = window_state->windowClientDeltaY;
wso.window_width = window_state->windowWidth;
wso.window_height = window_state->windowHeight;
wso.num_window_rects = window_state->numWindowRects;
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_WND_RECTS)
{
wso.window_rects = (struct rail_window_rect*)
g_malloc(sizeof(struct rail_window_rect) * wso.num_window_rects, 0);
for (index = 0; index < wso.num_window_rects; index++)
{
wso.window_rects[index].left = window_state->windowRects[index].left;
wso.window_rects[index].top = window_state->windowRects[index].top;
wso.window_rects[index].right = window_state->windowRects[index].right;
wso.window_rects[index].bottom = window_state->windowRects[index].bottom;
}
}
wso.visible_offset_x = window_state->visibleOffsetX;
wso.visible_offset_y = window_state->visibleOffsetY;
wso.num_visibility_rects = window_state->numVisibilityRects;
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_VISIBILITY)
{
wso.visibility_rects = (struct rail_window_rect*)
g_malloc(sizeof(struct rail_window_rect) * wso.num_visibility_rects, 0);
for (index = 0; index < wso.num_visibility_rects; index++)
{
wso.visibility_rects[index].left = window_state->visibilityRects[index].left;
wso.visibility_rects[index].top = window_state->visibilityRects[index].top;
wso.visibility_rects[index].right = window_state->visibilityRects[index].right;
wso.visibility_rects[index].bottom = window_state->visibilityRects[index].bottom;
}
}
mod->server_window_new_update(mod, orderInfo->windowId, &wso,
orderInfo->fieldFlags);
xfree(wso.title_info);
g_free(wso.window_rects);
g_free(wso.visibility_rects);
freerdp_uniconv_free(uniconv);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_WindowUpdate(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
WINDOW_STATE_ORDER* window_state)
{
LLOGLN(0, ("lrail_WindowUpdate:"));
lrail_WindowCreate(context, orderInfo, window_state);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_WindowDelete(rdpContext* context, WINDOW_ORDER_INFO* orderInfo)
{
struct mod* mod;
LLOGLN(0, ("lrail_WindowDelete:"));
mod = ((struct mod_context*)context)->modi;
mod->server_window_delete(mod, orderInfo->windowId);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_WindowIcon(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
WINDOW_ICON_ORDER* window_icon)
{
struct mod* mod;
struct rail_icon_info rii;
LLOGLN(0, ("lrail_WindowIcon:"));
mod = ((struct mod_context*)context)->modi;
memset(&rii, 0, sizeof(rii));
rii.bpp = window_icon->iconInfo->bpp;
rii.width = window_icon->iconInfo->width;
rii.height = window_icon->iconInfo->height;
rii.cmap_bytes = window_icon->iconInfo->cbColorTable;
rii.mask_bytes = window_icon->iconInfo->cbBitsMask;
rii.data_bytes = window_icon->iconInfo->cbBitsColor;
rii.mask = (char*)(window_icon->iconInfo->bitsMask);
rii.cmap = (char*)(window_icon->iconInfo->colorTable);
rii.data = (char*)(window_icon->iconInfo->bitsColor);
mod->server_window_icon(mod, orderInfo->windowId,
window_icon->iconInfo->cacheEntry,
window_icon->iconInfo->cacheId, &rii,
orderInfo->fieldFlags);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_WindowCachedIcon(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
WINDOW_CACHED_ICON_ORDER* window_cached_icon)
{
struct mod* mod;
LLOGLN(0, ("lrail_WindowCachedIcon:"));
mod = ((struct mod_context*)context)->modi;
mod->server_window_cached_icon(mod, orderInfo->windowId,
window_cached_icon->cachedIcon.cacheEntry,
window_cached_icon->cachedIcon.cacheId,
orderInfo->fieldFlags);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_NotifyIconCreate(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
NOTIFY_ICON_STATE_ORDER* notify_icon_state)
{
struct mod* mod;
struct rail_notify_state_order rnso;
UNICONV* uniconv;
LLOGLN(0, ("lrail_NotifyIconCreate:"));
uniconv = freerdp_uniconv_new();
mod = ((struct mod_context*)context)->modi;
memset(&rnso, 0, sizeof(rnso));
rnso.version = notify_icon_state->version;
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_TIP)
{
rnso.tool_tip = freerdp_uniconv_in(uniconv,
notify_icon_state->toolTip.string, notify_icon_state->toolTip.length);
}
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_INFO_TIP)
{
rnso.infotip.timeout = notify_icon_state->infoTip.timeout;
rnso.infotip.flags = notify_icon_state->infoTip.flags;
rnso.infotip.text = freerdp_uniconv_in(uniconv,
notify_icon_state->infoTip.text.string,
notify_icon_state->infoTip.text.length);
rnso.infotip.title = freerdp_uniconv_in(uniconv,
notify_icon_state->infoTip.title.string,
notify_icon_state->infoTip.title.length);
}
rnso.state = notify_icon_state->state;
rnso.icon_cache_entry = notify_icon_state->icon.cacheEntry;
rnso.icon_cache_id = notify_icon_state->icon.cacheId;
rnso.icon_info.bpp = notify_icon_state->icon.bpp;
rnso.icon_info.width = notify_icon_state->icon.width;
rnso.icon_info.height = notify_icon_state->icon.height;
rnso.icon_info.cmap_bytes = notify_icon_state->icon.cbColorTable;
rnso.icon_info.mask_bytes = notify_icon_state->icon.cbBitsMask;
rnso.icon_info.data_bytes = notify_icon_state->icon.cbBitsColor;
rnso.icon_info.mask = (char*)(notify_icon_state->icon.bitsMask);
rnso.icon_info.cmap = (char*)(notify_icon_state->icon.colorTable);
rnso.icon_info.data = (char*)(notify_icon_state->icon.bitsColor);
mod->server_notify_new_update(mod, orderInfo->windowId,
orderInfo->notifyIconId,
&rnso, orderInfo->fieldFlags);
xfree(rnso.tool_tip);
xfree(rnso.infotip.text);
xfree(rnso.infotip.title);
freerdp_uniconv_free(uniconv);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_NotifyIconUpdate(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
NOTIFY_ICON_STATE_ORDER* notify_icon_state)
{
LLOGLN(0, ("lrail_NotifyIconUpdate:"));
lrail_NotifyIconCreate(context, orderInfo, notify_icon_state);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_NotifyIconDelete(rdpContext* context, WINDOW_ORDER_INFO* orderInfo)
{
struct mod* mod;
LLOGLN(0, ("lrail_NotifyIconDelete:"));
mod = ((struct mod_context*)context)->modi;
mod->server_notify_delete(mod, orderInfo->windowId,
orderInfo->notifyIconId);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_MonitoredDesktop(rdpContext* context, WINDOW_ORDER_INFO* orderInfo,
MONITORED_DESKTOP_ORDER* monitored_desktop)
{
int index;
struct mod* mod;
struct rail_monitored_desktop_order rmdo;
LLOGLN(0, ("lrail_MonitoredDesktop:"));
mod = ((struct mod_context*)context)->modi;
memset(&rmdo, 0, sizeof(rmdo));
rmdo.active_window_id = monitored_desktop->activeWindowId;
rmdo.num_window_ids = monitored_desktop->numWindowIds;
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_DESKTOP_ZORDER)
{
if (rmdo.num_window_ids > 0)
{
rmdo.window_ids = (int*)g_malloc(sizeof(int) * rmdo.num_window_ids, 0);
for (index = 0; index < rmdo.num_window_ids; index++)
{
rmdo.window_ids[index] = monitored_desktop->windowIds[index];
}
}
}
mod->server_monitored_desktop(mod, &rmdo, orderInfo->fieldFlags);
g_free(rmdo.window_ids);
}
/*****************************************************************************/
void DEFAULT_CC
lrail_NonMonitoredDesktop(rdpContext* context, WINDOW_ORDER_INFO* orderInfo)
{
struct mod* mod;
struct rail_monitored_desktop_order rmdo;
LLOGLN(0, ("lrail_NonMonitoredDesktop:"));
mod = ((struct mod_context*)context)->modi;
memset(&rmdo, 0, sizeof(rmdo));
mod->server_monitored_desktop(mod, &rmdo, orderInfo->fieldFlags);
}
/******************************************************************************/ /******************************************************************************/
static boolean DEFAULT_CC static boolean DEFAULT_CC
lfreerdp_post_connect(freerdp* instance) lfreerdp_post_connect(freerdp* instance)
@ -1254,6 +1523,18 @@ lfreerdp_post_connect(freerdp* instance)
LLOGLN(0, ("lfreerdp_post_connect:")); LLOGLN(0, ("lfreerdp_post_connect:"));
mod = ((struct mod_context*)(instance->context))->modi; mod = ((struct mod_context*)(instance->context))->modi;
g_memset(mod->password, 0, sizeof(mod->password)); g_memset(mod->password, 0, sizeof(mod->password));
mod->inst->update->window->WindowCreate = lrail_WindowCreate;
mod->inst->update->window->WindowUpdate = lrail_WindowUpdate;
mod->inst->update->window->WindowDelete = lrail_WindowDelete;
mod->inst->update->window->WindowIcon = lrail_WindowIcon;
mod->inst->update->window->WindowCachedIcon = lrail_WindowCachedIcon;
mod->inst->update->window->NotifyIconCreate = lrail_NotifyIconCreate;
mod->inst->update->window->NotifyIconUpdate = lrail_NotifyIconUpdate;
mod->inst->update->window->NotifyIconDelete = lrail_NotifyIconDelete;
mod->inst->update->window->MonitoredDesktop = lrail_MonitoredDesktop;
mod->inst->update->window->NonMonitoredDesktop = lrail_NonMonitoredDesktop;
return true; return true;
} }
@ -1294,7 +1575,7 @@ lfreerdp_receive_channel_data(freerdp* instance, int channelId, uint8* data,
if (lchid >= 0) if (lchid >= 0)
{ {
LLOGLN(10, ("lfreerdp_receive_channel_data: server to client")); LLOGLN(10, ("lfreerdp_receive_channel_data: server to client"));
error = mod->server_send_to_channel(mod, lchid, data, size, error = mod->server_send_to_channel(mod, lchid, (char*)data, size,
total_size, flags); total_size, flags);
if (error != 0) if (error != 0)
{ {

41
freerdp1/xrdp-freerdp.h
Unescape View File

@ -22,9 +22,15 @@
#include "parse.h" #include "parse.h"
#include "os_calls.h" #include "os_calls.h"
#include "defines.h" #include "defines.h"
#include "xrdp_rail.h"
#include "xrdp_client_info.h"
/* this is the freerdp main header */ /* this is the freerdp main header */
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/rail.h>
#include <freerdp/rail/rail.h>
#include <freerdp/codec/bitmap.h>
#include <freerdp/utils/memory.h>
//#include "/home/jay/git/jsorg71/staging/include/freerdp/freerdp.h" //#include "/home/jay/git/jsorg71/staging/include/freerdp/freerdp.h"
struct bitmap_item struct bitmap_item
@ -112,7 +118,38 @@ struct mod
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); int total_data_len, int flags);
int (*server_bell_trigger)(struct mod* v); int (*server_bell_trigger)(struct mod* v);
long server_dumby[100 - 25]; /* align, 100 minus the number of server /* off screen bitmaps */
int (*server_create_os_surface)(struct mod* v, int rdpindex,
int width, int height);
int (*server_switch_os_surface)(struct mod* v, int rdpindex);
int (*server_delete_os_surface)(struct mod* v, int rdpindex);
int (*server_paint_rect_os)(struct mod* mod, int x, int y,
int cx, int cy,
int rdpindex, int srcx, int srcy);
int (*server_set_hints)(struct mod* mod, int hints, int mask);
/* rail */
int (*server_window_new_update)(struct mod* mod, int window_id,
struct rail_window_state_order* window_state,
int flags);
int (*server_window_delete)(struct mod* mod, int window_id);
int (*server_window_icon)(struct mod* mod,
int window_id, int cache_entry, int cache_id,
struct rail_icon_info* icon_info,
int flags);
int (*server_window_cached_icon)(struct mod* mod,
int window_id, int cache_entry,
int cache_id, int flags);
int (*server_notify_new_update)(struct mod* mod,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags);
int (*server_notify_delete)(struct mod* mod, int window_id,
int notify_id);
int (*server_monitored_desktop)(struct mod* mod,
struct rail_monitored_desktop_order* mdo,
int flags);
long server_dumby[100 - 37]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
tbus handle; /* pointer to self as long */ tbus handle; /* pointer to self as long */
@ -133,6 +170,8 @@ struct mod
char username[256]; char username[256];
char password[256]; char password[256];
struct xrdp_client_info client_info;
struct rdp_freerdp* inst; struct rdp_freerdp* inst;
struct bitmap_item bitmap_cache[4][4096]; struct bitmap_item bitmap_cache[4][4096];
struct brush_item brush_cache[64]; struct brush_item brush_cache[64];

89
libxrdp/libxrdp.c
Unescape View File

@ -91,7 +91,8 @@ libxrdp_process_data(struct xrdp_session* session)
} }
} }
code = 0; code = 0;
if (xrdp_rdp_recv((struct xrdp_rdp*)session->rdp, session->s, &code) != 0) if (xrdp_rdp_recv((struct xrdp_rdp*)(session->rdp),
session->s, &code) != 0)
{ {
rv = 1; rv = 1;
break; break;
@ -800,3 +801,89 @@ libxrdp_orders_send_switch_os_surface(struct xrdp_session* session, int id)
return xrdp_orders_send_switch_os_surface return xrdp_orders_send_switch_os_surface
((struct xrdp_orders*)(session->orders), id); ((struct xrdp_orders*)(session->orders), id);
} }
/*****************************************************************************/
int EXPORT_CC
libxrdp_window_new_update(struct xrdp_session* session, int window_id,
struct rail_window_state_order* window_state,
int flags)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_window_new_update(orders, window_id,
window_state, flags);
}
/*****************************************************************************/
int EXPORT_CC
libxrdp_window_delete(struct xrdp_session* session, int window_id)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_window_delete(orders, window_id);
}
/*****************************************************************************/
int EXPORT_CC
libxrdp_window_icon(struct xrdp_session* session, int window_id,
int cache_entry, int cache_id,
struct rail_icon_info* icon_info, int flags)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_window_icon(orders, window_id, cache_entry,
cache_id, icon_info, flags);
}
/*****************************************************************************/
int EXPORT_CC
libxrdp_window_cached_icon(struct xrdp_session* session, int window_id,
int cache_entry, int cache_id,
int flags)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_window_cached_icon(orders, window_id, cache_entry,
cache_id, flags);
}
/*****************************************************************************/
int EXPORT_CC
libxrdp_notify_new_update(struct xrdp_session* session,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_notify_new_update(orders, window_id, notify_id,
notify_state, flags);
}
/*****************************************************************************/
int DEFAULT_CC
libxrdp_notify_delete(struct xrdp_session* session,
int window_id, int notify_id)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_notify_delete(orders, window_id, notify_id);
}
/*****************************************************************************/
int DEFAULT_CC
libxrdp_monitored_desktop(struct xrdp_session* session,
struct rail_monitored_desktop_order* mdo,
int flags)
{
struct xrdp_orders* orders;
orders = (struct xrdp_orders*)(session->orders);
return xrdp_orders_send_monitored_desktop(orders, mdo, flags);
}

32
libxrdp/libxrdpinc.h
Unescape View File

@ -23,6 +23,8 @@
#ifndef LIBXRDPINC_H #ifndef LIBXRDPINC_H
#define LIBXRDPINC_H #define LIBXRDPINC_H
#include "xrdp_rail.h"
/* struct xrdp_client_info moved to xrdp_client_info.h */ /* struct xrdp_client_info moved to xrdp_client_info.h */
struct xrdp_brush struct xrdp_brush
@ -176,11 +178,37 @@ int DEFAULT_CC
libxrdp_orders_send_brush(struct xrdp_session* session, libxrdp_orders_send_brush(struct xrdp_session* session,
int width, int height, int bpp, int type, int width, int height, int bpp, int type,
int size, char* data, int cache_id); int size, char* data, int cache_id);
int EXPORT_CC int DEFAULT_CC
libxrdp_orders_send_create_os_surface(struct xrdp_session* session, int id, libxrdp_orders_send_create_os_surface(struct xrdp_session* session, int id,
int width, int height, int width, int height,
struct list* del_list); struct list* del_list);
int EXPORT_CC int DEFAULT_CC
libxrdp_orders_send_switch_os_surface(struct xrdp_session* session, int id); libxrdp_orders_send_switch_os_surface(struct xrdp_session* session, int id);
int DEFAULT_CC
libxrdp_window_new_update(struct xrdp_session* session, int window_id,
struct rail_window_state_order* window_state,
int flags);
int DEFAULT_CC
libxrdp_window_delete(struct xrdp_session* session, int window_id);
int DEFAULT_CC
libxrdp_window_icon(struct xrdp_session* session, int window_id,
int cache_entry, int cache_id,
struct rail_icon_info* icon_info, int flags);
int DEFAULT_CC
libxrdp_window_cached_icon(struct xrdp_session* session, int window_id,
int cache_entry, int cache_id,
int flags);
int DEFAULT_CC
libxrdp_notify_new_update(struct xrdp_session* session,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags);
int DEFAULT_CC
libxrdp_notify_delete(struct xrdp_session* session,
int window_id, int notify_id);
int DEFAULT_CC
libxrdp_monitored_desktop(struct xrdp_session* session,
struct rail_monitored_desktop_order* mdo,
int flags);
#endif #endif

2
libxrdp/xrdp_orders_rail.c
Unescape View File

@ -17,7 +17,7 @@
*/ */
#include "libxrdp.h" #include "libxrdp.h"
#include "rail.h" #include "xrdp_rail.h"
/* [MS-RDPERP]: Remote Desktop Protocol: /* [MS-RDPERP]: Remote Desktop Protocol:
Remote Programs Virtual Channel Extension Remote Programs Virtual Channel Extension

26
xrdp/xrdp.h
Unescape View File

@ -440,3 +440,29 @@ server_paint_rect_os(struct xrdp_mod* mod, int x, int y, int cx, int cy,
int id, int srcx, int srcy); int id, int srcx, int srcy);
int DEFAULT_CC int DEFAULT_CC
server_set_hints(struct xrdp_mod* mod, int hints, int mask); server_set_hints(struct xrdp_mod* mod, int hints, int mask);
int DEFAULT_CC
server_window_new_update(struct xrdp_mod* mod, int window_id,
struct rail_window_state_order* window_state,
int flags);
int DEFAULT_CC
server_window_delete(struct xrdp_mod* mod, int window_id);
int DEFAULT_CC
server_window_icon(struct xrdp_mod* mod, int window_id, int cache_entry,
int cache_id, struct rail_icon_info* icon_info,
int flags);
int DEFAULT_CC
server_window_cached_icon(struct xrdp_mod* mod,
int window_id, int cache_entry,
int cache_id, int flags);
int DEFAULT_CC
server_notify_new_update(struct xrdp_mod* mod,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags);
int DEFAULT_CC
server_notify_delete(struct xrdp_mod* mod, int window_id,
int notify_id);
int DEFAULT_CC
server_monitored_desktop(struct xrdp_mod* mod,
struct rail_monitored_desktop_order* mdo,
int flags);

117
xrdp/xrdp_mm.c
Unescape View File

@ -960,7 +960,8 @@ xrdp_mm_sesman_data_in(struct trans* trans)
#ifdef ACCESS #ifdef ACCESS
/*********************************************************************/ /*********************************************************************/
/* return 0 on success */ /* return 0 on success */
int access_control(char *username, char *password, char *srv){ int access_control(char *username, char *password, char *srv)
{
int reply; int reply;
int rec = 1; // failure int rec = 1; // failure
struct stream* in_s; struct stream* in_s;
@ -972,7 +973,8 @@ int access_control(char *username, char *password, char *srv){
unsigned long size; unsigned long size;
int index; int index;
int socket = g_tcp_socket(); int socket = g_tcp_socket();
if (socket > 0) { if (socket > 0)
{
/* we use a blocking socket here */ /* we use a blocking socket here */
reply = g_tcp_connect(socket, srv, "3350"); reply = g_tcp_connect(socket, srv, "3350");
if (reply == 0) if (reply == 0)
@ -1001,7 +1003,8 @@ int access_control(char *username, char *password, char *srv){
if (reply > 0) if (reply > 0)
{ {
/* We wait in 5 sec for a reply from sesman*/ /* We wait in 5 sec for a reply from sesman*/
if(g_tcp_can_recv(socket,5000)){ if (g_tcp_can_recv(socket, 5000))
{
reply = g_tcp_recv(socket, in_s->end, 500, 0); reply = g_tcp_recv(socket, in_s->end, 500, 0);
if (reply > 0) if (reply > 0)
{ {
@ -1164,7 +1167,8 @@ xrdp_mm_connect(struct xrdp_mm* self)
} }
} }
#ifdef ACCESS #ifdef ACCESS
if(use_pam_auth){ if (use_pam_auth)
{
int reply; int reply;
char replytxt[80]; char replytxt[80];
char replymessage[4][80] = {"Ok","Sesman connect failure","User or password error","Privilege group error"}; char replymessage[4][80] = {"Ok","Sesman connect failure","User or password error","Privilege group error"};
@ -1786,7 +1790,8 @@ int read_allowed_channel_names(struct list* names, struct list* values)
} }
/* internal function return 1 if name is in list of channels /* internal function return 1 if name is in list of channels
* and if the value is allowed */ * and if the value is allowed */
int DEFAULT_CC is_name_in_lists(char *inName, struct list* names, struct list* values) int DEFAULT_CC
is_name_in_lists(char* inName, struct list* names, struct list* values)
{ {
int reply = 0; /*means not in the list*/ int reply = 0; /*means not in the list*/
int index; int index;
@ -1798,7 +1803,8 @@ int DEFAULT_CC is_name_in_lists(char *inName, struct list* names, struct list* v
if (name != 0) if (name != 0)
{ {
/* ex rdpdr ;rdpsnd ; drdynvc ; cliprdr */ /* ex rdpdr ;rdpsnd ; drdynvc ; cliprdr */
if(!g_strncmp(name,inName,MAX_CHANNEL_NAME)){ if (!g_strncmp(name, inName, MAX_CHANNEL_NAME))
{
val = (char*)list_get_item(values, index); val = (char*)list_get_item(values, index);
if ((g_strcasecmp(val, "yes") == 0) || if ((g_strcasecmp(val, "yes") == 0) ||
(g_strcasecmp(val, "on") == 0) || (g_strcasecmp(val, "on") == 0) ||
@ -1837,13 +1843,17 @@ void init_channel_allowed(struct xrdp_wm* wm)
} }
names = list_create(); names = list_create();
values = list_create(); values = list_create();
if(read_allowed_channel_names(names,values)){ if (read_allowed_channel_names(names, values))
do{ {
do
{
/* libxrdp_query_channel return 1 on error*/ /* libxrdp_query_channel return 1 on error*/
error = libxrdp_query_channel(wm->session, index, channelname,NULL); error = libxrdp_query_channel(wm->session, index, channelname,NULL);
if(error==0){ if (error == 0)
{
/* examples of channel names: rdpdr ; rdpsnd ; drdynvc ; cliprdr */ /* examples of channel names: rdpdr ; rdpsnd ; drdynvc ; cliprdr */
if(is_name_in_lists(channelname,names,values)){ if (is_name_in_lists(channelname, names, values))
{
g_writeln("The following channel is allowed: %s", channelname); g_writeln("The following channel is allowed: %s", channelname);
wm->allowedchannels[allowindex] = index; wm->allowedchannels[allowindex] = index;
allowindex++; allowindex++;
@ -1868,6 +1878,7 @@ void init_channel_allowed(struct xrdp_wm* wm)
list_delete(names); list_delete(names);
list_delete(values); list_delete(values);
} }
/*****************************************************************************/ /*****************************************************************************/
/* This function returns 1 if the channelID is allowed by rule set /* This function returns 1 if the channelID is allowed by rule set
* returns 0 if not allowed */ * returns 0 if not allowed */
@ -2101,3 +2112,89 @@ server_set_hints(struct xrdp_mod* mod, int hints, int mask)
} }
return 0; return 0;
} }
/*****************************************************************************/
int DEFAULT_CC
server_window_new_update(struct xrdp_mod* mod, int window_id,
struct rail_window_state_order* window_state,
int flags)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_window_new_update(wm->session, window_id,
window_state, flags);
}
/*****************************************************************************/
int DEFAULT_CC
server_window_delete(struct xrdp_mod* mod, int window_id)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_window_delete(wm->session, window_id);
}
/*****************************************************************************/
int DEFAULT_CC
server_window_icon(struct xrdp_mod* mod, int window_id, int cache_entry,
int cache_id, struct rail_icon_info* icon_info,
int flags)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_window_icon(wm->session, window_id, cache_entry, cache_id,
icon_info, flags);
}
/*****************************************************************************/
int DEFAULT_CC
server_window_cached_icon(struct xrdp_mod* mod,
int window_id, int cache_entry,
int cache_id, int flags)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_window_cached_icon(wm->session, window_id, cache_entry,
cache_id, flags);
}
/*****************************************************************************/
int DEFAULT_CC
server_notify_new_update(struct xrdp_mod* mod,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_notify_new_update(wm->session, window_id, notify_id,
notify_state, flags);
}
/*****************************************************************************/
int DEFAULT_CC
server_notify_delete(struct xrdp_mod* mod, int window_id,
int notify_id)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_notify_delete(wm->session, window_id, notify_id);
}
/*****************************************************************************/
int DEFAULT_CC
server_monitored_desktop(struct xrdp_mod* mod,
struct rail_monitored_desktop_order* mdo,
int flags)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)(mod->wm);
return libxrdp_monitored_desktop(wm->session, mdo, flags);
}

26
xrdp/xrdp_types.h
Unescape View File

@ -22,6 +22,7 @@
#define DEFAULT_STRING_LEN 255 #define DEFAULT_STRING_LEN 255
#define LOG_WINDOW_CHAR_PER_LINE 60 #define LOG_WINDOW_CHAR_PER_LINE 60
#include "xrdp_rail.h"
#define MAX_NR_CHANNELS 16 #define MAX_NR_CHANNELS 16
#define MAX_CHANNEL_NAME 16 #define MAX_CHANNEL_NAME 16
@ -85,6 +86,7 @@ struct xrdp_mod
char* data, int data_len, char* data, int data_len,
int total_data_len, int flags); int total_data_len, int flags);
int (*server_bell_trigger)(struct xrdp_mod* v); int (*server_bell_trigger)(struct xrdp_mod* v);
/* off screen bitmaps */
int (*server_create_os_surface)(struct xrdp_mod* v, int rdpindex, int (*server_create_os_surface)(struct xrdp_mod* v, int rdpindex,
int width, int height); int width, int height);
int (*server_switch_os_surface)(struct xrdp_mod* v, int rdpindex); int (*server_switch_os_surface)(struct xrdp_mod* v, int rdpindex);
@ -93,7 +95,29 @@ struct xrdp_mod
int cx, int cy, int cx, int cy,
int rdpindex, int srcx, int srcy); int rdpindex, int srcx, int srcy);
int (*server_set_hints)(struct xrdp_mod* mod, int hints, int mask); int (*server_set_hints)(struct xrdp_mod* mod, int hints, int mask);
long server_dumby[100 - 30]; /* align, 100 minus the number of server /* rail */
int (*server_window_new_update)(struct xrdp_mod* mod, int window_id,
struct rail_window_state_order* window_state,
int flags);
int (*server_window_delete)(struct xrdp_mod* mod, int window_id);
int (*server_window_icon)(struct xrdp_mod* mod,
int window_id, int cache_entry, int cache_id,
struct rail_icon_info* icon_info,
int flags);
int (*server_window_cached_icon)(struct xrdp_mod* mod,
int window_id, int cache_entry,
int cache_id, int flags);
int (*server_notify_new_update)(struct xrdp_mod* mod,
int window_id, int notify_id,
struct rail_notify_state_order* notify_state,
int flags);
int (*server_notify_delete)(struct xrdp_mod* mod, int window_id,
int notify_id);
int (*server_monitored_desktop)(struct xrdp_mod* mod,
struct rail_monitored_desktop_order* mdo,
int flags);
long server_dumby[100 - 37]; /* align, 100 minus the number of server
functions above */ functions above */
/* common */ /* common */
long handle; /* pointer to self as int */ long handle; /* pointer to self as int */

Write Preview
Loading…
Cancel
Save