[akhaldi] 61557: [MSTSC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Tue Jan  7 16:29:20 2014
New Revision: 61557

URL: http://svn.reactos.org/svn/reactos?rev=61557&view=rev
Log:
[MSTSC]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/base/applications/mstsc/bitmap.c
    trunk/reactos/base/applications/mstsc/bsops.c
    trunk/reactos/base/applications/mstsc/connectdialog.c
    trunk/reactos/base/applications/mstsc/licence.c
    trunk/reactos/base/applications/mstsc/orders.c
    trunk/reactos/base/applications/mstsc/precomp.h
    trunk/reactos/base/applications/mstsc/secure.c
    trunk/reactos/base/applications/mstsc/uimain.c
    trunk/reactos/base/applications/mstsc/win32.c

Modified: trunk/reactos/base/applications/mstsc/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi…
==============================================================================
--- trunk/reactos/base/applications/mstsc/bitmap.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/bitmap.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -23,12 +23,12 @@
 /* comment out #define BITMAP_SPEED_OVER_SIZE below for one slower function */
 /* j(a)american-data.com */
 
-#define BITMAP_SPEED_OVER_SIZE
-
 /* indent is confused by this file */
 /* *INDENT-OFF* */
 
 #include "precomp.h"
+
+#define BITMAP_SPEED_OVER_SIZE
 
 #define CVAL(p)   (*(p++))
 #ifdef NEED_ALIGN

Modified: trunk/reactos/base/applications/mstsc/bsops.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs…
==============================================================================
--- trunk/reactos/base/applications/mstsc/bsops.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/bsops.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -18,9 +18,6 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-//#include <stdlib.h>
-//#include <string.h>
-//#include "bsops.h"
 #include "precomp.h"
 
 /* globals */

Modified: trunk/reactos/base/applications/mstsc/connectdialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co…
==============================================================================
--- trunk/reactos/base/applications/mstsc/connectdialog.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/connectdialog.c	[iso-8859-1] Tue Jan  7 16:29:20
2014
@@ -19,6 +19,9 @@
 */
 
 #include "precomp.h"
+
+#include <winreg.h>
+#include <commdlg.h>
 
 #define MAX_KEY_NAME 255
 

Modified: trunk/reactos/base/applications/mstsc/licence.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li…
==============================================================================
--- trunk/reactos/base/applications/mstsc/licence.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/licence.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -19,7 +19,6 @@
 */
 
 #include "precomp.h"
-//#include <openssl/rc4.h>
 
 void *
 ssl_rc4_info_create(void);

Modified: trunk/reactos/base/applications/mstsc/orders.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or…
==============================================================================
--- trunk/reactos/base/applications/mstsc/orders.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/orders.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -19,6 +19,8 @@
 */
 
 #include "precomp.h"
+
+#include "orders.h"
 
 extern uint8 *g_next_packet;
 static RDP_ORDER_STATE g_order_state;

Modified: trunk/reactos/base/applications/mstsc/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr…
==============================================================================
--- trunk/reactos/base/applications/mstsc/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/precomp.h	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -1,21 +1,17 @@
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
 #include <wingdi.h>
-#include <winuser.h>
 #include <wincon.h>
-#include <commdlg.h>
 #include <shlobj.h>
 #include <stdio.h>
 
-#include "uimain.h"
 #include "rdesktop.h"
-#include "bsops.h"
-#include "orders.h"
 #include "resource.h"
 
 #ifndef __TODO_MSTSC_H

Modified: trunk/reactos/base/applications/mstsc/secure.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se…
==============================================================================
--- trunk/reactos/base/applications/mstsc/secure.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/secure.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -19,12 +19,6 @@
 */
 
 #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);

Modified: trunk/reactos/base/applications/mstsc/uimain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui…
==============================================================================
--- trunk/reactos/base/applications/mstsc/uimain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/uimain.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -19,6 +19,8 @@
 */
 
 #include "precomp.h"
+
+#include "bsops.h"
 
 char g_username[256] = "";
 char g_hostname[256] = "";

Modified: trunk/reactos/base/applications/mstsc/win32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi…
==============================================================================
--- trunk/reactos/base/applications/mstsc/win32.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/win32.c	[iso-8859-1] Tue Jan  7 16:29:20 2014
@@ -18,8 +18,9 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-//#include <winsock2.h> /* winsock2.h first */
 #include "precomp.h"
+
+#include "uimain.h"
 
 extern char g_username[];
 extern char g_hostname[];