kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch from Bob Bell (#2)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@72 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2002-07-29 19:21:51 +00:00
parent acb889329a
commit 6481d9b98c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
licence.c
View File

@ -53,7 +53,7 @@ static void
licence_generate_hwid(uint8 * hwid)
{
buf_out_uint32(hwid, 2);
strncpy(hwid + 4, hostname, LICENCE_HWID_SIZE - 4);
strncpy((char *)(hwid + 4), hostname, LICENCE_HWID_SIZE - 4);
}
/* Present an existing licence to the server */

4
xkeymap.c
View File

@ -38,7 +38,7 @@ extern int keylayout;
extern BOOL enable_compose;
static key_translation keymap[KEYMAP_SIZE];
static unsigned int min_keycode;
static int min_keycode;
static uint16 remote_modifier_state = 0;
static void
@ -220,7 +220,7 @@ void
xkeymap_init2(void)
{
unsigned int max_keycode;
XDisplayKeycodes(display, &min_keycode, &max_keycode);
XDisplayKeycodes(display, &min_keycode, (int *)&max_keycode);
}

16
xwin.c
View File

@ -589,8 +589,8 @@ ui_create_bitmap(int width, int height, uint8 * data)
tdata = (owncolmap ? data : translate_image(width, height, data));
bitmap = XCreatePixmap(display, wnd, width, height, depth);
image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width,
height, 8, 0);
image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata,
width, height, 8, 0);
XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height);
@ -608,8 +608,8 @@ ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height,
uint8 *tdata;
tdata = (owncolmap ? data : translate_image(width, height, data));
image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width,
height, 8, 0);
image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata,
width, height, 8, 0);
if (ownbackstore)
{
@ -645,8 +645,8 @@ ui_create_glyph(int width, int height, uint8 * data)
bitmap = XCreatePixmap(display, wnd, width, height, 1);
gc = XCreateGC(display, bitmap, 0, NULL);
image = XCreateImage(display, visual, 1, ZPixmap, 0, data, width,
height, 8, scanline);
image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *)data,
width, height, 8, scanline);
image->byte_order = MSBFirst;
image->bitmap_bit_order = MSBFirst;
XInitImage(image);
@ -1157,8 +1157,8 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy)
if (data == NULL)
return;
image = XCreateImage(display, visual, depth, ZPixmap, 0, data, cx, cy,
BitmapPad(display), cx * bpp / 8);
image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)data,
cx, cy, BitmapPad(display), cx * bpp / 8);
if (ownbackstore)
{