* 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
This commit is contained in:
Amine Khaldi 2013-12-27 23:54:47 +00:00
parent 0ba1b34e24
commit 833e0020ba
8 changed files with 22 additions and 74 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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] =
{

View file

@ -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 <winternl.h>
#include "usp10_internal.h"
#include <wine/debug.h>
#include <winternl.h>
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

View file

@ -18,21 +18,9 @@
* 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);
#define FIRST_ARABIC_CHAR 0x0600

View file

@ -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 <winuser.h>
//#include "winnls.h"
#include <winreg.h>
#include <usp10.h>
#include "usp10_internal.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#include <winuser.h>
#include <winreg.h>
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);

View file

@ -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 ) | \