Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

modified porting-tools/rdesktop-core-tester/activex.cpp

Browse source 
modified   porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj
modified   porting-tools/rdesktop-core-tester/stdafx.h
    Support acting as both the stand-alone DLL (mstscax.dll) and the redistributable (msrdp.ocx)
    Wrap the non-standard "sealed" keyword in a macro
    Almost all state now correctly passed between rdesktop-core and the ActiveX
    Some debugging aids
    Prepared a functional DllMain
    Pulled in Common Controls, needed for the full-screen titlebar

modified   rdesktop/rdesktop.h
modified   rdesktop/rdp.c
modified   rdesktop/secure.c
    Minor clean-up

svn path=/trunk/; revision=23613
This commit is contained in:
Michele Cicciotti 2006-08-19 21:44:41 +00:00
parent efcb331e18
commit be56b5e77c
6 changed files with 518 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

672
reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp
View file

File diff suppressed because it is too large Load diff

4
reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj
View file

@ -62,7 +62,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib ole32.lib oleaut32.lib $(NoInherit)" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib ole32.lib oleaut32.lib comctl32.lib $(NoInherit)"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32&quot;" AdditionalLibraryDirectories="&quot;C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -139,7 +139,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib ole32.lib oleaut32.lib $(NoInherit)" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib ole32.lib oleaut32.lib comctl32.lib $(NoInherit)"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32&quot;" AdditionalLibraryDirectories="&quot;C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"

2
reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h
View file

@ -27,4 +27,6 @@
#include <ocidl.h> #include <ocidl.h>
#include <objsafe.h> #include <objsafe.h>
#include <commctrl.h>
// EOF // EOF

28
reactos/base/applications/tsclient/rdesktop/rdesktop.h
View file

