CVS: seamlessrdp/ClientDLL clipper.cpp,1.3,1.4 clipper.h,1.3,1.4 hash.cpp,1.3,1.4 hash.h,1.3,1.4 stdstring.h,1.4,1.5 tokenizer.cpp,1.3,1.4 tokenizer.h,1.3,1.4 windowdata.cpp,1.3,1.4 windowdata.h,1.3,1.4
Peter Åstrand <[email protected]>
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/seamlessrdp/ClientDLL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30095/ClientDLL
Modified Files:
clipper.cpp clipper.h hash.cpp hash.h stdstring.h
tokenizer.cpp tokenizer.h windowdata.cpp windowdata.h
Log Message:
Indenting with astyle instead of indent
Index: clipper.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/clipper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** clipper.cpp 30 Jun 2005 14:46:14 -0000 1.3
--- clipper.cpp 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 55,59 ****
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Virtual channel data received");
OutputDebugString(ourData);
}
--- 55,59 ----
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Virtual channel data received");
OutputDebugString(ourData);
}
***************
*** 61,66 ****
if (dataLength == totalLength) {
switch (event) {
! case CHANNEL_EVENT_DATA_RECEIVED:
! {
CTokenizer tok(_T((LPSTR) ourData), _T(";"));
CStdString cs;
--- 61,65 ----
if (dataLength == totalLength) {
switch (event) {
! case CHANNEL_EVENT_DATA_RECEIVED: {
CTokenizer tok(_T((LPSTR) ourData), _T(";"));
CStdString cs;
***************
*** 84,93 ****
msgTok.Next(msg);
wid->SetId(msg);
! }
! else if (strcmp(msg, "TITLE") == 0) {
msgTok.Next(msg);
wid->SetTitle(msg);
! }
! else if (strcmp(msg, "POS") == 0) {
msgTok.Next(msg);
--- 83,90 ----
msgTok.Next(msg);
wid->SetId(msg);
! } else if (strcmp(msg, "TITLE") == 0) {
msgTok.Next(msg);
wid->SetTitle(msg);
! } else if (strcmp(msg, "POS") == 0) {
msgTok.Next(msg);
***************
*** 103,108 ****
if (strchr(pos, '-') == NULL) {
wid->SetX1(atoi(pos));
! }
! else {
wid->SetX1(0);
}
--- 100,104 ----
if (strchr(pos, '-') == NULL) {
wid->SetX1(atoi(pos));
! } else {
wid->SetX1(0);
}
***************
*** 112,117 ****
if (strchr(pos, '-') == NULL) {
wid->SetY1(atoi(pos));
! }
! else {
wid->SetY1(0);
}
--- 108,112 ----
if (strchr(pos, '-') == NULL) {
wid->SetY1(atoi(pos));
! } else {
wid->SetY1(0);
}
***************
*** 121,126 ****
if (strchr(pos, '-') == NULL) {
wid->SetX2(atoi(pos));
! }
! else {
wid->SetX2(0);
}
--- 116,120 ----
if (strchr(pos, '-') == NULL) {
wid->SetX2(atoi(pos));
! } else {
wid->SetX2(0);
}
***************
*** 130,139 ****
if (strchr(pos, '-') == NULL) {
wid->SetY2(atoi(pos));
! }
! else {
wid->SetY2(0);
}
! }
! else if (strcmp(msg, "TYPE") == 0) {
msgTok.Next(msg);
mixMaxType = atoi(msg);
--- 124,131 ----
if (strchr(pos, '-') == NULL) {
wid->SetY2(atoi(pos));
! } else {
wid->SetY2(0);
}
! } else if (strcmp(msg, "TYPE") == 0) {
msgTok.Next(msg);
mixMaxType = atoi(msg);
***************
*** 144,148 ****
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HSHELL_WINDOWCREATED window title is:");
OutputDebugString(wid->GetTitle());
}
--- 136,140 ----
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HSHELL_WINDOWCREATED window title is:");
OutputDebugString(wid->GetTitle());
}
***************
*** 158,166 ****
DoClipping(1);
! }
! else if (strcmp(messageType, "HSHELL_WINDOWDESTROYED") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HSHELL_WINDOWDISTROYED window title is:");
OutputDebugString(wid->GetTitle());
}
--- 150,157 ----
DoClipping(1);
! } else if (strcmp(messageType, "HSHELL_WINDOWDESTROYED") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HSHELL_WINDOWDISTROYED window title is:");
OutputDebugString(wid->GetTitle());
}
***************
*** 179,187 ****
DoClipping(1);
! }
! else if (strcmp(messageType, "HCBT_MINMAX") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HCBT_MINMAX");
}
--- 170,177 ----
DoClipping(1);
! } else if (strcmp(messageType, "HCBT_MINMAX") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HCBT_MINMAX");
}
***************
*** 189,197 ****
//TODO
! }
! else if (strcmp(messageType, "HCBT_MOVESIZE") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HCBT_MOVESIZE window title is:");
OutputDebugString(wid->GetTitle());
}
--- 179,186 ----
//TODO
! } else if (strcmp(messageType, "HCBT_MOVESIZE") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type HCBT_MOVESIZE window title is:");
OutputDebugString(wid->GetTitle());
}
***************
*** 215,223 ****
delete wid;
! }
! else if (strcmp(messageType, "CALLWNDPROC_WM_MOVING") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type CALLWNDPROC_WM_MOVING window title is:");
OutputDebugString(wid->GetTitle());
}
--- 204,211 ----
delete wid;
! } else if (strcmp(messageType, "CALLWNDPROC_WM_MOVING") == 0) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Message was of type CALLWNDPROC_WM_MOVING window title is:");
OutputDebugString(wid->GetTitle());
}
***************
*** 246,272 ****
break;
! case CHANNEL_EVENT_WRITE_COMPLETE:
! {
! }
break;
! case CHANNEL_EVENT_WRITE_CANCELLED:
! {
! }
break;
! default:
! {
! }
break;
}
! }
! else {
! }
}
VOID VCAPITYPE VirtualChannelInitEventProc(LPVOID pInitHandle, UINT event,
! LPVOID pData, UINT dataLength)
{
UINT ui;
--- 234,252 ----
break;
! case CHANNEL_EVENT_WRITE_COMPLETE: {}
break;
! case CHANNEL_EVENT_WRITE_CANCELLED: {}
break;
! default: {}
break;
}
! } else {}
}
VOID VCAPITYPE VirtualChannelInitEventProc(LPVOID pInitHandle, UINT event,
! LPVOID pData, UINT dataLength)
{
UINT ui;
***************
*** 276,286 ****
switch (event) {
! case CHANNEL_EVENT_INITIALIZED:
! {
! }
break;
! case CHANNEL_EVENT_CONNECTED:
! {
//
// open channel
--- 256,263 ----
switch (event) {
! case CHANNEL_EVENT_INITIALIZED: {}
break;
! case CHANNEL_EVENT_CONNECTED: {
//
// open channel
***************
*** 292,298 ****
VirtualChannelOpenEvent);
! if (ui == CHANNEL_RC_OK) {
!
! }
else {
MessageBox(NULL, TEXT("Open of RDP virtual channel failed"),
--- 269,273 ----
VirtualChannelOpenEvent);
! if (ui == CHANNEL_RC_OK) {}
else {
MessageBox(NULL, TEXT("Open of RDP virtual channel failed"),
***************
*** 306,311 ****
break;
! case CHANNEL_EVENT_V1_CONNECTED:
! {
MessageBox(NULL,
TEXT
--- 281,285 ----
break;
! case CHANNEL_EVENT_V1_CONNECTED: {
MessageBox(NULL,
TEXT
***************
*** 315,326 ****
break;
! case CHANNEL_EVENT_DISCONNECTED:
! {
!
! }
break;
! case CHANNEL_EVENT_TERMINATED:
! {
//
// free the entry points table
--- 289,296 ----
break;
! case CHANNEL_EVENT_DISCONNECTED: {}
break;
! case CHANNEL_EVENT_TERMINATED: {
//
// free the entry points table
***************
*** 330,337 ****
break;
! default:
! {
!
! }
break;
}
--- 300,304 ----
break;
! default: {}
break;
}
***************
*** 374,379 ****
DoClipping(1);
}
! }
! else {
MessageBox(NULL, TEXT("RDP Virtual channel Init Failed"),
TEXT("TS Window Clipper"), MB_OK);
--- 341,345 ----
DoClipping(1);
}
! } else {
MessageBox(NULL, TEXT("RDP Virtual channel Init Failed"),
TEXT("TS Window Clipper"), MB_OK);
***************
*** 404,408 ****
};
HWND hWnd;
! } Wnd4PTID;
// Callback procedure
--- 370,375 ----
};
HWND hWnd;
! }
! Wnd4PTID;
// Callback procedure
***************
*** 433,441 ****
tempWnd4ID.procId = procId;
if (!EnumWindows
! ((WNDENUMPROC) PrivateEnumWindowsProc, (LPARAM) & tempWnd4ID)) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Found main process window");
}
--- 400,408 ----
tempWnd4ID.procId = procId;
if (!EnumWindows
! ((WNDENUMPROC) PrivateEnumWindowsProc, (LPARAM) & tempWnd4ID)) {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Found main process window");
}
***************
*** 446,450 ****
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Could not find main process window");
}
--- 413,417 ----
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Could not find main process window");
}
***************
*** 479,483 ****
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Restarting clipping...");
}
--- 446,450 ----
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Restarting clipping...");
}
***************
*** 486,492 ****
if (OUTPUT_WINDOW_TABLE_DEBUG_INFO == 1) {
OutputDebugString
! ("-----------------------------------------------------------------------------");
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> starting printing of window table");
}
--- 453,459 ----
if (OUTPUT_WINDOW_TABLE_DEBUG_INFO == 1) {
OutputDebugString
! ("-----------------------------------------------------------------------------");
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> starting printing of window table");
}
***************
*** 498,504 ****
if (OUTPUT_WINDOW_TABLE_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> finished printing of window table");
OutputDebugString
! ("-----------------------------------------------------------------------------");
}
--- 465,471 ----
if (OUTPUT_WINDOW_TABLE_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> finished printing of window table");
OutputDebugString
! ("-----------------------------------------------------------------------------");
}
***************
*** 506,511 ****
if (ALWAYS__CLIP) {
m_regionResult = CreateRectRgn(0, 0, 0, 0);
! }
! else {
m_regionResult =
CreateRectRgn(0, 0, wRect.right, wRect.bottom);
--- 473,477 ----
if (ALWAYS__CLIP) {
m_regionResult = CreateRectRgn(0, 0, 0, 0);
! } else {
m_regionResult =
CreateRectRgn(0, 0, wRect.right, wRect.bottom);
***************
*** 520,528 ****
RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
}
! }
! else {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Coulf not find window to clip");
}
}
--- 486,493 ----
RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN);
}
! } else {
if (OUTPUT_DEBUG_INFO == 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Coulf not find window to clip");
}
}
***************
*** 546,550 ****
if (OUTPUT_DEBUG_INFO == 1 && OUTPUT_WINDOW_TABLE_DEBUG_INFO != 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Adding this window to cliping region");
OutputDebugString(wd->GetTitle());
}
--- 511,515 ----
if (OUTPUT_DEBUG_INFO == 1 && OUTPUT_WINDOW_TABLE_DEBUG_INFO != 1) {
OutputDebugString
! ("TS WINDOW CLIPPER :: CLIENT DLL :: Info --> Adding this window to cliping region");
OutputDebugString(wd->GetTitle());
}
***************
*** 573,581 ****
/*
Dummy procedure to catch when window is being maximised.
!
Need to tell the window on the server to do the same.
*/
LRESULT CALLBACK DummyWindowCallbackProc(HWND hwnd, UINT uMsg, WPARAM wParam,
! LPARAM lParam)
{
//TODO
--- 538,546 ----
/*
Dummy procedure to catch when window is being maximised.
!
Need to tell the window on the server to do the same.
*/
LRESULT CALLBACK DummyWindowCallbackProc(HWND hwnd, UINT uMsg, WPARAM wParam,
! LPARAM lParam)
{
//TODO
Index: clipper.h
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/clipper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** clipper.h 30 Jun 2005 14:46:14 -0000 1.3
--- clipper.h 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 72,76 ****
UINT32 totalLength, UINT32 dataFlags);
VOID VCAPITYPE VirtualChannelInitEventProc(LPVOID pInitHandle, UINT event,
! LPVOID pData, UINT dataLength);
BOOL VCAPITYPE VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints);
--- 72,76 ----
UINT32 totalLength, UINT32 dataFlags);
VOID VCAPITYPE VirtualChannelInitEventProc(LPVOID pInitHandle, UINT event,
! LPVOID pData, UINT dataLength);
BOOL VCAPITYPE VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints);
Index: hash.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/hash.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hash.cpp 30 Jun 2005 14:46:14 -0000 1.3
--- hash.cpp 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 16,20 ****
/* HW: HenkJan Wolthuis, 1997, public domain
!
changed functionnames, all public functions now have a 'hash_' prefix
minor editing, marked 'm all(?) with a description
--- 16,20 ----
/* HW: HenkJan Wolthuis, 1997, public domain
!
changed functionnames, all public functions now have a 'hash_' prefix
minor editing, marked 'm all(?) with a description
***************
*** 138,142 ****
if (NULL ==
! ((table->table)[val]->key = (char *) malloc(strlen(key) + 1))) {
free((table->table)[val]);
(table->table)[val] = NULL;
--- 138,142 ----
if (NULL ==
! ((table->table)[val]->key = (char *) malloc(strlen(key) + 1))) {
free((table->table)[val]);
(table->table)[val] = NULL;
***************
*** 150,154 ****
}
! /* HW: added a #define so the hashtable can accept duplicate keys */
#ifndef DUPLICATE_KEYS
/*
--- 150,154 ----
}
! /* HW: added a #define so the hashtable can accept duplicate keys */
#ifndef DUPLICATE_KEYS
/*
***************
*** 238,242 ****
*/
for (last = NULL, ptr = (table->table)[val];
! NULL != ptr; last = ptr, ptr = ptr->next) {
if (0 == strcmp(key, ptr->key)) {
if (last != NULL) {
--- 238,242 ----
*/
for (last = NULL, ptr = (table->table)[val];
! NULL != ptr; last = ptr, ptr = ptr->next) {
if (0 == strcmp(key, ptr->key)) {
if (last != NULL) {
***************
*** 291,296 ****
if (NULL != function) {
function(hash_del(key, the_table));
! }
! else
hash_del(key, the_table);
}
--- 291,295 ----
if (NULL != function) {
function(hash_del(key, the_table));
! } else
hash_del(key, the_table);
}
***************
*** 345,349 ****
/* HW: added hash_sorted_enum()
!
hash_sorted_enum is like hash_enumerate but gives
sorted output. This is much slower than hash_enumerate, but
--- 344,348 ----
/* HW: added hash_sorted_enum()
!
hash_sorted_enum is like hash_enumerate but gives
sorted output. This is much slower than hash_enumerate, but
***************
*** 355,359 ****
char *key;
void *data;
! } sort_struct;
static sort_struct *sortmap = NULL;
--- 354,359 ----
char *key;
void *data;
! }
! sort_struct;
static sort_struct *sortmap = NULL;
***************
*** 390,395 ****
/* malloc an pointerarray for all hashkey's and datapointers */
if (NULL ==
! (sortmap =
! (sort_struct *) malloc(sizeof(sort_struct) * table->count)))
return 0;
--- 390,395 ----
/* malloc an pointerarray for all hashkey's and datapointers */
if (NULL ==
! (sortmap =
! (sort_struct *) malloc(sizeof(sort_struct) * table->count)))
return 0;
***************
*** 446,466 ****
char *strings[] = {
! "The first string",
! "The second string",
! "The third string",
! "The fourth string",
! "A much longer string than the rest in this example.",
! "The last string",
! NULL
! };
char *junk[] = {
! "The first data",
! "The second data",
! "The third data",
! "The fourth data",
! "The fifth datum",
! "The sixth piece of data"
! };
int i;
--- 446,466 ----
char *strings[] = {
! "The first string",
! "The second string",
! "The third string",
! "The fourth string",
! "A much longer string than the rest in this example.",
! "The last string",
! NULL
! };
char *junk[] = {
! "The first data",
! "The second data",
! "The third data",
! "The fourth data",
! "The fifth datum",
! "The sixth piece of data"
! };
int i;
Index: hash.h
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/hash.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hash.h 30 Jun 2005 14:46:14 -0000 1.3
--- hash.h 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 16,20 ****
void *data;
struct bucket *next;
! } bucket;
/*
--- 16,21 ----
void *data;
struct bucket *next;
! }
! bucket;
/*
***************
*** 32,36 ****
size_t count; /* HW */
bucket **table;
! } hash_table;
/*
--- 33,38 ----
size_t count; /* HW */
bucket **table;
! }
! hash_table;
/*
Index: stdstring.h
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/stdstring.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stdstring.h 30 Jun 2005 14:46:14 -0000 1.4
--- stdstring.h 1 Jul 2005 06:50:52 -0000 1.5
***************
*** 104,108 ****
// has been causing me (and users of CStdString) problems for
// years in some relatively rare conversions. I had reversed
! // two length arguments.
//
// 2003-NOV-24 - Thanks to a bunch of people for helping me clean up many
--- 104,108 ----
// has been causing me (and users of CStdString) problems for
// years in some relatively rare conversions. I had reversed
! // two length arguments.
//
[...5059 lines suppressed...]
! bool >
{
inline
! bool operator() (const CStdStringA & sLeft,
! const CStdStringA & sRight) const
{
return ssicmp(sLeft.c_str(), sRight.c_str()) == 0;
***************
*** 4308,4312 ****
! // These std::swap specializations come courtesy of Mike Crusader.
//namespace std
--- 4375,4379 ----
! // These std::swap specializations come courtesy of Mike Crusader.
//namespace std
Index: tokenizer.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/tokenizer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tokenizer.cpp 30 Jun 2005 14:46:14 -0000 1.3
--- tokenizer.cpp 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 36,40 ****
while (m_nCurPos < m_cs.GetLength()
! && m_delim[static_cast < BYTE > (m_cs[m_nCurPos])])
++m_nCurPos;
--- 36,40 ----
while (m_nCurPos < m_cs.GetLength()
! && m_delim[static_cast < BYTE > (m_cs[m_nCurPos])])
++m_nCurPos;
***************
*** 44,48 ****
int nStartPos = m_nCurPos;
while (m_nCurPos < m_cs.GetLength()
! && !m_delim[static_cast < BYTE > (m_cs[m_nCurPos])])
++m_nCurPos;
--- 44,48 ----
int nStartPos = m_nCurPos;
while (m_nCurPos < m_cs.GetLength()
! && !m_delim[static_cast < BYTE > (m_cs[m_nCurPos])])
++m_nCurPos;
***************
*** 52,68 ****
}
! CStdString CTokenizer::Tail() const const const
! {
! int nCurPos = m_nCurPos;
! while (nCurPos < m_cs.GetLength()
! && m_delim[static_cast < BYTE > (m_cs[nCurPos])])
! ++nCurPos;
! CStdString csResult;
! if (nCurPos < m_cs.GetLength())
! csResult = m_cs.Mid(nCurPos);
! return csResult;
! }
--- 52,68 ----
}
! CStdString CTokenizer::Tail() const
! {
! int nCurPos = m_nCurPos;
! while (nCurPos < m_cs.GetLength()
! && m_delim[static_cast < BYTE > (m_cs[nCurPos])])
! ++nCurPos;
! CStdString csResult;
! if (nCurPos < m_cs.GetLength())
! csResult = m_cs.Mid(nCurPos);
! return csResult;
! }
Index: tokenizer.h
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/tokenizer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tokenizer.h 30 Jun 2005 14:46:14 -0000 1.3
--- tokenizer.h 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 23,37 ****
class CTokenizer
{
! public:
! CTokenizer(const CStdString & cs, const CStdString & csDelim);
! void SetDelimiters(const CStdString & csDelim);
! bool Next(CStdString & cs);
! CStdString Tail() const;
! private:
! CStdString m_cs;
! std::bitset < 256 > m_delim;
! int m_nCurPos;
};
--- 23,37 ----
class CTokenizer
{
! public:
! CTokenizer(const CStdString & cs, const CStdString & csDelim);
! void SetDelimiters(const CStdString & csDelim);
! bool Next(CStdString & cs);
! CStdString Tail() const;
! private:
! CStdString m_cs;
! std::bitset < 256 > m_delim;
! int m_nCurPos;
};
Index: windowdata.cpp
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/windowdata.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** windowdata.cpp 30 Jun 2005 14:46:14 -0000 1.3
--- windowdata.cpp 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 12,19 ****
CWindowData::CWindowData(const CStdString & csId):m_csTitle(""), m_csId(""), m_iX1(0), m_iY1(0), m_iX2(0),
! m_iY2(0)
! {
!
! }
void CWindowData::SetId(const CStdString & csId)
--- 12,17 ----
CWindowData::CWindowData(const CStdString & csId):m_csTitle(""), m_csId(""), m_iX1(0), m_iY1(0), m_iX2(0),
! m_iY2(0)
! {}
void CWindowData::SetId(const CStdString & csId)
Index: windowdata.h
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ClientDLL/windowdata.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** windowdata.h 30 Jun 2005 14:46:14 -0000 1.3
--- windowdata.h 1 Jul 2005 06:50:52 -0000 1.4
***************
*** 16,41 ****
class CWindowData
{
! public:
! CWindowData(const CStdString & csId);
! void CWindowData::SetId(const CStdString & csId);
! void CWindowData::SetTitle(const CStdString & csTitle);
! void CWindowData::SetX1(int iX1);
! void CWindowData::SetY1(int iY1);
! void CWindowData::SetX2(int iX2);
! void CWindowData::SetY2(int iY2);
! HWND CWindowData::TaskbarWindowHandle;
! CStdString CWindowData::GetId();
! CStdString CWindowData::GetTitle();
! int CWindowData::GetX1();
! int CWindowData::GetY1();
! int CWindowData::GetX2();
! int CWindowData::GetY2();
! private:
! CStdString m_csTitle;
! CStdString m_csId;
! int m_iX1, m_iY1, m_iX2, m_iY2;
};
--- 16,41 ----
class CWindowData
{
! public:
! CWindowData(const CStdString & csId);
! void CWindowData::SetId(const CStdString & csId);
! void CWindowData::SetTitle(const CStdString & csTitle);
! void CWindowData::SetX1(int iX1);
! void CWindowData::SetY1(int iY1);
! void CWindowData::SetX2(int iX2);
! void CWindowData::SetY2(int iY2);
! HWND CWindowData::TaskbarWindowHandle;
! CStdString CWindowData::GetId();
! CStdString CWindowData::GetTitle();
! int CWindowData::GetX1();
! int CWindowData::GetY1();
! int CWindowData::GetX2();
! int CWindowData::GetY2();
! private:
! CStdString m_csTitle;
! CStdString m_csId;
! int m_iX1, m_iY1, m_iX2, m_iY2;
};
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click