[tkreuzer] 52240: [HOST] Only use /include/host as include directory for host tools / libs.
Author: tkreuzer Date: Wed Jun 15 10:30:03 2011 New Revision: 52240
URL: http://svn.reactos.org/svn/reactos?rev=52240&view=rev Log: [HOST] Only use /include/host as include directory for host tools / libs.
Added: trunk/reactos/include/host/wine/unicode.h - copied, changed from r52236, trunk/reactos/tools/unicode/wine/unicode.h trunk/reactos/tools/rbuild_helper/argv_parser.h - copied, changed from r52236, trunk/reactos/include/reactos/kjk/argv_parser.h trunk/reactos/tools/rbuild_helper/null_output_iterator.h - copied unchanged from r52236, trunk/reactos/include/reactos/kjk/null_output_iterator.h trunk/reactos/tools/rbuild_helper/stringz_iterator.h - copied unchanged from r52236, trunk/reactos/include/reactos/kjk/stringz_iterator.h Removed: trunk/reactos/include/host/wcsfuncs.h trunk/reactos/lib/host/ trunk/reactos/tools/unicode/wine/unicode.h Modified: trunk/reactos/CMakeLists.txt trunk/reactos/ReactOS-generic.rbuild trunk/reactos/include/host/config.h trunk/reactos/include/host/nls.h trunk/reactos/include/host/typedefs.h trunk/reactos/lib/CMakeLists.txt trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/inflib.mak trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/lib.rbuild trunk/reactos/lib/newinflib/CMakeLists.txt trunk/reactos/lib/newinflib/builddep.h trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/nandflash/nandflash.h trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/write_msft.c trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/wrcrostypes.h
Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52240&am... ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -52,11 +52,7 @@ add_compiler_flags(-fshort-wchar) endif()
- include_directories( - ${REACTOS_SOURCE_DIR}/tools/unicode - include - include/host - ${REACTOS_BINARY_DIR}/include) + include_directories(include/host)
add_subdirectory(tools) add_subdirectory(lib)
Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev=... ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -81,10 +81,7 @@ <include root="intermediate">include/reactos/mc</include> <include>include/reactos/libs</include>
- <include host="true">include</include> - <include host="true" root="intermediate">include</include> - <include host="true">include/reactos</include> - <include host="true">include/reactos/wine</include> + <include host="true">include/host</include>
<group compilerset="gcc"> <compilerflag>-Wall</compilerflag>
Modified: trunk/reactos/include/host/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/config.h?rev=5... ============================================================================== --- trunk/reactos/include/host/config.h [iso-8859-1] (original) +++ trunk/reactos/include/host/config.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -1,7 +1,5 @@ /* include/config.h. Generated by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ - -#include "reactos/buildno.h"
#define __WINE_CONFIG_H
@@ -125,7 +123,7 @@ #define PACKAGE_TARNAME "ReactOS"
/* Define to the version of this package. */ -#define PACKAGE_VERSION KERNEL_VERSION_STR +#define PACKAGE_VERSION "<undefined version>"
/* Define to the full name and version of this package. */ #define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
Modified: trunk/reactos/include/host/nls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/nls.h?rev=5224... ============================================================================== --- trunk/reactos/include/host/nls.h [iso-8859-1] (original) +++ trunk/reactos/include/host/nls.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,7 +9,7 @@ #ifndef _HOST_NLS_H #define _HOST_NLS_H
-#include <host/typedefs.h> +#include <typedefs.h>
typedef DWORD LCID;
Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?rev... ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -70,7 +70,7 @@ #define MAXUSHORT USHRT_MAX
/* Widely used structures */ -#include <host/pshpack4.h> +#include <pshpack4.h> typedef struct _RTL_BITMAP { ULONG SizeOfBitMap; @@ -112,7 +112,7 @@ USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -#include <host/poppack.h> +#include <poppack.h>
/* List Functions */ static __inline @@ -170,7 +170,7 @@ { PLIST_ENTRY OldFlink; PLIST_ENTRY OldBlink; - + OldFlink = Entry->Flink; OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; @@ -185,7 +185,7 @@ { PLIST_ENTRY Flink; PLIST_ENTRY Entry; - + Entry = ListHead->Flink; Flink = Entry->Flink; ListHead->Flink = Flink; @@ -200,7 +200,7 @@ { PLIST_ENTRY Blink; PLIST_ENTRY Entry; - + Entry = ListHead->Blink; Blink = Entry->Blink; ListHead->Blink = Blink;
Removed: trunk/reactos/include/host/wcsfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wcsfuncs.h?rev... ============================================================================== --- trunk/reactos/include/host/wcsfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wcsfuncs.h (removed) @@ -1,29 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/host/wcsfuncs.h - PURPOSE: Header for the "host_wcsfuncs" static library - COPYRIGHT: Copyright 2008 Colin Finck mail@colinfinck.de -*/ - -#ifndef _HOST_WCSFUNCS_H -#define _HOST_WCSFUNCS_H - -#ifdef USE_HOST_WCSFUNCS - /* Function prototypes */ - -#else - /* Map str*W functions to wcs* function */ - - #define isspaceW iswspace - #define strchrW wcschr - #define strcmpiW _wcsicmp - #define strcpyW wcscpy - #define strlenW wcslen - #define strncmpW wcsncmp - #define strtolW wcstol - #define strtoulW wcstoul - -#endif - -#endif
Copied: trunk/reactos/include/host/wine/unicode.h (from r52236, trunk/reactos/tools/unicode/wine/unicode.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wine/unicode.h... ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wine/unicode.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -23,7 +23,7 @@
#include <stdarg.h> #include <string.h> -#include <host/typedefs.h> +#include <typedefs.h>
// Definitions copied from <winnls.h> // We only want to include host headers, so we define them manually
Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=5224... ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -24,7 +24,6 @@
else()
-add_subdirectory(host/wcsfuncs) add_subdirectory(3rdparty/zlib)
endif()
Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=5224... ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -46,11 +46,7 @@ // #define VALUE_COMP_NAME 0x0001
-#ifdef CMLIB_HOST -#include <host/pshpack1.h> -#else #include <pshpack1.h> -#endif
// // For memory-mapped Hives @@ -154,11 +150,7 @@ UCHAR Data[ANYSIZE_ARRAY]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY;
-#ifdef CMLIB_HOST -#include <host/poppack.h> -#else #include <poppack.h> -#endif
// // Generic Index Entry
Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=52240... ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -14,7 +14,7 @@
#ifdef CMLIB_HOST #include <wine/unicode.h> - #include <host/typedefs.h> + #include <typedefs.h> #include <stdio.h> #include <string.h>
@@ -92,9 +92,9 @@ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT #include <ntddk.h> -#endif - -#include <host/wcsfuncs.h> + #include <wcsfuncs.h> +#endif +
// // These define the Debug Masks Supported @@ -311,8 +311,8 @@ VOID CMAPI CmPrepareHive( PHHIVE RegistryHive); - - + + BOOLEAN CMAPI HvTrackCellRef(
Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=52... ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -100,11 +100,7 @@ Volatile = 1 } HSTORAGE_TYPE;
-#ifdef CMLIB_HOST -#include <host/pshpack1.h> -#else #include <pshpack1.h> -#endif
/** * @name HBASE_BLOCK @@ -188,11 +184,7 @@ LONG Size; } HCELL, *PHCELL;
-#ifdef CMLIB_HOST -#include <host/poppack.h> -#else #include <poppack.h> -#endif
struct _HHIVE;
Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=5... ============================================================================== --- trunk/reactos/lib/inflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/builddep.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -8,7 +8,7 @@
/* Definitions native to the host on which we're building */
-#include <host/typedefs.h> +#include <typedefs.h>
#include <stdarg.h> #include <stdio.h>
Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=5... ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -32,7 +32,7 @@
INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Iinclude/host -Iinclude $(HOST_CFLAGS)
$(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR)
Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?re... ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -11,6 +11,7 @@ <file>infrosput.c</file> </module> <module name="inflibhost" type="hoststaticlibrary" allowwarnings="true"> + <include base="ReactOS">include/host</include> <include base="inflibhost">.</include> <define name="__NO_CTYPE_INLINES" /> <group compilerset="gcc">
Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=52240&am... ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -30,9 +30,6 @@ </directory> <directory name="fslib"> <xi:include href="fslib/directory.rbuild" /> - </directory> - <directory name="host"> - <xi:include href="host/directory.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" />
Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.tx... ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -5,7 +5,7 @@ infput.c)
if(CMAKE_CROSSCOMPILING) - list(APPEND SOURCE + list(APPEND SOURCE infrosgen.c infrosget.c infrosput.c) @@ -13,7 +13,7 @@ add_library(inflib ${GLOBAL_FILES} ${SOURCE}) add_dependencies(inflib psdk) else() - list(APPEND SOURCE + list(APPEND SOURCE infhostgen.c infhostget.c infhostput.c
Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?re... ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,7 +9,7 @@ /* Definitions native to the host on which we're building */
#include <wine/unicode.h> -#include <host/typedefs.h> +#include <typedefs.h>
#include <stdarg.h> #include <stdio.h> @@ -63,6 +63,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <wcsfuncs.h>
extern PVOID InfpHeap;
@@ -82,6 +83,4 @@
#endif /* INFLIB_HOST */
-#include <host/wcsfuncs.h> - /* EOF */
Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?rev... ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -14,7 +14,7 @@ #include <stdlib.h> #include <getopt.h> #include <time.h> -#include <host/typedefs.h> +#include <typedefs.h>
#define KEYWORD_COUNT 17
Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=5... ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -29,10 +29,7 @@ #include <stdio.h> #include <stdlib.h>
-#include <host/typedefs.h> - -#define USE_HOST_WCSFUNCS -#include <host/wcsfuncs.h> +#include <typedefs.h>
// Definitions copied from <ntstatus.h> // We only want to include host headers, so we define them manually
Modified: trunk/reactos/tools/nandflash/nandflash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/nandflash.h... ============================================================================== --- trunk/reactos/tools/nandflash/nandflash.h [iso-8859-1] (original) +++ trunk/reactos/tools/nandflash/nandflash.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -11,7 +11,7 @@ #include <string.h> #include <stdio.h> #include <fcntl.h> -#include <host/typedefs.h> +#include <typedefs.h>
/* NAND Image Sizes */ #define NAND_PAGE_SIZE (2 * 1024) // 2 KB
Copied: trunk/reactos/tools/rbuild_helper/argv_parser.h (from r52236, trunk/reactos/include/reactos/kjk/argv_parser.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/argv_pa... ============================================================================== --- trunk/reactos/include/reactos/kjk/argv_parser.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/argv_parser.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -24,7 +24,7 @@ #define KJK_ARGV_PARSER_H_
#include <iterator> -#include <kjk/null_output_iterator.h> +#include <null_output_iterator.h>
namespace kjk {
Modified: trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/rbuild_... ============================================================================== --- trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -47,8 +47,8 @@ #define ARRAYSIZE(X_) (sizeof(X_) / sizeof((X_)[0])) #endif
-#include <kjk/argv_parser.h> -#include <kjk/stringz_iterator.h> +#include <argv_parser.h> +#include <stringz_iterator.h>
using namespace kjk;
Modified: trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/rbuild_... ============================================================================== --- trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <module name="rbuild_helper" type="buildtool"> + <include base="rbuild_helper">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> <file>rbuild_helper.cpp</file>
Removed: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode.... ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/wine/unicode.h (removed) @@ -1,329 +1,0 @@ -/* - * Wine internal Unicode definitions - * - * Copyright 2000 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINE_UNICODE_H -#define __WINE_WINE_UNICODE_H - -#include <stdarg.h> -#include <string.h> -#include <host/typedefs.h> - -// Definitions copied from <winnls.h> -// We only want to include host headers, so we define them manually -#define C1_UPPER 1 -#define C1_LOWER 2 -#define C1_DIGIT 4 -#define C1_SPACE 8 -#define C1_PUNCT 16 -#define C1_CNTRL 32 -#define C1_BLANK 64 -#define C1_XDIGIT 128 -#define C1_ALPHA 256 -#define MB_COMPOSITE 2 -#define MB_ERR_INVALID_CHARS 8 -#define MB_USEGLYPHCHARS 0x04 -#define WC_COMPOSITECHECK 512 -#define WC_DISCARDNS 16 -#define WC_DEFAULTCHAR 64 -#define WC_NO_BEST_FIT_CHARS 1024 -#define WC_ERR_INVALID_CHARS 0x0080 - -#ifdef __WINE_WINE_TEST_H -#error This file should not be used in Wine tests -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef WINE_UNICODE_API -# if defined(_MSC_VER) || defined(__MINGW32__) -# define WINE_UNICODE_API DECLSPEC_IMPORT -# else -# define WINE_UNICODE_API -# endif -#endif - -#ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE static inline -#endif - -/* code page info common to SBCS and DBCS */ -struct cp_info -{ - unsigned int codepage; /* codepage id */ - unsigned int char_size; /* char size (1 or 2 bytes) */ - WCHAR def_char; /* default char value (can be double-byte) */ - WCHAR def_unicode_char; /* default Unicode char value */ - const char *name; /* code page name */ -}; - -struct sbcs_table -{ - struct cp_info info; - const WCHAR *cp2uni; /* code page -> Unicode map */ - const WCHAR *cp2uni_glyphs; /* code page -> Unicode map with glyph chars */ - const unsigned char *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; -}; - -struct dbcs_table -{ - struct cp_info info; - const WCHAR *cp2uni; /* code page -> Unicode map */ - const unsigned char *cp2uni_leadbytes; - const unsigned short *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; - unsigned char lead_bytes[12]; /* lead bytes ranges */ -}; - -union cptable -{ - struct cp_info info; - struct sbcs_table sbcs; - struct dbcs_table dbcs; -}; - -extern const union cptable *wine_cp_get_table( unsigned int codepage ); -extern const union cptable *wine_cp_enum_table( unsigned int index ); - -extern int wine_cp_mbstowcs( const union cptable *table, int flags, - const char *src, int srclen, - WCHAR *dst, int dstlen ); -extern int wine_cp_wcstombs( const union cptable *table, int flags, - const WCHAR *src, int srclen, - char *dst, int dstlen, const char *defchar, int *used ); -extern int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); - -extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); -extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); - -extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); -extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); -extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); -extern WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ); -extern long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); -extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); -extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); -extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); - -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) -{ - return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); -} - -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) -{ - extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; -} - -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) -{ - extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; - return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; -} - -/* the character type contains the C1_* flags in the low 12 bits */ -/* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) -{ - extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; - return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; -} - -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_CNTRL; -} - -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_PUNCT; -} - -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_SPACE; -} - -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_DIGIT; -} - -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_XDIGIT; -} - -WINE_UNICODE_INLINE int islowerW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_LOWER; -} - -WINE_UNICODE_INLINE int isupperW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_UPPER; -} - -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isprintW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -/* some useful string manipulation routines */ - -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return (unsigned int)(s - str); -} - -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) -{ - WCHAR *p = dst; - while ((*p++ = *src++)); - return dst; -} - -/* strncpy doesn't do what you think, don't use it */ -#define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead - -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) -{ - strcpyW( dst + strlenW(dst), src ); - return dst; -} - -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); - return NULL; -} - -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) -{ - WCHAR *ret = NULL; - do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); - return ret; -} - -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) -{ - for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; - return NULL; -} - -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; - return ptr - str; -} - -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; - return ptr - str; -} - -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) -{ - WCHAR *ret = str; - while ((*str = tolowerW(*str))) str++; - return ret; -} - -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) -{ - WCHAR *ret = str; - while ((*str = toupperW(*str))) str++; - return ret; -} - -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; - return NULL; -} - -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; -} - -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -{ - return strtolW( str, (WCHAR **)0, 10 ); -} - -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) -{ - return (int)atolW( str ); -} - -#undef WINE_UNICODE_INLINE - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_WINE_UNICODE_H */
Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=52240... ============================================================================== --- trunk/reactos/tools/widl/hash.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/hash.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdarg.h>
-#include <host/nls.h> +#include <nls.h>
#include "widltypes.h" #include "hash.h"
Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=52... ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -35,7 +35,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT
-#include <host/typedefs.h> +#include <typedefs.h>
#include "widl.h" #include "utils.h"
Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.h... ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -302,7 +302,7 @@ * */
-#include <host/pshpack1.h> +#include <pshpack1.h>
typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */
-#include <host/poppack.h> +#include <poppack.h>
/*---------------------------END--------------------------------------------*/ #endif
Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?rev... ============================================================================== --- trunk/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/write_msft.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -40,8 +40,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT
-#include <host/typedefs.h> -#include <host/nls.h> +#include <typedefs.h> +#include <nls.h>
#include "widl.h" #include "typelib.h" @@ -909,7 +909,7 @@
if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -947,7 +947,7 @@
if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; } else { @@ -1129,7 +1129,7 @@
if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -1548,7 +1548,7 @@ }
/* update the index data */ - typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; + typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; typeinfo->func_offsets[typeinfo->typeinfo->cElement & 0xffff] = offset; typeinfo->func_names[typeinfo->typeinfo->cElement & 0xffff] = name_offset;
@@ -1605,7 +1605,7 @@ INT *typedata; int var_datawidth; int var_alignment; - int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; + int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; const attr_t *attr; @@ -2551,8 +2551,8 @@ time_t cur_time; char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ - GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}};
pointer_size = (typelib_kind == SYS_WIN64) ? 8 : 4;
@@ -2594,7 +2594,7 @@ set_help_context(msft); set_help_string_dll(msft); set_help_string_context(msft); - + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE");
Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=52... ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -23,7 +23,7 @@
#include <stdarg.h> #include <string.h> -#include <host/typedefs.h> +#include <typedefs.h>
/* Byteordering defines */ #define WMC_BO_NATIVE 0x00
Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=52... ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -32,7 +32,7 @@ #include "utils.h" #include "parser.h"
-#include <host/pshpack2.h> +#include <pshpack2.h> typedef struct { DWORD biSize; @@ -41,7 +41,7 @@ WORD biPlanes; WORD biBitCount; } BITMAPOS2HEADER; -#include <host/poppack.h> +#include <poppack.h>
/* Generate new_* functions that have no parameters (NOTE: no ';') */ __NEW_STRUCT_FUNC(dialog)
Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?rev... ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,8 +9,8 @@ #ifndef _WRC_ROSTYPES_H #define _WRC_ROSTYPES_H
-#include <host/typedefs.h> -#include <host/nls.h> +#include <typedefs.h> +#include <nls.h> #include <string.h>
// Definitions copied from various <win....h> files @@ -55,7 +55,7 @@ #define WS_TABSTOP 0x10000 #define WS_VISIBLE 0x10000000
-#include <host/pshpack2.h> +#include <pshpack2.h> typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -63,7 +63,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; -#include <host/poppack.h> +#include <poppack.h>
typedef int FXPT2DOT30; typedef struct tagCIEXYZ {
-
tkreuzer＠svn.reactos.org