[USP10]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61455

diff --git a/reactos/dll/win32/usp10/bidi.c b/reactos/dll/win32/usp10/bidi.c
index 20ed7d1..6afcf70 100644 (file)
--- a/reactos/dll/win32/usp10/bidi.c
+++ b/reactos/dll/win32/usp10/bidi.c
@@ -41,17 +41,6 @@
  * has been modified.
  */
 
  * has been modified.
  */
 

-#include <config.h>
-
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-

 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bidi);
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bidi);

diff --git a/reactos/dll/win32/usp10/breaking.c b/reactos/dll/win32/usp10/breaking.c
index 30b3d67..e60b390 100644 (file)
--- a/reactos/dll/win32/usp10/breaking.c
+++ b/reactos/dll/win32/usp10/breaking.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */

-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>

 
 

-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"
-
-#include <wine/debug.h>

 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

diff --git a/reactos/dll/win32/usp10/indic.c b/reactos/dll/win32/usp10/indic.c
index 4a1bf95..380a635 100644 (file)
--- a/reactos/dll/win32/usp10/indic.c
+++ b/reactos/dll/win32/usp10/indic.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */

-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wingdi.h>
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"
-
-#include <wine/debug.h>
+

 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 #include "usp10_internal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

diff --git a/reactos/dll/win32/usp10/mirror.c b/reactos/dll/win32/usp10/mirror.c
index f640688..da7cc0d 100644 (file)
--- a/reactos/dll/win32/usp10/mirror.c
+++ b/reactos/dll/win32/usp10/mirror.c
@@ -2,7 +2,8 @@
 /* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */
 /* DO NOT EDIT!! */
 
 /* generated from http://www.unicode.org/Public/6.2.0/ucd/BidiMirroring.txt */
 /* DO NOT EDIT!! */
 

-#include <wine/unicode.h>
+#include <windef.h>
+#include <winnt.h>

 
 const WCHAR wine_mirror_map[3292] =
 {
 
 const WCHAR wine_mirror_map[3292] =
 {

diff --git a/reactos/dll/win32/usp10/opentype.c b/reactos/dll/win32/usp10/opentype.c
index be68e9c..a46daf2 100644 (file)
--- a/reactos/dll/win32/usp10/opentype.c
+++ b/reactos/dll/win32/usp10/opentype.c
@@ -18,20 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */

-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <usp10.h>
-#include <winternl.h>

 
 #include "usp10_internal.h"
 
 
 #include "usp10_internal.h"
 

-#include <wine/debug.h>
+#include <winternl.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 

diff --git a/reactos/dll/win32/usp10/shape.c b/reactos/dll/win32/usp10/shape.c
index 1d962a7..e7d1558 100644 (file)
--- a/reactos/dll/win32/usp10/shape.c
+++ b/reactos/dll/win32/usp10/shape.c
@@ -18,21 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */

-#include <stdarg.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <usp10.h>
-//#include "winternl.h"

 
 #include "usp10_internal.h"
 
 
 #include "usp10_internal.h"
 

-#include <wine/debug.h>
-

 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 #define FIRST_ARABIC_CHAR 0x0600
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 #define FIRST_ARABIC_CHAR 0x0600

diff --git a/reactos/dll/win32/usp10/usp10.c b/reactos/dll/win32/usp10/usp10.c
index d4159d0..56a7491 100644 (file)
--- a/reactos/dll/win32/usp10/usp10.c
+++ b/reactos/dll/win32/usp10/usp10.c
@@ -24,21 +24,10 @@
  * and filtering characters and bi-directional text with custom line breaks.
  */
 
  * and filtering characters and bi-directional text with custom line breaks.
  */
 

-#include <stdarg.h>
-//#include <stdlib.h>
+#include "usp10_internal.h"

 
 

-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>

 #include <winuser.h>
 #include <winuser.h>

-//#include "winnls.h"

 #include <winreg.h>
 #include <winreg.h>

-#include <usp10.h>
-
-#include "usp10_internal.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 

diff --git a/reactos/dll/win32/usp10/usp10_internal.h b/reactos/dll/win32/usp10/usp10_internal.h
index 77bb20d..0196a2d 100644 (file)
--- a/reactos/dll/win32/usp10/usp10_internal.h
+++ b/reactos/dll/win32/usp10/usp10_internal.h
@@ -18,6 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */

+
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <usp10.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+

 #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
           ( ( (ULONG)_x4 << 24 ) |     \
             ( (ULONG)_x3 << 16 ) |     \
 #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
           ( ( (ULONG)_x4 << 24 ) |     \
             ( (ULONG)_x3 << 16 ) |     \