@ -164,34 +164,6 @@ struct bmpcache_entry
sint16 next; sint16 next;
}; };
#if 0
typedef struct _seamless_group
{
Window wnd;
unsigned long id;
unsigned int refcnt;
} seamless_group;
typedef struct _seamless_window
{
Window wnd;
unsigned long id;
unsigned long behind;
seamless_group *group;
int xoffset, yoffset;
int width, height;
int state; /* normal/minimized/maximized. */
unsigned int desktop;
struct timeval *position_timer;
BOOL outstanding_position;
unsigned int outpos_serial;
int outpos_xoffset, outpos_yoffset;
int outpos_width, outpos_height;
struct _seamless_window *next;
} seamless_window;
#endif
/* holds the whole state of the RDP client */ /* holds the whole state of the RDP client */
struct rdpclient struct rdpclient
{ {

16
reactos/base/applications/tsclient/rdesktop/rdp.c
View file

@ -35,7 +35,7 @@
/* Receive an RDP packet */ /* Receive an RDP packet */
static STREAM static STREAM
rdp_recv(RDPCLIENT * This, uint8 * type) // EXITS rdp_recv(RDPCLIENT * This, uint8 * type)
{ {
static STREAM rdp_s; // FIXME HORROR static STREAM rdp_s; // FIXME HORROR
uint16 length, pdu_type; uint16 length, pdu_type;
@ -948,7 +948,7 @@ rdp_process_server_caps(RDPCLIENT * This, STREAM s, uint16 length)
/* Respond to a demand active PDU */ /* Respond to a demand active PDU */
static BOOL static BOOL
process_demand_active(RDPCLIENT * This, STREAM s) // EXITS process_demand_active(RDPCLIENT * This, STREAM s)
{ {
uint8 type; uint8 type;
uint16 len_src_descriptor, len_combined_caps; uint16 len_src_descriptor, len_combined_caps;
@ -1081,7 +1081,7 @@ process_pointer_pdu(RDPCLIENT * This, STREAM s)
/* Process bitmap updates */ /* Process bitmap updates */
void void
process_bitmap_updates(RDPCLIENT * This, STREAM s) // EXITS process_bitmap_updates(RDPCLIENT * This, STREAM s)
{ {
uint16 num_updates; uint16 num_updates;
uint16 left, top, right, bottom, width, height; uint16 left, top, right, bottom, width, height;
@ -1161,7 +1161,7 @@ process_bitmap_updates(RDPCLIENT * This, STREAM s) // EXITS
/* Process a palette update */ /* Process a palette update */
void void
process_palette(RDPCLIENT * This, STREAM s) // EXITS process_palette(RDPCLIENT * This, STREAM s)
{ {
COLOURENTRY *entry; COLOURENTRY *entry;
COLOURMAP map; COLOURMAP map;
@ -1242,7 +1242,7 @@ process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason)
/* Process data PDU */ /* Process data PDU */
static BOOL static BOOL
process_data_pdu(RDPCLIENT * This, STREAM s, uint32 * ext_disc_reason) // EXITS process_data_pdu(RDPCLIENT * This, STREAM s, uint32 * ext_disc_reason)
{ {
uint8 data_pdu_type; uint8 data_pdu_type;
uint8 ctype; uint8 ctype;
@ -1397,7 +1397,7 @@ rdp_main_loop(RDPCLIENT * This, BOOL * deactivated, uint32 * ext_disc_reason)
/* used in uiports and rdp_main_loop, processes the rdp packets waiting */ /* used in uiports and rdp_main_loop, processes the rdp packets waiting */
BOOL BOOL
rdp_loop(RDPCLIENT * This, BOOL * deactivated, uint32 * ext_disc_reason) // EXITS rdp_loop(RDPCLIENT * This, BOOL * deactivated, uint32 * ext_disc_reason)
{ {
uint8 type; uint8 type;
BOOL disc = False; /* True when a disconnect PDU was received */ BOOL disc = False; /* True when a disconnect PDU was received */
@ -1441,7 +1441,7 @@ rdp_loop(RDPCLIENT * This, BOOL * deactivated, uint32 * ext_disc_reason) // EXIT
/* Establish a connection up to the RDP layer */ /* Establish a connection up to the RDP layer */
BOOL BOOL
rdp_connect(RDPCLIENT * This, char *server, uint32 flags, wchar_t *username, wchar_t *domain, wchar_t *password, rdp_connect(RDPCLIENT * This, char *server, uint32 flags, wchar_t *username, wchar_t *domain, wchar_t *password,
wchar_t *command, wchar_t *directory, wchar_t *hostname, char *cookie) // EXITS wchar_t *command, wchar_t *directory, wchar_t *hostname, char *cookie)
{ {
if (!sec_connect(This, server, hostname, cookie)) if (!sec_connect(This, server, hostname, cookie))
return False; return False;
@ -1453,7 +1453,7 @@ rdp_connect(RDPCLIENT * This, char *server, uint32 flags, wchar_t *username, wch
/* Establish a reconnection up to the RDP layer */ /* Establish a reconnection up to the RDP layer */
BOOL BOOL
rdp_reconnect(RDPCLIENT * This, char *server, uint32 flags, wchar_t *username, wchar_t *domain, wchar_t *password, rdp_reconnect(RDPCLIENT * This, char *server, uint32 flags, wchar_t *username, wchar_t *domain, wchar_t *password,
wchar_t *command, wchar_t *directory, wchar_t *hostname, char *cookie) // EXITS wchar_t *command, wchar_t *directory, wchar_t *hostname, char *cookie)
{ {
if (!sec_reconnect(This, server, hostname, cookie)) if (!sec_reconnect(This, server, hostname, cookie))
return False; return False;

4
reactos/base/applications/tsclient/rdesktop/secure.c
View file

@ -902,7 +902,7 @@ sec_recv(RDPCLIENT * This, uint8 * rdpver)
/* Establish a secure connection */ /* Establish a secure connection */
BOOL BOOL
sec_connect(RDPCLIENT * This, char *server, wchar_t *hostname, char *cookie) // EXITS sec_connect(RDPCLIENT * This, char *server, wchar_t *hostname, char *cookie)
{ {
struct stream mcs_data; struct stream mcs_data;
void * p = malloc(512); void * p = malloc(512);
@ -930,7 +930,7 @@ sec_connect(RDPCLIENT * This, char *server, wchar_t *hostname, char *cookie) //
/* Establish a secure connection */ /* Establish a secure connection */
BOOL BOOL
sec_reconnect(RDPCLIENT * This, char *server, wchar_t *hostname, char *cookie) // EXITS sec_reconnect(RDPCLIENT * This, char *server, wchar_t *hostname, char *cookie)
{ {
struct stream mcs_data; struct stream mcs_data;
void * p = malloc(512); void * p = malloc(512);