Author: akhaldi Date: Fri Dec 27 23:54:47 2013 New Revision: 61455
URL: http://svn.reactos.org/svn/reactos?rev=61455&view=rev Log: [USP10] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indic.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h
Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -41,17 +41,6 @@ * 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);
Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c?... ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,7 @@ * 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);
Modified: trunk/reactos/dll/win32/usp10/indic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indic.c?rev... ============================================================================== --- trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,7 @@ * 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);
Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?re... ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -2,7 +2,8 @@ /* 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] = {
Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c?... ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,10 @@ * 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 "usp10_internal.h" + #include <winternl.h> - -#include "usp10_internal.h" - -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?rev... ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,20 +18,8 @@ * 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 <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?rev... ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -24,21 +24,10 @@ * and filtering characters and bi-directional text with custom line breaks. */
-#include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> +#include "usp10_internal.h" + #include <winuser.h> -//#include "winnls.h" #include <winreg.h> -#include <usp10.h> - -#include "usp10_internal.h" - -#include <wine/debug.h> -#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inter... ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Fri Dec 27 23:54:47 2013 @@ -18,6 +18,23 @@ * 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 ) | \