From 049035cfea6e68481a18eff8cef5143de851244f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 23 Jan 2004 21:18:27 +0000 Subject: [PATCH] Move kernel32-internal declarations from global include directory to local one. svn path=/trunk/; revision=7852 --- reactos/include/kernel32/cptable.h | 127 -------- reactos/include/kernel32/error.h | 14 - reactos/include/kernel32/heap.h | 108 ------- reactos/include/kernel32/kernel32.h | 59 ---- reactos/include/kernel32/lctable.h | 36 --- reactos/include/kernel32/nls.h | 26 -- reactos/include/kernel32/proc.h | 23 -- reactos/include/kernel32/process.h | 63 ---- reactos/include/kernel32/thread.h | 15 - reactos/include/kernel32/winnls.h | 429 ---------------------------- reactos/include/ntos.h | 3 +- 11 files changed, 1 insertion(+), 902 deletions(-) delete mode 100644 reactos/include/kernel32/cptable.h delete mode 100644 reactos/include/kernel32/error.h delete mode 100644 reactos/include/kernel32/heap.h delete mode 100644 reactos/include/kernel32/kernel32.h delete mode 100644 reactos/include/kernel32/lctable.h delete mode 100644 reactos/include/kernel32/nls.h delete mode 100644 reactos/include/kernel32/proc.h delete mode 100644 reactos/include/kernel32/process.h delete mode 100644 reactos/include/kernel32/thread.h delete mode 100644 reactos/include/kernel32/winnls.h diff --git a/reactos/include/kernel32/cptable.h b/reactos/include/kernel32/cptable.h deleted file mode 100644 index cbc2d3e7c65..00000000000 --- a/reactos/include/kernel32/cptable.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - * nls/cptable.h - */ - -#ifndef __NLS_CPTABLE_H -#define __NLS_CPTABLE_H - -#undef WIN32_LEAN_AND_MEAN -#include -#include - - -#define CODEPAGE_ANSI 1 -#define CODEPAGE_OEM 2 -#define CODEPAGE_MAC 3 -#define CODEPAGE_EBCDIC 4 -#define CODEPAGE_DBCS 0x10 - - - -typedef struct __CURRENCYFMTA -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPSTR lpDecimalSep; - LPSTR lpThousandSep; - UINT NegativeOrder; - UINT PositiveOrder; - LPSTR lpCurrencySymbol; -} CURRENCYFMTA, *PCURRENCYFMTA, *LPCURRENCYFMTA; - -typedef struct __CURRENCYFMTW -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPWSTR lpDecimalSep; - LPWSTR lpThousandSep; - UINT NegativeOrder; - UINT PositiveOrder; - LPWSTR lpCurrencySymbol; -} CURRENCYFMTW, *PCURRENCYFMTW, *LPCURRENCYFMTW; - -typedef struct __NUMBERFMTA -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPSTR lpDecimalSep; - LPSTR lpThousandSep; - UINT NegativeOrder; -} NUMBERFMTA, *PNUMBERFMTA, *LPNUMBERFMTA; - -typedef struct __NUMBERFMTW -{ - UINT NumDigits; - UINT LeadingZero; - UINT Grouping; - LPWSTR lpDecimalSep; - LPWSTR lpThousandSep; - UINT NegativeOrder; -} NUMBERFMTW, *PNUMBERFMTW, *LPNUMBERFMTW; - -typedef struct __CODEPAGE -{ - struct __CODEPAGE *Next; - INT Id; - DWORD Flags; - WCHAR **ToUnicode; - WCHAR **ToUnicodeGlyph; - CHAR ***FromUnicode; - LPCPINFO Info; -} CODEPAGE, *PCODEPAGE; - -extern PCODEPAGE __CPFirst; - -extern CODEPAGE __CP37; -extern CODEPAGE __CP437; -extern CODEPAGE __CP500; -extern CODEPAGE __CP737; -extern CODEPAGE __CP775; -extern CODEPAGE __CP850; -extern CODEPAGE __CP852; -extern CODEPAGE __CP855; -extern CODEPAGE __CP857; -extern CODEPAGE __CP860; -extern CODEPAGE __CP861; -extern CODEPAGE __CP863; -extern CODEPAGE __CP865; -extern CODEPAGE __CP866; -extern CODEPAGE __CP869; -extern CODEPAGE __CP875; -extern CODEPAGE __CP1026; -extern CODEPAGE __CP1250; -extern CODEPAGE __CP1251; -extern CODEPAGE __CP1252; -extern CODEPAGE __CP1253; -extern CODEPAGE __CP1254; -extern CODEPAGE __CP1255; -extern CODEPAGE __CP1256; -extern CODEPAGE __CP1257; -extern CODEPAGE __CP1258; -extern CODEPAGE __CP10000; -extern CODEPAGE __CP10006; -extern CODEPAGE __CP10007; -extern CODEPAGE __CP10029; -extern CODEPAGE __CP10079; -extern CODEPAGE __CP10081; - -extern CPINFO __CPGenInfo; - -extern WCHAR __ASCII_00[32]; -extern WCHAR __ASCII_20[32]; -extern WCHAR __ASCII_40[32]; -extern WCHAR __ASCII_60[32]; - -extern CHAR __ASCII_0000[32]; -extern CHAR __ASCII_0020[32]; -extern CHAR __ASCII_0040[32]; -extern CHAR __ASCII_0060[32]; - -extern WCHAR __NULL_00[32]; -extern CHAR __NULL_0000[32]; -extern CHAR *__NULL_00XX[32]; - -#endif \ No newline at end of file diff --git a/reactos/include/kernel32/error.h b/reactos/include/kernel32/error.h deleted file mode 100644 index 7100ca121fa..00000000000 --- a/reactos/include/kernel32/error.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _INCLUDE_KERNEL32_H -#define _INCLUDE_KERNEL32_H -/* $Id: error.h,v 1.5 2003/11/18 05:09:17 royce Exp $ */ -#include -#define NTOS_MODE_USER -#ifndef _NTOS_H -#error you must include before you can include kernel32/error.h -/*#include */ -#endif/*_NTOS_H*/ - -#define SetLastErrorByStatus(__S__) \ - ((void)SetLastError(RtlNtStatusToDosError(__S__))) - -#endif /* _INCLUDE_KERNEL32_H */ diff --git a/reactos/include/kernel32/heap.h b/reactos/include/kernel32/heap.h deleted file mode 100644 index 6a1de987aa5..00000000000 --- a/reactos/include/kernel32/heap.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * kernel/heap.c - * Copyright (C) 1996, Onno Hovers, All rights reserved - * Adapted for the ReactOS system libraries by David Welch (welch@mcmail.com) - * todo: __processheap should be part of peb. - */ - -#ifndef __INCLUDE_KERNEL32_HEAP_H -#define __INCLUDE_KERNEL32_HEAP_H - -/* System wide includes ****************************************************/ -#include - -/* System library's private includes ***************************************/ - -#include - -/* definitions */ -#define HEAP_ADMIN_SIZE (sizeof(HEAP_BLOCK)) -#define HEAP_FRAG_ADMIN_SIZE (sizeof(HEAP_FRAGMENT)) -#define HEAP_ROUNDVAL (2*(HEAP_ADMIN_SIZE)-1) -#define HEAP_FRAGMENT_THRESHOLD 256 - -#define SIZE_TOTAL(s) ROUNDUP((s)+HEAP_ADMIN_SIZE,8) -#define SIZE_ROUND(s) ROUNDUP((s),8) - -#define HEAP_FRAG_MAGIC 0x10 -#define HEAP_ALLOC_MASK 0xF0000000 -#define HEAP_FREE_MASK 0x80000000 -#define HEAP_SIZE_MASK 0x0FFFFFFF -#define HEAP_FREE_TAG 0x80000000 /* free region */ -#define HEAP_NORMAL_TAG 0x30000000 /* normal allocation */ -#define HEAP_MOVEABLE_TAG 0x50000000 /* moveable handle */ -#define HEAP_SUB_TAG 0x70000000 /* suballocated for fragments */ - -#define HEAP_ISFREE(p) ((((PHEAP_BLOCK)p)->Size) & HEAP_FREE_MASK) -#define HEAP_ISALLOC(p) (((((PHEAP_BLOCK)p)->Size) & HEAP_FREE_MASK)==0) -#define HEAP_ISFRAG(p) ((((PHEAP_FRAGMENT)p)->Magic)==HEAP_FRAG_MAGIC) -#define HEAP_ISNORMAL(p) (((((PHEAP_BLOCK)p)->Size) & HEAP_ALLOC_MASK)\ - ==HEAP_NORMAL_TAG) -#define HEAP_ISSUB(p) (((((PHEAP_BLOCK)p)->Size) & HEAP_ALLOC_MASK)\ - ==HEAP_SUB_TAG) -#define HEAP_ISOLD(p) (((((PHEAP_BLOCK)p)->Size) & HEAP_ALLOC_MASK)\ - ==HEAP_MOVEABLE_TAG) - -#define HEAP_SIZE(p) ((((PHEAP_BLOCK)p)->Size) & HEAP_SIZE_MASK ) -#define HEAP_RSIZE(p) SIZE_ROUND(HEAP_SIZE(p)) -#define HEAP_TSIZE(p) SIZE_TOTAL(HEAP_SIZE(p)) -#define HEAP_PREVSIZE(p) ((((PHEAP_BLOCK)p)->PrevSize) & HEAP_SIZE_MASK ) -#define HEAP_FRAG_SIZE(p) (((PHEAP_FRAGMENT)p)->Size) - -#define HEAP_PREV(p) ((PHEAP_BLOCK)(((LPVOID)(p))-HEAP_PREVSIZE(p))) -#define HEAP_NEXT(p) ((PHEAP_BLOCK)(((LPVOID)(p))+HEAP_TSIZE(p))) - -typedef struct __HEAP_BLOCK -{ - ULONG Size; /* this is relative to Data */ - ULONG PrevSize; /* p - p->PrevSize is the previous block */ -} HEAP_BLOCK, *PHEAP_BLOCK; - -struct __HEAP_SUBALLOC; - -typedef struct __HEAP_FRAGMENT -{ - UCHAR Magic; - UCHAR Number; - ULONG Size; - struct __HEAP_SUBALLOC *Sub; - - /* this is only used in free blocks */ - struct __HEAP_FRAGMENT *FreeNext; - struct __HEAP_FRAGMENT *FreePrev; -} HEAP_FRAGMENT, *PHEAP_FRAGMENT, *LPHEAP_FRAGMENT; - -typedef struct __HEAP_SUBALLOC -{ - ULONG Magic; - ULONG NumberFree; - struct __HEAP_SUBALLOC *Next; - - struct __HEAP_SUBALLOC *Prev; - struct __HEAP_FRAGMENT *FirstFree; - struct __HEAP_BUCKET *Bucket; - ULONG Bitmap; -} HEAP_SUBALLOC, *PHEAP_SUBALLOC, *LPHEAP_SUBALLOC; - -typedef struct __HEAP_BUCKET -{ - struct __HEAP_SUBALLOC *FirstFree; - ULONG Size; - ULONG Number; - ULONG TotalSize; -} HEAP_BUCKET, *PHEAP_BUCKET, *LPHEAP_BUCKET; - -typedef struct __HEAP -{ - ULONG Magic; - LPVOID End; - ULONG Flags; - CRITICAL_SECTION Synchronize; - HEAP_BUCKET Bucket[8]; - struct __HEAP *NextHeap; - LPVOID LastBlock; - /* this has to aligned on an 8 byte boundary */ - HEAP_BLOCK Start __attribute__((aligned (8))); -} HEAP, *PHEAP; - -#endif /* __INCLUDE_KERNEL32_HEAP_H */ diff --git a/reactos/include/kernel32/kernel32.h b/reactos/include/kernel32/kernel32.h deleted file mode 100644 index 2b7b4b7ae1a..00000000000 --- a/reactos/include/kernel32/kernel32.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef _INCLUDE_KERNEL32_KERNEL32_H -#define _INCLUDE_KERNEL32_KERNEL32_H - -#include - -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef NDEBUG -#define DPRINT(args...) -#define CHECKPOINT -#ifdef assert -#undef assert -#endif -#define assert(x) -#else -#define DPRINT(args...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); -#define CHECKPOINT do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); -#ifdef assert -#undef assert -#endif -#define assert(x) do { if(!x) RtlAssert(x, __FILE__,__LINE__, ""); } while(0); -#endif - -#define DPRINT1(args...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); -#define CHECKPOINT1 do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); - -#define MAGIC(c1,c2,c3,c4) ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24)) - -#define MAGIC_HEAP MAGIC( 'H','E','A','P' ) - -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) -#define ROUNDDOWN(a,b) (((a)/(b))*(b)) - -#ifndef FIELD_OFFSET -#define FIELD_OFFSET(type,fld) ((LONG)&(((type *)0)->fld)) -#endif - -/* GLOBAL VARIABLES **********************************************************/ - -extern WINBOOL bIsFileApiAnsi; -extern HANDLE hProcessHeap; -extern HANDLE hBaseDir; - -extern CRITICAL_SECTION DllLock; - -/* FUNCTION PROTOTYPES *******************************************************/ - -BOOLEAN STDCALL IsConsoleHandle(HANDLE Handle); - -WINBOOL STDCALL CloseConsoleHandle(HANDLE Handle); - -HANDLE STDCALL OpenConsoleW (LPWSTR wsName, - DWORD dwDesiredAccess, - BOOL bInheritHandle, - DWORD dwCreationDistribution); - - -#endif /* ndef _INCLUDE_KERNEL32_KERNEL32_H */ - diff --git a/reactos/include/kernel32/lctable.h b/reactos/include/kernel32/lctable.h deleted file mode 100644 index 17ceff8548d..00000000000 --- a/reactos/include/kernel32/lctable.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * nls/lctable.h - */ - - - -#ifndef __NLS_LCTABLE_H -#define __NLS_LCTABLE_H - - -struct __CODEPAGE; - -#ifdef WIN32_LEAN_AND_MEAN - typedef DWORD LCID; -#endif - -#define LOCALE_ARRAY 200 -typedef struct __LOCALE -{ - LCID Id; - LPSTR AbbrName; - LPWSTR *Info0; - LPWSTR *Info1; - LPWSTR *ShortDateFormat; - LPWSTR *LongDateFormat; - LPWSTR *TimeFormat; - struct __CODEPAGE *AnsiCodePage; - struct __CODEPAGE *OemCodePage; -} LOCALE, *PLOCALE, *LPLOCALE; - -extern LOCALE __Locale[LOCALE_ARRAY]; -extern PLOCALE __UserLocale; - -extern BOOL __LocaleInit(VOID); - -#endif \ No newline at end of file diff --git a/reactos/include/kernel32/nls.h b/reactos/include/kernel32/nls.h deleted file mode 100644 index 2d6766a7585..00000000000 --- a/reactos/include/kernel32/nls.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * win32/nls.h - * - * National Language Support definitions - * - * Copyright (C) 1996 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#include -#include - diff --git a/reactos/include/kernel32/proc.h b/reactos/include/kernel32/proc.h deleted file mode 100644 index 39317444d9d..00000000000 --- a/reactos/include/kernel32/proc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: include/kernel32/process.h - * PURPOSE: Include file for lib/kernel32/proc.c - * PROGRAMMER: Ariadne ( ariadne@xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 - */ - - -#include -#include - - -typedef -DWORD -(*WaitForInputIdleType)( - HANDLE hProcess, - DWORD dwMilliseconds); - - - diff --git a/reactos/include/kernel32/process.h b/reactos/include/kernel32/process.h deleted file mode 100644 index 0d5d83834a5..00000000000 --- a/reactos/include/kernel32/process.h +++ /dev/null @@ -1,63 +0,0 @@ - -#ifndef __PEB_DEFINED -#define __PEB_DEFINED - -#include "heap.h" - -typedef void* HANDLE_TABLE; - -typedef struct _pPebInfo { - LPWSTR lpCommandLine; - DWORD cb; - HANDLE hStdInput; /* 18 */ - HANDLE hStdOutput; - HANDLE hStdError; - LPWSTR lpEnvironment; - DWORD dwX; - DWORD dwY; - DWORD dwXSize; - DWORD dwYSize; - DWORD dwXCountChars; - DWORD dwYCountChars; - DWORD dwFillAttribute; - DWORD dwFlags; - DWORD wShowWindow; - LPTSTR lpTitle; - LPTSTR lpDesktop; - LPTSTR reserved; - DWORD cbReserved2; - LPTSTR lpReserved1; -} PEBINFO; - -typedef struct _NT_PEB -{ - - LONG ImageBaseAddress; - void *HeapIndex; - DWORD dwTlsBits[2]; /* tls in use bits */ - WORD NumberOfProcessors; - WORD NtGlobalFlag; - DWORD dwCriticalSectionTimeout; - DWORD dwHeapReserve; - DWORD dwHeapCommit; - DWORD dwHeapDecommitFreeBlockThreshold; - DWORD dwNumberOfHeaps; - DWORD dwMaxiumNumberOfHeaps; - PEBINFO *pPebInfo; - HEAP *pProcessHeap; - HANDLE_TABLE htGDISharedHandleTable; - ATOMTABLE LocalAtomTable; - CRITICAL_SECTION *pCriticalSection; - WORD wMajorVersion; - WORD wMinorVersion; - WORD wBuildNumber; - WORD wPlatformId; - -} NT_PEB; - -NT_PEB *GetPeb() -{ - return NULL; -} - -#endif diff --git a/reactos/include/kernel32/thread.h b/reactos/include/kernel32/thread.h deleted file mode 100644 index 13dc1e68dbb..00000000000 --- a/reactos/include/kernel32/thread.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: include/kernel32/thread.h - * PURPOSE: Include file for lib/kernel32/thread.c - * PROGRAMMER: Ariadne ( ariadne@xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 - */ -#include -#include -PTEB GetTeb(VOID); - - - diff --git a/reactos/include/kernel32/winnls.h b/reactos/include/kernel32/winnls.h deleted file mode 100644 index 8e913438285..00000000000 --- a/reactos/include/kernel32/winnls.h +++ /dev/null @@ -1,429 +0,0 @@ -#ifndef __WINE_WINNLS_H -#define __WINE_WINNLS_H - -/* flags to GetLocaleInfo */ -/* #define LOCALE_NOUSEROVERRIDE 0x80000000 */ -#define LOCALE_USE_CP_ACP 0x40000000 - -#define LOCALE_LOCALEINFOFLAGSMASK 0xC0000000 - -/* When adding new defines, don't forget to add an entry to the - * locale2id map in misc/ole2nls.c - */ -#define LOCALE_SNATIVEDIGITS 0x00000013 -#define LOCALE_SINTLSYMBOL 0x00000015 -#define LOCALE_SISO639LANGNAME 0x00000059 -#define LOCALE_SISO3166CTRYNAME 0x0000005A -#define LOCALE_IDEFAULTMACCODEPAGE 0x00001011 -#define LOCALE_IINTLCURRDIGITS 0x0000001A -#define LOCALE_ITIMEMARKPOSN 0x00001005 -#define LOCALE_ICENTURY 0x00000024 -#define LOCALE_FONTSIGNATURE 0x00000058 -#if 0 -#define LOCALE_ILANGUAGE 0x00000001 -#define LOCALE_SLANGUAGE 0x00000002 -#define LOCALE_SENGLANGUAGE 0x00001001 -#define LOCALE_SABBREVLANGNAME 0x00000003 -#define LOCALE_SNATIVELANGNAME 0x00000004 -#define LOCALE_ICOUNTRY 0x00000005 -#define LOCALE_SCOUNTRY 0x00000006 -#define LOCALE_SENGCOUNTRY 0x00001002 -#define LOCALE_SABBREVCTRYNAME 0x00000007 -#define LOCALE_SNATIVECTRYNAME 0x00000008 -#define LOCALE_IDEFAULTLANGUAGE 0x00000009 -#define LOCALE_IDEFAULTCOUNTRY 0x0000000A -#define LOCALE_IDEFAULTCODEPAGE 0x0000000B -#define LOCALE_IDEFAULTANSICODEPAGE 0x00001004 -#define LOCALE_SLIST 0x0000000C -#define LOCALE_IMEASURE 0x0000000D -#define LOCALE_SDECIMAL 0x0000000E -#define LOCALE_STHOUSAND 0x0000000F -#define LOCALE_SGROUPING 0x00000010 -#define LOCALE_IDIGITS 0x00000011 -#define LOCALE_ILZERO 0x00000012 -#define LOCALE_INEGNUMBER 0x00001010 -#define LOCALE_SCURRENCY 0x00000014 -#define LOCALE_SMONDECIMALSEP 0x00000016 -#define LOCALE_SMONTHOUSANDSEP 0x00000017 -#define LOCALE_SMONGROUPING 0x00000018 -#define LOCALE_ICURRDIGITS 0x00000019 -#define LOCALE_ICURRENCY 0x0000001B -#define LOCALE_INEGCURR 0x0000001C -#define LOCALE_SDATE 0x0000001D -#define LOCALE_STIME 0x0000001E -#define LOCALE_SSHORTDATE 0x0000001F -#define LOCALE_SLONGDATE 0x00000020 -#define LOCALE_STIMEFORMAT 0x00001003 -#define LOCALE_IDATE 0x00000021 -#define LOCALE_ILDATE 0x00000022 -#define LOCALE_ITIME 0x00000023 -#define LOCALE_ITLZERO 0x00000025 -#define LOCALE_IDAYLZERO 0x00000026 -#define LOCALE_IMONLZERO 0x00000027 -#define LOCALE_S1159 0x00000028 -#define LOCALE_S2359 0x00000029 -#define LOCALE_ICALENDARTYPE 0x00001009 -#define LOCALE_IOPTIONALCALENDAR 0x0000100B -#define LOCALE_IFIRSTDAYOFWEEK 0x0000100C -#define LOCALE_IFIRSTWEEKOFYEAR 0x0000100D -#define LOCALE_SDAYNAME1 0x0000002A -#define LOCALE_SDAYNAME2 0x0000002B -#define LOCALE_SDAYNAME3 0x0000002C -#define LOCALE_SDAYNAME4 0x0000002D -#define LOCALE_SDAYNAME5 0x0000002E -#define LOCALE_SDAYNAME6 0x0000002F -#define LOCALE_SDAYNAME7 0x00000030 -#define LOCALE_SABBREVDAYNAME1 0x00000031 -#define LOCALE_SABBREVDAYNAME2 0x00000032 -#define LOCALE_SABBREVDAYNAME3 0x00000033 -#define LOCALE_SABBREVDAYNAME4 0x00000034 -#define LOCALE_SABBREVDAYNAME5 0x00000035 -#define LOCALE_SABBREVDAYNAME6 0x00000036 -#define LOCALE_SABBREVDAYNAME7 0x00000037 -#define LOCALE_SMONTHNAME1 0x00000038 -#define LOCALE_SMONTHNAME2 0x00000039 -#define LOCALE_SMONTHNAME3 0x0000003A -#define LOCALE_SMONTHNAME4 0x0000003B -#define LOCALE_SMONTHNAME5 0x0000003C -#define LOCALE_SMONTHNAME6 0x0000003D -#define LOCALE_SMONTHNAME7 0x0000003E -#define LOCALE_SMONTHNAME8 0x0000003F -#define LOCALE_SMONTHNAME9 0x00000040 -#define LOCALE_SMONTHNAME10 0x00000041 -#define LOCALE_SMONTHNAME11 0x00000042 -#define LOCALE_SMONTHNAME12 0x00000043 -#define LOCALE_SMONTHNAME13 0x0000100E -#define LOCALE_SABBREVMONTHNAME1 0x00000044 -#define LOCALE_SABBREVMONTHNAME2 0x00000045 -#define LOCALE_SABBREVMONTHNAME3 0x00000046 -#define LOCALE_SABBREVMONTHNAME4 0x00000047 -#define LOCALE_SABBREVMONTHNAME5 0x00000048 -#define LOCALE_SABBREVMONTHNAME6 0x00000049 -#define LOCALE_SABBREVMONTHNAME7 0x0000004A -#define LOCALE_SABBREVMONTHNAME8 0x0000004B -#define LOCALE_SABBREVMONTHNAME9 0x0000004C -#define LOCALE_SABBREVMONTHNAME10 0x0000004D -#define LOCALE_SABBREVMONTHNAME11 0x0000004E -#define LOCALE_SABBREVMONTHNAME12 0x0000004F -#define LOCALE_SABBREVMONTHNAME13 0x0000100F -#define LOCALE_SPOSITIVESIGN 0x00000050 -#define LOCALE_SNEGATIVESIGN 0x00000051 -#define LOCALE_IPOSSIGNPOSN 0x00000052 -#define LOCALE_INEGSIGNPOSN 0x00000053 -#define LOCALE_IPOSSYMPRECEDES 0x00000054 -#define LOCALE_IPOSSEPBYSPACE 0x00000055 -#define LOCALE_INEGSYMPRECEDES 0x00000056 -#define LOCALE_INEGSEPBYSPACE 0x00000057 -#endif - -#if 0 -#define NORM_IGNORECASE 1 -#define NORM_IGNORENONSPACE 2 -#define NORM_IGNORESYMBOLS 4 -#define NORM_STRINGSORT 0x1000 -#define NORM_IGNOREKANATYPE 0x00010000 -#define NORM_IGNOREWIDTH 0x00020000 -#endif - -#if 0 -#define CP_ACP 0 /* ANSI code page */ -#define CP_OEMCP 1 /* OEM code page */ -#define CP_MACCP 2 /* Macintosh code page */ -#define CP_THREAD_ACP 3 /* ACP Current thread's ANSI code page */ -#define CP_SYMBOL 42 /* Symbol code page (42) */ -#define CP_UTF7 65000 /* Translate using UTF-7 */ -#define CP_UTF8 65001 /* Translate using UTF-8 */ -#endif - -#if 0 -#define WC_DEFAULTCHECK 0x00000100 -#define WC_COMPOSITECHECK 0x00000200 -#define WC_DISCARDNS 0x00000010 -#define WC_SEPCHARS 0x00000020 -#define WC_DEFAULTCHAR 0x00000040 -#endif - -#if 0 -#define MAKELCID(l, s) (MAKELONG(l, s)) - -#define MAKELANGID(p, s) ((((WORD)(s))<<10) | (WORD)(p)) -#define PRIMARYLANGID(l) ((WORD)(l) & 0x3ff) -#define SUBLANGID(l) ((WORD)(l) >> 10) -#endif - -#ifdef _KERNEL32_INCLUDE_LANG_ -#define LANG_SYSTEM_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT)) -#define LANG_USER_DEFAULT (MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)) -/* - *#define LOCALE_SYSTEM_DEFAULT (MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT)) - *#define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) - *#define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)) - */ -#endif - -/* Language IDs (were in winnt.h, for some reason) */ - - -/* Language IDs */ - -/* FIXME: are the symbolic names correct for LIDs: 0x17, 0x20, 0x28, - * 0x2a, 0x2b, 0x2c, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, - * 0x37, 0x39, 0x3a, 0x3b, 0x3c, 0x3e, 0x3f, 0x41, 0x43, 0x44, - * 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, - * 0x4f, 0x57 - */ -#define LANG_CATALAN 0x03 -#define LANG_THAI 0x1e -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#if 0 -#define LANG_NEUTRAL 0x00 -#define LANG_AFRIKAANS 0x36 -#define LANG_ALBANIAN 0x1c -#define LANG_ARABIC 0x01 -#define LANG_ARMENIAN 0x2b -#define LANG_ASSAMESE 0x4d -#define LANG_AZERI 0x2c -#define LANG_BASQUE 0x2d -#define LANG_BENGALI 0x45 -#define LANG_BULGARIAN 0x02 -#define LANG_BYELORUSSIAN 0x23 -#define LANG_CHINESE 0x04 -#define LANG_SERBO_CROATIAN 0x1a -#define LANG_CROATIAN LANG_SERBO_CROATIAN -#define LANG_SERBIAN LANG_SERBO_CROATIAN -#define LANG_CZECH 0x05 -#define LANG_DANISH 0x06 -#define LANG_DUTCH 0x13 -#define LANG_ENGLISH 0x09 -#define LANG_ESTONIAN 0x25 -#define LANG_FAEROESE 0x38 -#define LANG_FARSI 0x29 -#define LANG_FINNISH 0x0b -#define LANG_FRENCH 0x0c -#define LANG_GAELIC 0x3c -#define LANG_GEORGIAN 0x37 -#define LANG_GERMAN 0x07 -#define LANG_GREEK 0x08 -#define LANG_GUJARATI 0x47 -#define LANG_HEBREW 0x0D -#define LANG_HINDI 0x39 -#define LANG_HUNGARIAN 0x0e -#define LANG_ICELANDIC 0x0f -#define LANG_INDONESIAN 0x21 -#define LANG_ITALIAN 0x10 -#define LANG_JAPANESE 0x11 -#define LANG_KANNADA 0x4b -#define LANG_KAZAKH 0x3f -#define LANG_KONKANI 0x57 -#define LANG_KOREAN 0x12 -#define LANG_LATVIAN 0x26 -#define LANG_LITHUANIAN 0x27 -#define LANG_MACEDONIAN 0x2f -#define LANG_MALAY 0x3e -#define LANG_MALAYALAM 0x4c -#define LANG_MALTESE 0x3a -#define LANG_MAORI 0x28 -#define LANG_MARATHI 0x4e -#define LANG_NORWEGIAN 0x14 -#define LANG_ORIYA 0x48 -#define LANG_POLISH 0x15 -#define LANG_PORTUGUESE 0x16 -#define LANG_PUNJABI 0x46 -#define LANG_RHAETO_ROMANCE 0x17 -#define LANG_ROMANIAN 0x18 -#define LANG_RUSSIAN 0x19 -#define LANG_SAAMI 0x3b -#define LANG_SANSKRIT 0x4f -#define LANG_SLOVAK 0x1b -#define LANG_SLOVENIAN 0x24 -#define LANG_SORBIAN 0x2e -#define LANG_SPANISH 0x0a -#define LANG_SUTU 0x30 -#define LANG_SWAHILI 0x41 -#define LANG_SWEDISH 0x1d -#define LANG_TAMIL 0x49 -#define LANG_TATAR 0x44 -#define LANG_TELUGU 0x4a -#define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 -#define LANG_TURKISH 0x1f -#define LANG_UKRAINIAN 0x22 -#define LANG_URDU 0x20 -#define LANG_UZBEK 0x43 -#define LANG_VENDA 0x33 -#define LANG_VIETNAMESE 0x2a -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 -#endif - -/* Sublanguage definitions */ -//#define SUBLANG_NEUTRAL 0x00 /* language neutral */ -//#define SUBLANG_DEFAULT 0x01 /* user default */ -//#define SUBLANG_SYS_DEFAULT 0x02 /* system default */ - -#define SUBLANG_ARABIC 0x01 -#define SUBLANG_ARABIC_IRAQ 0x02 -#define SUBLANG_ARABIC_EGYPT 0x03 -#define SUBLANG_ARABIC_LIBYA 0x04 -#define SUBLANG_ARABIC_ALGERIA 0x05 -#define SUBLANG_ARABIC_MOROCCO 0x06 -#define SUBLANG_ARABIC_TUNISIA 0x07 -#define SUBLANG_ARABIC_OMAN 0x08 -#define SUBLANG_ARABIC_YEMEN 0x09 -#define SUBLANG_ARABIC_SYRIA 0x0a -#define SUBLANG_ARABIC_JORDAN 0x0b -#define SUBLANG_ARABIC_LEBANON 0x0c -#define SUBLANG_ARABIC_KUWAIT 0x0d -#define SUBLANG_ARABIC_UAE 0x0e -#define SUBLANG_ARABIC_BAHRAIN 0x0f -#define SUBLANG_ARABIC_QATAR 0x10 -//#define SUBLANG_CHINESE_TRADITIONAL 0x01 -//#define SUBLANG_CHINESE_SIMPLIFIED 0x02 -//#define SUBLANG_CHINESE_HONGKONG 0x03 -//#define SUBLANG_CHINESE_SINGAPORE 0x04 -#define SUBLANG_CHINESE_MACAU 0x05 -//#define SUBLANG_DUTCH 0x01 -//#define SUBLANG_DUTCH_BELGIAN 0x02 -#define SUBLANG_DUTCH_SURINAM 0x03 -//#define SUBLANG_ENGLISH_US 0x01 -//#define SUBLANG_ENGLISH_UK 0x02 -//#define SUBLANG_ENGLISH_AUS 0x03 -//#define SUBLANG_ENGLISH_CAN 0x04 -//#define SUBLANG_ENGLISH_NZ 0x05 -//#define SUBLANG_ENGLISH_EIRE 0x06 -#define SUBLANG_ENGLISH_SAFRICA 0x07 -#define SUBLANG_ENGLISH_JAMAICA 0x08 -#define SUBLANG_ENGLISH_CARRIBEAN 0x09 -#define SUBLANG_ENGLISH_BELIZE 0x0a -#define SUBLANG_ENGLISH_TRINIDAD 0x0b -#define SUBLANG_ENGLISH_ZIMBABWE 0x0c -#define SUBLANG_ENGLISH_PHILIPPINES 0x0d -//#define SUBLANG_FRENCH 0x01 -//#define SUBLANG_FRENCH_BELGIAN 0x02 -//#define SUBLANG_FRENCH_CANADIAN 0x03 -//#define SUBLANG_FRENCH_SWISS 0x04 -#define SUBLANG_FRENCH_LUXEMBOURG 0x05 -#define SUBLANG_FRENCH_MONACO 0x06 -//#define SUBLANG_GERMAN 0x01 -//#define SUBLANG_GERMAN_SWISS 0x02 -//#define SUBLANG_GERMAN_AUSTRIAN 0x03 -#define SUBLANG_GERMAN_LUXEMBOURG 0x04 -#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 -//#define SUBLANG_ITALIAN 0x01 -//#define SUBLANG_ITALIAN_SWISS 0x02 -#define SUBLANG_KOREAN 0x01 -#define SUBLANG_KOREAN_JOHAB 0x02 -//#define SUBLANG_NORWEGIAN_BOKMAL 0x01 -//#define SUBLANG_NORWEGIAN_NYNORSK 0x02 -//#define SUBLANG_PORTUGUESE 0x02 -//#define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 -//#define SUBLANG_SPANISH 0x01 -//#define SUBLANG_SPANISH_MEXICAN 0x02 -//#define SUBLANG_SPANISH_MODERN 0x03 -#define SUBLANG_SPANISH_GUATEMALA 0x04 -#define SUBLANG_SPANISH_COSTARICA 0x05 -#define SUBLANG_SPANISH_PANAMA 0x06 -#define SUBLANG_SPANISH_DOMINICAN 0x07 -#define SUBLANG_SPANISH_VENEZUELA 0x08 -#define SUBLANG_SPANISH_COLOMBIA 0x09 -#define SUBLANG_SPANISH_PERU 0x0a -#define SUBLANG_SPANISH_ARGENTINA 0x0b -#define SUBLANG_SPANISH_ECUADOR 0x0c -#define SUBLANG_SPANISH_CHILE 0x0d -#define SUBLANG_SPANISH_URUGUAY 0x0e -#define SUBLANG_SPANISH_PARAGUAY 0x0f -#define SUBLANG_SPANISH_BOLIVIA 0x10 -#define SUBLANG_SPANISH_EL_SALVADOR 0x11 -#define SUBLANG_SPANISH_HONDURAS 0x12 -#define SUBLANG_SPANISH_NICARAGUA 0x13 -#define SUBLANG_SPANISH_PUERTO_RICO 0x14 -/* FIXME: I don't know the symbolic names for those */ -#define SUBLANG_ROMANIAN 0x01 -#define SUBLANG_ROMANIAN_MOLDAVIA 0x02 -#define SUBLANG_RUSSIAN 0x01 -#define SUBLANG_RUSSIAN_MOLDAVIA 0x02 -#define SUBLANG_CROATIAN 0x01 -#define SUBLANG_SERBIAN 0x02 -#define SUBLANG_SERBIAN_LATIN 0x03 -#define SUBLANG_SWEDISH 0x01 -#define SUBLANG_SWEDISH_FINLAND 0x02 -#define SUBLANG_LITHUANIAN 0x01 -#define SUBLANG_LITHUANIAN_CLASSIC 0x02 -#define SUBLANG_AZERI 0x01 -#define SUBLANG_AZERI_CYRILLIC 0x02 -#define SUBLANG_GAELIC 0x01 -#define SUBLANG_GAELIC_SCOTTISH 0x02 -#define SUBLANG_MALAY 0x01 -#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 -#define SUBLANG_UZBEK 0x01 -#define SUBLANG_UZBEK_CYRILLIC 0x02 - -/* Sort definitions */ -//#define SORT_DEFAULT 0x0 -//#define SORT_JAPANESE_XJIS 0x0 -//#define SORT_JAPANESE_UNICODE 0x1 -//#define SORT_CHINESE_BIG5 0x0 -//#define SORT_CHINESE_UNICODE 0x1 -//#define SORT_KOREAN_KSC 0x0 -//#define SORT_KOREAN_UNICODE 0x1 - - -/* Locale Dependent Mapping Flags */ -#if 0 -#define LCMAP_LOWERCASE 0x00000100 /* lower case letters */ -#define LCMAP_UPPERCASE 0x00000200 /* upper case letters */ -#define LCMAP_SORTKEY 0x00000400 /* WC sort key (normalize) */ -#define LCMAP_BYTEREV 0x00000800 /* byte reversal */ -#endif - -//#define SORT_STRINGSORT 0x00001000 /* take punctuation into account */ - -#if 0 -#define LCMAP_HIRAGANA 0x00100000 /* map katakana to hiragana */ -#define LCMAP_KATAKANA 0x00200000 /* map hiragana to katakana */ -#define LCMAP_HALFWIDTH 0x00400000 /* map double byte to single byte */ -#define LCMAP_FULLWIDTH 0x00800000 /* map single byte to double byte */ -#endif - -/* Date Flags for GetDateFormat. */ -#if 0 -#define DATE_SHORTDATE 0x00000001 /* use short date picture */ -#define DATE_LONGDATE 0x00000002 /* use long date picture */ -#define DATE_USE_ALT_CALENDAR 0x00000004 /* use alternate calendar */ - /* alt. calendar support is broken anyway */ -#endif - -#if 0 -#define TIME_FORCE24HOURFORMAT 0x00000008 /* force 24 hour format*/ -#define TIME_NOTIMEMARKER 0x00000004 /* show no AM/PM */ -#define TIME_NOSECONDS 0x00000002 /* show no seconds */ -#define TIME_NOMINUTESORSECONDS 0x0000001 /* show no minutes either */ -#endif - -/* internal flags for GetDateFormat system */ -#define DATE_DATEVARSONLY 0x00000100 /* only date stuff: yMdg */ -#define TIME_TIMEVARSONLY 0x00000200 /* only time stuff: hHmst */ -/* use this in a WineLib program if you really want all types */ -#define LOCALE_TIMEDATEBOTH 0x00000300 /* full set */ - -/* Prototypes for Unicode case conversion routines */ -WCHAR towupper(WCHAR); -WCHAR towlower(WCHAR); - -#if 0 -/* Definitions for IsTextUnicode() function */ -#define IS_TEXT_UNICODE_ASCII16 0x0001 -#define IS_TEXT_UNICODE_SIGNATURE 0x0008 -#define IS_TEXT_UNICODE_REVERSE_ASCII16 0x0010 -#define IS_TEXT_UNICODE_REVERSE_SIGNATURE 0x0080 -#define IS_TEXT_UNICODE_ILLEGAL_CHARS 0x0100 -#define IS_TEXT_UNICODE_ODD_LENGTH 0x0200 -#endif - -/* Tests that we currently implement */ -#define ITU_IMPLEMENTED_TESTS \ - IS_TEXT_UNICODE_SIGNATURE| \ - IS_TEXT_UNICODE_ODD_LENGTH - -#endif /* __WINE_WINNLS_H */ diff --git a/reactos/include/ntos.h b/reactos/include/ntos.h index 12fb30e3520..ae21fabfa39 100644 --- a/reactos/include/ntos.h +++ b/reactos/include/ntos.h @@ -1,6 +1,6 @@ #ifndef _NTOS_H #define _NTOS_H -/* $Id: ntos.h,v 1.19 2004/01/11 20:46:05 navaraf Exp $ */ +/* $Id: ntos.h,v 1.20 2004/01/23 21:18:27 ekohl Exp $ */ #if defined(NTOS_MODE_USER) /* @@ -48,7 +48,6 @@ #include "ntdll/rtl.h" #include "ntdll/trace.h" #include "rosrtl/thread.h" -#include "kernel32/error.h" #else /* Assume kernel mode */ #include #include