[MSTSC]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61557

diff --git a/reactos/base/applications/mstsc/bitmap.c b/reactos/base/applications/mstsc/bitmap.c
index 97dec34..b5683bd 100644 (file)
--- a/reactos/base/applications/mstsc/bitmap.c
+++ b/reactos/base/applications/mstsc/bitmap.c
@@ -23,13 +23,13 @@
 /* comment out #define BITMAP_SPEED_OVER_SIZE below for one slower function */
 /* j@american-data.com */
 
 /* comment out #define BITMAP_SPEED_OVER_SIZE below for one slower function */
 /* j@american-data.com */
 

-#define BITMAP_SPEED_OVER_SIZE
-

 /* indent is confused by this file */
 /* *INDENT-OFF* */
 
 #include "precomp.h"
 
 /* indent is confused by this file */
 /* *INDENT-OFF* */
 
 #include "precomp.h"
 

+#define BITMAP_SPEED_OVER_SIZE
+

 #define CVAL(p)   (*(p++))
 #ifdef NEED_ALIGN
 #ifdef L_ENDIAN
 #define CVAL(p)   (*(p++))
 #ifdef NEED_ALIGN
 #ifdef L_ENDIAN

diff --git a/reactos/base/applications/mstsc/bsops.c b/reactos/base/applications/mstsc/bsops.c
index 8c22270..d612e02 100644 (file)
--- a/reactos/base/applications/mstsc/bsops.c
+++ b/reactos/base/applications/mstsc/bsops.c
@@ -18,9 +18,6 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 

-//#include <stdlib.h>
-//#include <string.h>
-//#include "bsops.h"

 #include "precomp.h"
 
 /* globals */
 #include "precomp.h"
 
 /* globals */

diff --git a/reactos/base/applications/mstsc/connectdialog.c b/reactos/base/applications/mstsc/connectdialog.c
index a10716a..c67ecd9 100644 (file)
--- a/reactos/base/applications/mstsc/connectdialog.c
+++ b/reactos/base/applications/mstsc/connectdialog.c
@@ -20,6 +20,9 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include <winreg.h>
+#include <commdlg.h>
+

 #define MAX_KEY_NAME 255
 
 HINSTANCE hInst;
 #define MAX_KEY_NAME 255
 
 HINSTANCE hInst;

diff --git a/reactos/base/applications/mstsc/licence.c b/reactos/base/applications/mstsc/licence.c
index f753f9b..5be375f 100644 (file)
--- a/reactos/base/applications/mstsc/licence.c
+++ b/reactos/base/applications/mstsc/licence.c
@@ -19,7 +19,6 @@
 */
 
 #include "precomp.h"
 */
 
 #include "precomp.h"

-//#include <openssl/rc4.h>

 
 void *
 ssl_rc4_info_create(void);
 
 void *
 ssl_rc4_info_create(void);

diff --git a/reactos/base/applications/mstsc/orders.c b/reactos/base/applications/mstsc/orders.c
index 3591930..c0e8611 100644 (file)
--- a/reactos/base/applications/mstsc/orders.c
+++ b/reactos/base/applications/mstsc/orders.c
@@ -20,6 +20,8 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include "orders.h"
+

 extern uint8 *g_next_packet;
 static RDP_ORDER_STATE g_order_state;
 extern BOOL g_use_rdp5;
 extern uint8 *g_next_packet;
 static RDP_ORDER_STATE g_order_state;
 extern BOOL g_use_rdp5;

diff --git a/reactos/base/applications/mstsc/precomp.h b/reactos/base/applications/mstsc/precomp.h
index 7506193..628b7de 100644 (file)
--- a/reactos/base/applications/mstsc/precomp.h
+++ b/reactos/base/applications/mstsc/precomp.h
@@ -1,21 +1,17 @@
+#include <stdarg.h>
+

 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

-#include <stdarg.h>
+

 #include <windef.h>
 #include <winbase.h>
 #include <windef.h>
 #include <winbase.h>

-#include <winreg.h>

 #include <wingdi.h>
 #include <wingdi.h>

-#include <winuser.h>

 #include <wincon.h>
 #include <wincon.h>

-#include <commdlg.h>

 #include <shlobj.h>
 #include <stdio.h>
 
 #include <shlobj.h>
 #include <stdio.h>
 

-#include "uimain.h"

 #include "rdesktop.h"
 #include "rdesktop.h"

-#include "bsops.h"
-#include "orders.h"

 #include "resource.h"
 
 #ifndef __TODO_MSTSC_H
 #include "resource.h"
 
 #ifndef __TODO_MSTSC_H

diff --git a/reactos/base/applications/mstsc/secure.c b/reactos/base/applications/mstsc/secure.c
index 04ae91b..80d4024 100644 (file)
--- a/reactos/base/applications/mstsc/secure.c
+++ b/reactos/base/applications/mstsc/secure.c
@@ -20,12 +20,6 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

-//#include <openssl/rc4.h>
-//#include <openssl/md5.h>
-//#include <openssl/sha.h>
-//#include <openssl/bn.h>
-//#include <openssl/x509v3.h>
-

 void *
 ssl_sha1_info_create(void);
 void
 void *
 ssl_sha1_info_create(void);
 void

diff --git a/reactos/base/applications/mstsc/uimain.c b/reactos/base/applications/mstsc/uimain.c
index c2b1386..b280999 100644 (file)
--- a/reactos/base/applications/mstsc/uimain.c
+++ b/reactos/base/applications/mstsc/uimain.c
@@ -20,6 +20,8 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include "bsops.h"
+

 char g_username[256] = "";
 char g_hostname[256] = "";
 char g_servername[256] = "";
 char g_username[256] = "";
 char g_hostname[256] = "";
 char g_servername[256] = "";

diff --git a/reactos/base/applications/mstsc/win32.c b/reactos/base/applications/mstsc/win32.c
index 18c8ed3..1cad8d3 100644 (file)
--- a/reactos/base/applications/mstsc/win32.c
+++ b/reactos/base/applications/mstsc/win32.c
@@ -18,9 +18,10 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 

-//#include <winsock2.h> /* winsock2.h first */

 #include "precomp.h"
 
 #include "precomp.h"
 

+#include "uimain.h"
+

 extern char g_username[];
 extern char g_hostname[];
 extern char g_servername[];
 extern char g_username[];
 extern char g_hostname[];
 extern char g_servername[];